Fix sysdyn to build with platform master and JavaSE-11

The upgrade to JFreeChart 1.5.0 required some attention detailed at
https://github.com/jfree/jfreechart#migration-from-jfreechart-10x

Other changes:
* Removed deprecated buckminster-build related projects from releng
* Switched execution environment and compiler settings to JavaSE-11
* Added /README.md
* Switched to Tycho 1.7.0
* Fixed split package problem with org.w3c.dom in
  org.simantics.jfreechart by removing the Batik 1.7 bundled in there
  and instead using Batik 1.12.0 from the platform.

gitlab simantics/platform#524
gitlab #62

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index d0555d03644fed01c9a102d1d9f22302299d5210..6cd25fcadd59d0d217107380cf5ed1f3ed795963 100644 (file)
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>\r
     <groupId>org.eclipse.tycho.extras</groupId>\r
     <artifactId>tycho-pomless</artifactId>\r
-    <version>0.26.0</version>\r
+    <version>1.7.0</version>\r
   </extension>\r
 </extensions> \r

diff --git a/README.md b/README.md
new file mode 100644 (file)
index 0000000..30b9f19
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+## Headless Builds
+
+Official builds and testing of the platform are done with Maven.
+
+To build the system dynamics tool, run:
+```
+mvn package
+```
+
+or to run unit tests as well:
+```
+mvn verify
+```
+
+## Development
+
+Follow Simantics Platform Development IDE setup instructions at https://gitlab.simantics.org/simantics/platform/-/blob/master/README.md.
+
+#### Test
+
+Open [releng/org.simantics.sysdyn.rcp.product/sysdyn.product](releng/org.simantics.sysdyn.rcp.product/sysdyn.product)
+and press `Launch an Eclipse application in Debug mode`. The Simantics System Dynamics desktop application should start.

diff --git a/bundles/fi.semantum.sysdyn.solver/.classpath b/bundles/fi.semantum.sysdyn.solver/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..ca3785c4168d1473f960c28e5d73e53857b83013 100644 (file)
--- a/bundles/fi.semantum.sysdyn.solver/.classpath
+++ b/bundles/fi.semantum.sysdyn.solver/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/bundles/fi.semantum.sysdyn.solver/.settings/org.eclipse.jdt.core.prefs b/bundles/fi.semantum.sysdyn.solver/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/bundles/fi.semantum.sysdyn.solver/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/fi.semantum.sysdyn.solver/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF b/bundles/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF
index e2865cd9c0f1957ef6beaa49f82cea92804b4c88..1ef48af5febe454a42a9fe88965370337bfa7bf9 100644 (file)
--- a/bundles/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF
+++ b/bundles/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics.databoard;bundle-version="0.6.5",
  org.simantics.utils.datastructures;bundle-version="1.1.0",
  gnu.trove3;bundle-version="3.0.3"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: fi.semantum.sysdyn.solver
+Automatic-Module-Name: fi.semantum.sysdyn.solver

diff --git a/bundles/org.simantics.fmu.me.win32/.classpath b/bundles/org.simantics.fmu.me.win32/.classpath
index bdaeff6b38d8db9b2b8972f918b241c39ffc5f67..dd93d7d83d0e4ba4e1886f9fc0a1750aeb59a256 100644 (file)
--- a/bundles/org.simantics.fmu.me.win32/.classpath
+++ b/bundles/org.simantics.fmu.me.win32/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/bundles/org.simantics.fmu.me.win32/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.fmu.me.win32/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/bundles/org.simantics.fmu.me.win32/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.fmu.me.win32/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF b/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF
index 417b6df328944babf82b1b1f3f1eecb344d4f88c..547520683434e19daffe2e3fcdeb2c6cb4e7ce49 100644 (file)
--- a/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.simantics.fmu.me.win32
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Semantum Oy
 Fragment-Host: org.simantics.fmu;bundle-version="1.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86))
 Bundle-NativeCode: libraries/FMUSimulator.dll; libraries/miniunz.dll; libraries/zlibwapi.dll; processor=x86
+Automatic-Module-Name: org.simantics.fmu.me.win32

diff --git a/bundles/org.simantics.fmu.me.win64/.classpath b/bundles/org.simantics.fmu.me.win64/.classpath
index bdaeff6b38d8db9b2b8972f918b241c39ffc5f67..dd93d7d83d0e4ba4e1886f9fc0a1750aeb59a256 100644 (file)
--- a/bundles/org.simantics.fmu.me.win64/.classpath
+++ b/bundles/org.simantics.fmu.me.win64/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/bundles/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/bundles/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF b/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
index bfa0ab4e89bafcc4cf5f98ddba638362c0afca9a..1e689914e4545863b733a0a4469d744549b0a633 100644 (file)
--- a/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.simantics.fmu.me.win64
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Semantum Oy
 Fragment-Host: org.simantics.fmu;bundle-version="1.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64))
 Bundle-NativeCode: libraries/FMUSimulator.dll; libraries/libexpat.dll; libraries/miniunz.dll; libraries/zlibwapi.dll; processor=x86_64
+Automatic-Module-Name: org.simantics.fmu.me.win64

diff --git a/bundles/org.simantics.fmu/.classpath b/bundles/org.simantics.fmu/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..ca3785c4168d1473f960c28e5d73e53857b83013 100644 (file)
--- a/bundles/org.simantics.fmu/.classpath
+++ b/bundles/org.simantics.fmu/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/bundles/org.simantics.fmu/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.fmu/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/bundles/org.simantics.fmu/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.fmu/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.fmu/META-INF/MANIFEST.MF b/bundles/org.simantics.fmu/META-INF/MANIFEST.MF
index 2c43a992436cd33804e1343ed0c054a809592301..c1ca40aaa4a0683249dd78b37ecc9ce06d493c55 100644 (file)
--- a/bundles/org.simantics.fmu/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.fmu/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-Vendor: Semantum Oy
 Require-Bundle: org.eclipse.core.runtime,
  org.simantics.utils;bundle-version="1.1.0",
  org.simantics;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.fmu
+Automatic-Module-Name: org.simantics.fmu

diff --git a/bundles/org.simantics.jfreechart.ontology/.classpath b/bundles/org.simantics.jfreechart.ontology/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..ca3785c4168d1473f960c28e5d73e53857b83013 100644 (file)
--- a/bundles/org.simantics.jfreechart.ontology/.classpath
+++ b/bundles/org.simantics.jfreechart.ontology/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/bundles/org.simantics.jfreechart.ontology/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.jfreechart.ontology/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/bundles/org.simantics.jfreechart.ontology/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.jfreechart.ontology/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.jfreechart.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.jfreechart.ontology/META-INF/MANIFEST.MF
index a4073070f7a869901ea8da88356025073a291a70..b834606a4ec95c8d3b0c6889bb3463ea4f18ff1b 100644 (file)
--- a/bundles/org.simantics.jfreechart.ontology/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.jfreechart.ontology/META-INF/MANIFEST.MF
@@ -14,5 +14,6 @@ Require-Bundle: org.simantics.layer0,
  org.simantics.action.ontology;bundle-version="1.1.0",
  org.simantics.viewpoint.ontology;bundle-version="1.2.0",
  org.simantics.color.ontology;bundle-version="1.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.simantics.sysdyn
+Automatic-Module-Name: org.simantics.jfreechart.ontology

diff --git a/bundles/org.simantics.jfreechart/.classpath b/bundles/org.simantics.jfreechart/.classpath
index afb0b0658876a00b2855590571f6bea68f49ffa9..ca3785c4168d1473f960c28e5d73e53857b83013 100644 (file)
--- a/bundles/org.simantics.jfreechart/.classpath
+++ b/bundles/org.simantics.jfreechart/.classpath
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
-       <classpathentry exported="true" kind="lib" path="batik/batik-awt-util.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="batik/batik-dom.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="batik/batik-ext.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="batik/batik-svg-dom.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="batik/batik-svggen.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="batik/batik-util.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="batik/batik-xml.jar"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/bundles/org.simantics.jfreechart/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.jfreechart/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/bundles/org.simantics.jfreechart/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.jfreechart/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.jfreechart/META-INF/MANIFEST.MF b/bundles/org.simantics.jfreechart/META-INF/MANIFEST.MF
index a6e42cdc7cdb533ed38e89b396de3b11b44b6a34..9ddf3343a826a4abf3e688a9494fcb7e7937cefc 100644 (file)
--- a/bundles/org.simantics.jfreechart/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.jfreechart/META-INF/MANIFEST.MF
@@ -5,15 +5,14 @@ Bundle-SymbolicName: org.simantics.jfreechart;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.jfreechart.internal.Activator
 Bundle-Vendor: VTT
-Require-Bundle: org.jfree.jchart;bundle-version="1.0.13",
- org.jfree.jcommon;bundle-version="1.0.16",
+Require-Bundle: org.jfree.jchart;bundle-version="1.5.0",
  org.simantics.jfreechart.ontology;bundle-version="1.0.0",
  org.simantics.modeling.ui;bundle-version="1.1.1",
  org.simantics.layer0.utils;bundle-version="1.1.0",
  org.simantics.scenegraph.swing;bundle-version="1.0.0",
  org.simantics.browsing.ui.model;bundle-version="1.0.0",
  org.simantics.selectionview;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.jfreechart,
  org.simantics.jfreechart.chart,
@@ -23,11 +22,5 @@ Export-Package: org.simantics.jfreechart,
  org.simantics.jfreechart.chart.properties.bar,
  org.simantics.jfreechart.chart.properties.pie,
  org.simantics.jfreechart.chart.properties.xyline
-Bundle-ClassPath: batik/batik-awt-util.jar,
- batik/batik-dom.jar,
- batik/batik-ext.jar,
- batik/batik-svg-dom.jar,
- batik/batik-svggen.jar,
- batik/batik-util.jar,
- batik/batik-xml.jar,
- .
+Bundle-ClassPath: .
+Automatic-Module-Name: org.simantics.jfreechart

diff --git a/bundles/org.simantics.jfreechart/batik/batik-1.7.zip b/bundles/org.simantics.jfreechart/batik/batik-1.7.zip
deleted file mode 100644 (file)
index b1f32e7..0000000
Binary files a/bundles/org.simantics.jfreechart/batik/batik-1.7.zip and /dev/null differ

diff --git a/bundles/org.simantics.jfreechart/batik/batik-awt-util.jar b/bundles/org.simantics.jfreechart/batik/batik-awt-util.jar
deleted file mode 100644 (file)
index e64605a..0000000
Binary files a/bundles/org.simantics.jfreechart/batik/batik-awt-util.jar and /dev/null differ

diff --git a/bundles/org.simantics.jfreechart/batik/batik-dom.jar b/bundles/org.simantics.jfreechart/batik/batik-dom.jar
deleted file mode 100644 (file)
index 32d5b46..0000000
Binary files a/bundles/org.simantics.jfreechart/batik/batik-dom.jar and /dev/null differ

diff --git a/bundles/org.simantics.jfreechart/batik/batik-ext.jar b/bundles/org.simantics.jfreechart/batik/batik-ext.jar
deleted file mode 100644 (file)
index 8c904e1..0000000
Binary files a/bundles/org.simantics.jfreechart/batik/batik-ext.jar and /dev/null differ

diff --git a/bundles/org.simantics.jfreechart/batik/batik-src-1.7.zip b/bundles/org.simantics.jfreechart/batik/batik-src-1.7.zip
deleted file mode 100644 (file)
index 77478cd..0000000
Binary files a/bundles/org.simantics.jfreechart/batik/batik-src-1.7.zip and /dev/null differ

diff --git a/bundles/org.simantics.jfreechart/batik/batik-svg-dom.jar b/bundles/org.simantics.jfreechart/batik/batik-svg-dom.jar
deleted file mode 100644 (file)
index b4c8a62..0000000
Binary files a/bundles/org.simantics.jfreechart/batik/batik-svg-dom.jar and /dev/null differ

diff --git a/bundles/org.simantics.jfreechart/batik/batik-svggen.jar b/bundles/org.simantics.jfreechart/batik/batik-svggen.jar
deleted file mode 100644 (file)
index 4d6bb14..0000000
Binary files a/bundles/org.simantics.jfreechart/batik/batik-svggen.jar and /dev/null differ

diff --git a/bundles/org.simantics.jfreechart/batik/batik-util.jar b/bundles/org.simantics.jfreechart/batik/batik-util.jar
deleted file mode 100644 (file)
index 86d75e7..0000000
Binary files a/bundles/org.simantics.jfreechart/batik/batik-util.jar and /dev/null differ

diff --git a/bundles/org.simantics.jfreechart/batik/batik-xml.jar b/bundles/org.simantics.jfreechart/batik/batik-xml.jar
deleted file mode 100644 (file)
index d05eb25..0000000
Binary files a/bundles/org.simantics.jfreechart/batik/batik-xml.jar and /dev/null differ

diff --git a/bundles/org.simantics.jfreechart/build.properties b/bundles/org.simantics.jfreechart/build.properties
index 3806e2b78e1c562a7c98c5c0d06f90beed5048c9..5948409ce6293059224853be1efc4eb16f4acde0 100644 (file)
--- a/bundles/org.simantics.jfreechart/build.properties
+++ b/bundles/org.simantics.jfreechart/build.properties
@@ -4,11 +4,4 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                adapters.xml,\\r
-               icons/,\\r
-               batik/batik-awt-util.jar,\\r
-               batik/batik-dom.jar,\\r
-               batik/batik-ext.jar,\\r
-               batik/batik-svg-dom.jar,\\r
-               batik/batik-svggen.jar,\\r
-               batik/batik-util.jar,\\r
-               batik/batik-xml.jar\r
+               icons/\r

diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/BarRenderer.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/BarRenderer.java
index 30430d3bf43a350377e31ecb0d92e9ab12f2ffd6..b0857055ffea36caaa0bb5e4f390e6f8712dcbfb 100644 (file)
--- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/BarRenderer.java
+++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/BarRenderer.java
@@ -33,7 +33,7 @@ public class BarRenderer extends AbstractRenderer {
     public org.jfree.chart.renderer.AbstractRenderer getRenderer() {\r
         if(renderer == null) {\r
             renderer = new org.jfree.chart.renderer.category.BarRenderer();\r
-            renderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator());\r
+            renderer.setDefaultToolTipGenerator(new StandardCategoryToolTipGenerator());\r
         }\r
         return renderer;\r
     }\r

diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/CategoryPlot.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/CategoryPlot.java
index 2bf3330938d6ccffe8e27b1d0b3e43638cc9a44a..7cba747e570d6e67a6aa1dc13927ed247ef7aaee 100644 (file)
--- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/CategoryPlot.java
+++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/CategoryPlot.java
@@ -16,7 +16,7 @@ import org.jfree.chart.axis.ValueAxis;
 import org.jfree.chart.plot.Plot;\r
 import org.jfree.chart.plot.PlotOrientation;\r
 import org.jfree.chart.renderer.category.CategoryItemRenderer;\r
-import org.jfree.ui.RectangleInsets;\r
+import org.jfree.chart.ui.RectangleInsets;\r
 import org.simantics.databoard.Bindings;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r

diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/DeviationRenderer.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/DeviationRenderer.java
index 716bb6828b79328693ed591ccc010cf1c99cfb47..2a68932ca4e8d33638c72422bd048b6805af5866 100644 (file)
--- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/DeviationRenderer.java
+++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/DeviationRenderer.java
@@ -27,7 +27,7 @@ public class DeviationRenderer extends AbstractRenderer {
     public org.jfree.chart.renderer.AbstractRenderer getRenderer() {\r
         if(renderer == null) {\r
             renderer = new org.jfree.chart.renderer.xy.DeviationRenderer();\r
-            renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());\r
+            renderer.setDefaultToolTipGenerator(new StandardXYToolTipGenerator());\r
         }\r
         return renderer;\r
     }\r

diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/JFreeChart.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/JFreeChart.java
index 788df9f837146791e5fc8ce4f764cb4e82b33537..3d7734c48e9b17a01a80a305ea054d63e40447cf 100644 (file)
--- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/JFreeChart.java
+++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/JFreeChart.java
@@ -19,7 +19,7 @@ import javax.swing.SwingUtilities;
 
 import org.jfree.chart.title.LegendTitle;
 import org.jfree.chart.title.TextTitle;
-import org.jfree.ui.RectangleInsets;
+import org.jfree.chart.ui.RectangleInsets;
 import org.simantics.Simantics;
 import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;

diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/PiePlot.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/PiePlot.java
index f06bdbea6f863c201ada5449d737cab913ba0715..6f79fd897ced0891bf1cffdbaa090855a9872dce 100644 (file)
--- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/PiePlot.java
+++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/PiePlot.java
@@ -19,10 +19,10 @@ import org.jfree.chart.labels.StandardPieSectionLabelGenerator;
 import org.jfree.chart.labels.StandardPieToolTipGenerator;\r
 import org.jfree.chart.plot.DefaultDrawingSupplier;\r
 import org.jfree.chart.plot.Plot;\r
+import org.jfree.chart.ui.RectangleInsets;\r
 import org.jfree.data.general.Dataset;\r
 import org.jfree.data.general.DatasetChangeEvent;\r
 import org.jfree.data.general.DatasetChangeListener;\r
-import org.jfree.ui.RectangleInsets;\r
 import org.simantics.databoard.Bindings;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r

diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/StackedBarRenderer.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/StackedBarRenderer.java
index a7da60cc3b1008c25a60c21a021577080b880722..c1ea70a1c8a509a8ecb4c0cbbeec40537fc92dd9 100644 (file)
--- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/StackedBarRenderer.java
+++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/StackedBarRenderer.java
@@ -32,7 +32,7 @@ public class StackedBarRenderer extends AbstractRenderer {
     public org.jfree.chart.renderer.AbstractRenderer getRenderer() {\r
         if(renderer == null) {\r
             renderer = new org.jfree.chart.renderer.category.StackedBarRenderer();\r
-            renderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator());\r
+            renderer.setDefaultToolTipGenerator(new StandardCategoryToolTipGenerator());\r
         }\r
         return renderer;\r
     }\r

diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/TextTitle.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/TextTitle.java
index bdb73de1997d268df4438ce0f165b47083236dfa..b49bc3bf0d7ab02a8727141c80bb984db6d88794 100644 (file)
--- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/TextTitle.java
+++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/TextTitle.java
@@ -12,7 +12,7 @@
 package org.simantics.jfreechart.chart;\r
 \r
 import org.jfree.chart.title.Title;\r
-import org.jfree.ui.RectangleEdge;\r
+import org.jfree.chart.ui.RectangleEdge;\r
 import org.simantics.databoard.Bindings;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r

diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYAreaRenderer.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYAreaRenderer.java
index 6c680348d510d0ba46a64739571db02e5bdfb3f6..cd05412167566def3e2b13a196b16de1b797e289 100644 (file)
--- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYAreaRenderer.java
+++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYAreaRenderer.java
@@ -32,7 +32,7 @@ public class XYAreaRenderer extends AbstractRenderer {
     public org.jfree.chart.renderer.AbstractRenderer getRenderer() {\r
         if(renderer == null) {\r
             renderer = new org.jfree.chart.renderer.xy.XYAreaRenderer();\r
-            renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());\r
+            renderer.setDefaultToolTipGenerator(new StandardXYToolTipGenerator());\r
         }\r
         return renderer;\r
     }\r

diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYLineRenderer.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYLineRenderer.java
index 7d5abb225bf4fcf3644dc2b3831d5c83aa165894..eb528cb3ac4b95a41e49d2e6ada51f2bf99834bf 100644 (file)
--- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYLineRenderer.java
+++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYLineRenderer.java
@@ -33,7 +33,7 @@ public class XYLineRenderer extends AbstractRenderer {
     public org.jfree.chart.renderer.AbstractRenderer getRenderer() {\r
         if(renderer == null) {\r
             renderer = new XYLineAndShapeRenderer(true, false);\r
-            renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());\r
+            renderer.setDefaultToolTipGenerator(new StandardXYToolTipGenerator());\r
         }\r
         return renderer;\r
     }\r

diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYPlot.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYPlot.java
index 4ffae630fca63794cab0055e89c2efbf521df071..80fb7ef647c0c78a08f8d1fe101ca0d291212adc 100644 (file)
--- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYPlot.java
+++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYPlot.java
@@ -15,8 +15,8 @@ import org.jfree.chart.axis.ValueAxis;
 import org.jfree.chart.plot.Plot;\r
 import org.jfree.chart.plot.PlotOrientation;\r
 import org.jfree.chart.renderer.xy.XYItemRenderer;\r
+import org.jfree.chart.ui.RectangleInsets;\r
 import org.jfree.data.xy.XYDataset;\r
-import org.jfree.ui.RectangleInsets;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.exception.DatabaseException;\r

diff --git a/bundles/org.simantics.modelica/.classpath b/bundles/org.simantics.modelica/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..ca3785c4168d1473f960c28e5d73e53857b83013 100644 (file)
--- a/bundles/org.simantics.modelica/.classpath
+++ b/bundles/org.simantics.modelica/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/bundles/org.simantics.modelica/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.modelica/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/bundles/org.simantics.modelica/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.modelica/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.modelica/META-INF/MANIFEST.MF b/bundles/org.simantics.modelica/META-INF/MANIFEST.MF
index 654067c53e8f527e6f36a7f6e3f177631b62b66b..0a2eb509852a3adcb200ddc6f11d38003610fbf5 100644 (file)
--- a/bundles/org.simantics.modelica/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.modelica/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Modelica
 Bundle-SymbolicName: org.simantics.modelica;singleton:=true
 Bundle-Version: 1.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.simantics.utils;bundle-version="1.1.0",
@@ -15,3 +15,4 @@ Export-Package: org.simantics.modelica,
 Bundle-Activator: org.simantics.modelica.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: VTT Technical Research Centre of Finland
+Automatic-Module-Name: org.simantics.modelica

diff --git a/bundles/org.simantics.objmap/.classpath b/bundles/org.simantics.objmap/.classpath
index 1b10946dbab601338303afa186b27e99b49b6099..987e6cd8bf7c52303cbd7aaae59b31b2e4480503 100644 (file)
--- a/bundles/org.simantics.objmap/.classpath
+++ b/bundles/org.simantics.objmap/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="src" path="examples"/>\r

diff --git a/bundles/org.simantics.objmap/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.objmap/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/bundles/org.simantics.objmap/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.objmap/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.objmap/META-INF/MANIFEST.MF b/bundles/org.simantics.objmap/META-INF/MANIFEST.MF
index 2a1efff444379d6adc6b5b4d6d84ef3d29caf2a1..fb209ef6519ac569b03e18d1fe6cc5adf1758600 100644 (file)
--- a/bundles/org.simantics.objmap/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.objmap/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Objmap
 Bundle-SymbolicName: org.simantics.objmap
 Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: gnu.trove3;bundle-version="3.0.3",
  org.apache.log4j;bundle-version="1.2.15",
  org.simantics.layer0;bundle-version="1.0.0",
@@ -18,3 +18,4 @@ Export-Package: org.simantics.objmap,
  org.simantics.objmap.rules.range,
  org.simantics.objmap.schema
 Bundle-Vendor: VTT Technical Research Centre of Finland
+Automatic-Module-Name: org.simantics.objmap

diff --git a/bundles/org.simantics.sysdyn.omsolver/.classpath b/bundles/org.simantics.sysdyn.omsolver/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..ca3785c4168d1473f960c28e5d73e53857b83013 100644 (file)
--- a/bundles/org.simantics.sysdyn.omsolver/.classpath
+++ b/bundles/org.simantics.sysdyn.omsolver/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/bundles/org.simantics.sysdyn.omsolver/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.sysdyn.omsolver/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/bundles/org.simantics.sysdyn.omsolver/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.sysdyn.omsolver/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.sysdyn.omsolver/META-INF/MANIFEST.MF b/bundles/org.simantics.sysdyn.omsolver/META-INF/MANIFEST.MF
index c0ab4deb9581b4b25f14dca803490d5d47088f33..e0bbe5a2f57fc5f2d67925e59fa343fc9da87f1e 100644 (file)
--- a/bundles/org.simantics.sysdyn.omsolver/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.sysdyn.omsolver/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Open Modelica solver
 Bundle-SymbolicName: org.simantics.sysdyn.omsolver
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.sysdyn;bundle-version="1.9.0",
  org.eclipse.osgi;bundle-version="3.10.102",
  org.simantics.fmu;bundle-version="1.1.0",
@@ -13,3 +13,4 @@ Require-Bundle: org.simantics.sysdyn;bundle-version="1.9.0",
  org.simantics.simulation;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.simantics.sysdyn.omsolver.Activator
+Automatic-Module-Name: org.simantics.sysdyn.omsolver

diff --git a/bundles/org.simantics.sysdyn.ontology/.classpath b/bundles/org.simantics.sysdyn.ontology/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..ca3785c4168d1473f960c28e5d73e53857b83013 100644 (file)
--- a/bundles/org.simantics.sysdyn.ontology/.classpath
+++ b/bundles/org.simantics.sysdyn.ontology/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/bundles/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/bundles/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF
index 3ab8e5de4631ff680f6b8c258bd5a60258463c74..bf8efd4a35618b762bf454f1eb36c6a5f5df9d0f 100644 (file)
--- a/bundles/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF
@@ -21,6 +21,7 @@ Require-Bundle: org.simantics.layer0,
  org.simantics.spreadsheet.ontology;bundle-version="1.1.0",
  org.simantics.workbench.ontology;bundle-version="1.2.0",
  org.simantics.selectionview.ontology;bundle-version="1.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.simantics.sysdyn
 Bundle-Vendor: VTT Technical Reserarch Centre of Finland
+Automatic-Module-Name: org.simantics.sysdyn.ontology

diff --git a/bundles/org.simantics.sysdyn.ui/.classpath b/bundles/org.simantics.sysdyn.ui/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..ca3785c4168d1473f960c28e5d73e53857b83013 100644 (file)
--- a/bundles/org.simantics.sysdyn.ui/.classpath
+++ b/bundles/org.simantics.sysdyn.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/bundles/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs
index bb35fa0a87b032ee9d0b128004c1edbd464f07bf..e2e9c66d8649563f89c68a6998be4fe4336702b1 100644 (file)
--- a/bundles/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,14 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate\r
 org.eclipse.jdt.core.compiler.debug.localVariable=generate\r
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
index 537c054dd56f224d7da8aa39cb8f7d725b42da62..cb3cfacae7e0da29e0619f5c7ddf7f52cb94aa17 100644 (file)
--- a/bundles/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Simantics System Dynamics UI
 Bundle-SymbolicName: org.simantics.sysdyn.ui;singleton:=true
 Bundle-Version: 1.9.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2",
  org.simantics.scenegraph;bundle-version="0.9.0",
  org.junit;bundle-version="4.12.0";resolution:=optional,
@@ -15,8 +15,7 @@ Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2",
  org.simantics.project;bundle-version="1.0.0",
  org.eclipse.jface.text;bundle-version="3.5.0",
  org.eclipse.ui.editors;bundle-version="3.5.0",
- org.jfree.jcommon;bundle-version="1.0.16",
- org.jfree.jchart;bundle-version="1.0.13",
+ org.jfree.jchart;bundle-version="1.5.0",
  org.simantics.modelica;bundle-version="1.0.0",
  org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.ui.console;bundle-version="3.4.0",
@@ -70,3 +69,4 @@ Import-Package: freemarker.template,
  org.simantics.workbench,
  org.simantics.workbench.ontology,
  org.simantics.workbench.search
+Automatic-Module-Name: org.simantics.sysdyn.ui

diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementHandler.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementHandler.java
index 408ff09bdf9e2624fafe5310de7e2af02064389b..be022a59b0fd1a221bac8c6097ac217950bef3ea 100644 (file)
--- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementHandler.java
+++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementHandler.java
@@ -48,7 +48,7 @@ public class SysdynTextElementHandler extends SysdynTextElementNoBounds implemen
     \r
     @Override\r
     public Rectangle2D getBounds(IElement e, Rectangle2D size) {\r
-        Rectangle2D bounds = TextElementHandler.calculateBounds(e, size, horizontalAlignment, SCALE, paddingX, paddingX);\r
+        Rectangle2D bounds = TextElementHandler.calculateBounds(e, size, horizontalAlignment, DEFAULT_SCALE, paddingX, paddingX);\r
         return bounds;\r
     }\r
 \r

diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowConnectionFactory.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowConnectionFactory.java
index 39f8d1272eebbb97264c06a19d6fa325a259589a..a2a1aed0a6eaf695b6c13a5a54a7b8b3ede85115 100644 (file)
--- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowConnectionFactory.java
+++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowConnectionFactory.java
@@ -41,7 +41,6 @@ import org.simantics.diagram.G2DUtils;
 import org.simantics.diagram.adapter.SyncElementFactory;
 import org.simantics.diagram.connection.ConnectionVisuals;
 import org.simantics.diagram.connection.RouteGraph;
-import org.simantics.diagram.connection.RouteGraphConnectionClass;
 import org.simantics.diagram.connection.RouteLine;
 import org.simantics.diagram.connection.RouteNode;
 import org.simantics.diagram.connection.RouteTerminal;
@@ -71,6 +70,7 @@ import org.simantics.g2d.element.IElement;
 import org.simantics.g2d.element.handler.EdgeVisuals.EdgeEnd;
 import org.simantics.g2d.element.handler.TerminalTopology;
 import org.simantics.g2d.element.handler.impl.StaticObjectAdapter;
+import org.simantics.g2d.elementclass.RouteGraphConnectionClass;
 import org.simantics.g2d.routing.algorithm2.Router4;
 import org.simantics.g2d.utils.TopologicalSelectionExpander;
 import org.simantics.layer0.Layer0;

diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeClass.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeClass.java
index 5061e7382ef950e230945e8cc0acf84b4e6e993f..39489538c0a664651c940e569c8946e6ceba5e24 100644 (file)
--- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeClass.java
+++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeClass.java
@@ -15,13 +15,13 @@ import java.util.ArrayList;
 import java.util.List;\r
 \r
 import org.simantics.diagram.connection.RouteGraph;\r
-import org.simantics.diagram.connection.RouteGraphConnectionClass;\r
 import org.simantics.diagram.connection.rendering.IRouteGraphRenderer;\r
 import org.simantics.g2d.element.ElementClass;\r
 import org.simantics.g2d.element.ElementUtils;\r
 import org.simantics.g2d.element.IElement;\r
 import org.simantics.g2d.element.handler.ElementHandler;\r
 import org.simantics.g2d.element.handler.SceneGraph;\r
+import org.simantics.g2d.elementclass.RouteGraphConnectionClass;\r
 import org.simantics.scenegraph.g2d.G2DParentNode;\r
 import org.simantics.scenegraph.g2d.nodes.connection.IRouteGraphListener;\r
 \r

diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ChartWidget.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ChartWidget.java
index c12ffc6f981aebfee8ce1953bf0948f4a5d3e2c5..aa5b0efc67c4037e443a62583479343a3215f1d4 100644 (file)
--- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ChartWidget.java
+++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ChartWidget.java
@@ -157,10 +157,10 @@ public class ChartWidget implements Widget {
         XYPlot plot = (XYPlot) chart.getPlot();
         XYLineAndShapeRenderer renderer
         = (XYLineAndShapeRenderer) plot.getRenderer();
-        renderer.setBaseShapesVisible(true);
+        renderer.setDefaultShapesVisible(true);
         renderer.setDrawOutlines(true);
         renderer.setUseFillPaint(true);
-        renderer.setBaseFillPaint(Color.white);
+        renderer.setDefaultFillPaint(Color.white);
         renderer.setSeriesStroke(0, new BasicStroke(3.0f));
         renderer.setSeriesOutlineStroke(0, new BasicStroke(2.0f));
         renderer.setSeriesShape(0, new Ellipse2D.Double(-5.0, -5.0, 10.0, 10.0));

diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/TrendToPng.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/TrendToPng.java
index 297d7a9539641a885405d8e5f47782e3172f09a2..8b47dd0e106df24f81ebe1aefffadeee64af2e55 100644 (file)
--- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/TrendToPng.java
+++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/TrendToPng.java
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Shell;\r
 import org.eclipse.ui.IWorkbenchPart;\r
 import org.eclipse.ui.handlers.HandlerUtil;\r
-import org.jfree.chart.ChartUtilities;\r
+import org.jfree.chart.ChartUtils;\r
 import org.jfree.chart.JFreeChart;\r
 import org.simantics.sysdyn.ui.Activator;\r
 \r
@@ -69,7 +69,7 @@ public class TrendToPng extends AbstractHandler {
 \r
                 JFreeChart chart =  trendView.getPanel().getChart();\r
                 try {\r
-                    ChartUtilities.saveChartAsPNG(file, chart, width, height, null, true, compressionLevel);\r
+                    ChartUtils.saveChartAsPNG(file, chart, width, height, null, true, compressionLevel);\r
                 } catch (IOException e) {\r
                     Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Save as PNG failed.", e));\r
                 }\r

diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/XYDataset.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/XYDataset.java
index 015d318e96b1fbb72dfc2387295230f85896df93..a2892f80daae372cc4bb8cff841a57d759e6ab8f 100644 (file)
--- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/XYDataset.java
+++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/XYDataset.java
@@ -27,9 +27,9 @@ import org.jfree.chart.plot.ValueMarker;
 import org.jfree.chart.renderer.AbstractRenderer;
 import org.jfree.chart.renderer.xy.AbstractXYItemRenderer;
 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
+import org.jfree.chart.ui.Layer;
 import org.jfree.data.general.Dataset;
 import org.jfree.data.xy.DefaultXYDataset;
-import org.jfree.ui.Layer;
 import org.simantics.Simantics;
 import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
@@ -302,7 +302,7 @@ public class XYDataset extends AbstractDataset implements org.simantics.jfreecha
             }
             if(renderer == null) {
                 XYLineAndShapeRenderer renderer = new XYLineAndShapeRenderer(true, false);
-                renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());
+                renderer.setDefaultToolTipGenerator(new StandardXYToolTipGenerator());
                 return renderer;
             } else {
                 return renderer.getRenderer();

diff --git a/bundles/org.simantics.sysdyn.xmile/.classpath b/bundles/org.simantics.sysdyn.xmile/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..ca3785c4168d1473f960c28e5d73e53857b83013 100644 (file)
--- a/bundles/org.simantics.sysdyn.xmile/.classpath
+++ b/bundles/org.simantics.sysdyn.xmile/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/bundles/org.simantics.sysdyn.xmile/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.sysdyn.xmile/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/bundles/org.simantics.sysdyn.xmile/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.sysdyn.xmile/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.sysdyn.xmile/META-INF/MANIFEST.MF b/bundles/org.simantics.sysdyn.xmile/META-INF/MANIFEST.MF
index 7827b325ee0a8ce1ca19c0cbaf7461034e2db9cc..af0b72fa6439774f0db2d8e8b5b40409f1d103f1 100644 (file)
--- a/bundles/org.simantics.sysdyn.xmile/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.sysdyn.xmile/META-INF/MANIFEST.MF
@@ -13,6 +13,8 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.sysdyn;bundle-version="1.8.0",
  org.simantics.sysdyn.ontology;bundle-version="1.1.0",
  org.simantics.objmap;bundle-version="0.1.0",
- org.simantics.modeling;bundle-version="1.1.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.simantics.modeling;bundle-version="1.1.1",
+ jakarta.xml.bind-api;bundle-version="2.3.2"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.simantics.sysdyn.xmile

diff --git a/bundles/org.simantics.sysdyn/.classpath b/bundles/org.simantics.sysdyn/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..ca3785c4168d1473f960c28e5d73e53857b83013 100644 (file)
--- a/bundles/org.simantics.sysdyn/.classpath
+++ b/bundles/org.simantics.sysdyn/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/bundles/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/bundles/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.sysdyn/META-INF/MANIFEST.MF b/bundles/org.simantics.sysdyn/META-INF/MANIFEST.MF
index 0f836451a6deca1d494d1812b95a644485b9980c..40c9b599ebc7a5343cd0803ab6935c1b4be0c7d1 100644 (file)
--- a/bundles/org.simantics.sysdyn/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.sysdyn/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Simantics System Dynamics
 Bundle-SymbolicName: org.simantics.sysdyn;singleton:=true
 Bundle-Version: 1.9.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.objmap;bundle-version="0.1.0",
  org.simantics.db;bundle-version="0.6.2",
  org.simantics.modelica;bundle-version="1.0.0",
@@ -29,8 +29,7 @@ Require-Bundle: org.simantics.objmap;bundle-version="0.1.0",
  org.simantics.issues;bundle-version="1.1.0",
  org.simantics.issues.common;bundle-version="1.1.0",
  org.simantics.jfreechart;bundle-version="1.0.0",
- org.jfree.jchart;bundle-version="1.0.13",
- org.jfree.jcommon;bundle-version="1.0.16",
+ org.jfree.jchart;bundle-version="1.5.0",
  org.simantics.spreadsheet.graph;bundle-version="1.1.0",
  fi.semantum.sysdyn.solver;bundle-version="0.1.0",
  org.simantics.fileimport,
@@ -64,3 +63,4 @@ Import-Package: org.eclipse.ui,
  org.simantics.ui
 Bundle-Vendor: VTT Technical Reserarch Centre of Finland
 Service-Component: OSGI-INF/org.simantics.sysdyn.SysdynFileImport.xml
+Automatic-Module-Name: org.simantics.sysdyn

diff --git a/features/org.simantics.sysdyn.build.feature/.credentials.properties b/features/org.simantics.sysdyn.build.feature/.credentials.properties
deleted file mode 100644 (file)
index 859dca4..0000000
--- a/features/org.simantics.sysdyn.build.feature/.credentials.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-simantics.user=anonymous\r
-simantics.password=
\ No newline at end of file

diff --git a/features/org.simantics.sysdyn.build.feature/.project b/features/org.simantics.sysdyn.build.feature/.project
deleted file mode 100644 (file)
index 120cfba..0000000
--- a/features/org.simantics.sysdyn.build.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>org.simantics.sysdyn.build.feature</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.pde.FeatureBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.pde.FeatureNature</nature>\r
-       </natures>\r
-</projectDescription>\r

diff --git a/features/org.simantics.sysdyn.build.feature/Resources.rmap b/features/org.simantics.sysdyn.build.feature/Resources.rmap
deleted file mode 100644 (file)
index 78c416f..0000000
--- a/features/org.simantics.sysdyn.build.feature/Resources.rmap
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<rmap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.eclipse.org/buckminster/RMap-1.0"\r
-       xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:pv="http://www.eclipse.org/buckminster/Provider-1.0">\r
-\r
-       <redirect href="http://www.simantics.org/download/head/rmap/Sysdyn.rmap" />\r
-\r
-</rmap>
\ No newline at end of file

diff --git a/features/org.simantics.sysdyn.build.feature/buckminster.properties b/features/org.simantics.sysdyn.build.feature/buckminster.properties
deleted file mode 100644 (file)
index d8c588f..0000000
--- a/features/org.simantics.sysdyn.build.feature/buckminster.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# How .qualifier in versions should be replaced
-qualifier.replacement.*=generator:buildTimestamp
-generator.buildTimestamp.format='v'yyyyMMdd-HHmmss
-
-# Pack200 compression
-#site.pack200=true
-#site.retain.unpack=true
-
-# JAR Signing
-#site.signing=true
-#signing.type=local
-#local.sign=true
-
-# Generate source bundles
-cbi.include.source=false
-
-target.os=win32
-target.ws=win32
-target.arch=*

diff --git a/features/org.simantics.sysdyn.build.feature/build.properties b/features/org.simantics.sysdyn.build.feature/build.properties
deleted file mode 100644 (file)
index 82ab19c..0000000
--- a/features/org.simantics.sysdyn.build.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml\r

diff --git a/features/org.simantics.sysdyn.build.feature/feature.xml b/features/org.simantics.sysdyn.build.feature/feature.xml
deleted file mode 100644 (file)
index ff2425f..0000000
--- a/features/org.simantics.sysdyn.build.feature/feature.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<feature\r
-      id="org.simantics.sysdyn.build"\r
-      label="Simantics System Dynamics with Internal Solver P2 Site"\r
-      version="1.0.0.qualifier"\r
-      provider-name="Semantum Oy">\r
-\r
-   <description>\r
-      Simantics System Dynamics P2 site build feature with custom internal solver only.\r
-      This feature is only used for Jenkins and Buckminster builds.\r
-   </description>\r
-\r
-   <copyright>\r
-      Copyright (c) 2016 Association for Decentralized Information\r
-Management in Industry THTH ry.&lt;br/&gt;\r
-All rights reserved. This program and the accompanying materials\r
-are made available under the terms of the Eclipse Public License\r
-v1.0 which accompanies this distribution, and is available at\r
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;\r
-   </copyright>\r
-\r
-   <license url="http://www.eclipse.org/legal/epl-v10.html">\r
-      Licensed under Eclipse Public License (EPL) 1.0.\r
-   </license>\r
-\r
-   <includes\r
-         id="org.simantics.sysdyn.internal.p2"\r
-         version="0.0.0"/>\r
-\r
-</feature>\r

diff --git a/features/org.simantics.sysdyn.build.feature/jenkins.buckminster.script b/features/org.simantics.sysdyn.build.feature/jenkins.buckminster.script
deleted file mode 100644 (file)
index e53d744..0000000
--- a/features/org.simantics.sysdyn.build.feature/jenkins.buckminster.script
+++ /dev/null
@@ -1,4 +0,0 @@
-importtargetdefinition -A 'http://www.simantics.org/download/head/simantics.target'\r
-import 'site.cquery'\r
-build\r
-perform -D target.os=* -D target.ws=* -D target.arch=* org.simantics.sysdyn.build#site.p2
\ No newline at end of file

diff --git a/features/org.simantics.sysdyn.build.feature/site.cquery b/features/org.simantics.sysdyn.build.feature/site.cquery
deleted file mode 100644 (file)
index 1ba37b2..0000000
--- a/features/org.simantics.sysdyn.build.feature/site.cquery
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="Resources.rmap" properties=".credentials.properties">\r
-    <cq:rootRequest name="org.simantics.sysdyn.build" componentType="eclipse.feature"/>\r
-    <cq:property key="target.arch" value="*"/>\r
-    <cq:property key="target.os" value="*"/>\r
-    <cq:property key="target.ws" value="*"/>\r
-    <cq:advisorNode namePattern=".*\.source$" componentType="osgi.bundle" skipComponent="true"/>\r
-    <cq:advisorNode namePattern=".*\.source$" componentType="eclipse.feature" skipComponent="true"/>\r
-    <cq:advisorNode namePattern=".*" branchTagPath="main"/>\r
-</cq:componentQuery>\r

diff --git a/features/org.simantics.sysdyn.product.site.feature/.credentials.properties b/features/org.simantics.sysdyn.product.site.feature/.credentials.properties
deleted file mode 100644 (file)
index 859dca4..0000000
--- a/features/org.simantics.sysdyn.product.site.feature/.credentials.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-simantics.user=anonymous\r
-simantics.password=
\ No newline at end of file

diff --git a/features/org.simantics.sysdyn.product.site.feature/.project b/features/org.simantics.sysdyn.product.site.feature/.project
deleted file mode 100644 (file)
index 83aae40..0000000
--- a/features/org.simantics.sysdyn.product.site.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>org.simantics.sysdyn.product.site.feature</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.pde.FeatureBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.pde.FeatureNature</nature>\r
-       </natures>\r
-</projectDescription>\r

diff --git a/features/org.simantics.sysdyn.product.site.feature/Resources.rmap b/features/org.simantics.sysdyn.product.site.feature/Resources.rmap
deleted file mode 100644 (file)
index 78c416f..0000000
--- a/features/org.simantics.sysdyn.product.site.feature/Resources.rmap
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<rmap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.eclipse.org/buckminster/RMap-1.0"\r
-       xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:pv="http://www.eclipse.org/buckminster/Provider-1.0">\r
-\r
-       <redirect href="http://www.simantics.org/download/head/rmap/Sysdyn.rmap" />\r
-\r
-</rmap>
\ No newline at end of file

diff --git a/features/org.simantics.sysdyn.product.site.feature/buckminster.cspex b/features/org.simantics.sysdyn.product.site.feature/buckminster.cspex
deleted file mode 100644 (file)
index 333686a..0000000
--- a/features/org.simantics.sysdyn.product.site.feature/buckminster.cspex
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<cspecExtension xmlns:com="http://www.eclipse.org/buckminster/Common-1.0"\r
-                    xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">\r
-    <actions>\r
-        <public name="create.product" actor="ant">\r
-            <actorProperties>\r
-                <property key="buildFile" value="build/product.ant" />\r
-                <property key="targets" value="create.product" />\r
-            </actorProperties>\r
-            <properties>\r
-                <property key="profile" value="${p2.profileName}" />\r
-                <property key="iu" value="${p2.rootId}" />\r
-            </properties>\r
-            <prerequisites alias="repository">\r
-                <attribute name="site.p2" />\r
-            </prerequisites>\r
-            <products alias="destination" base="${buckminster.output}">\r
-                <path path="${build.label}.${target.os}.${target.arch}/" />\r
-            </products>\r
-        </public>\r
-        <public name="create.product.zip" actor="ant">\r
-            <actorProperties>\r
-                <property key="buildFileId" value="buckminster.pdetasks" />\r
-                <property key="targets" value="create.zip" />\r
-            </actorProperties>\r
-            <prerequisites alias="action.requirements">\r
-                <attribute name="create.product" />\r
-            </prerequisites>\r
-            <products alias="action.output" base="${buckminster.output}">\r
-                <path path="${build.label}.${target.os}.${target.arch}.zip" />\r
-            </products>\r
-        </public>\r
-    </actions>\r
-</cspecExtension>
\ No newline at end of file

diff --git a/features/org.simantics.sysdyn.product.site.feature/buckminster.properties b/features/org.simantics.sysdyn.product.site.feature/buckminster.properties
deleted file mode 100644 (file)
index d8c588f..0000000
--- a/features/org.simantics.sysdyn.product.site.feature/buckminster.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# How .qualifier in versions should be replaced
-qualifier.replacement.*=generator:buildTimestamp
-generator.buildTimestamp.format='v'yyyyMMdd-HHmmss
-
-# Pack200 compression
-#site.pack200=true
-#site.retain.unpack=true
-
-# JAR Signing
-#site.signing=true
-#signing.type=local
-#local.sign=true
-
-# Generate source bundles
-cbi.include.source=false
-
-target.os=win32
-target.ws=win32
-target.arch=*

diff --git a/features/org.simantics.sysdyn.product.site.feature/build.properties b/features/org.simantics.sysdyn.product.site.feature/build.properties
deleted file mode 100644 (file)
index 82ab19c..0000000
--- a/features/org.simantics.sysdyn.product.site.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml\r

diff --git a/features/org.simantics.sysdyn.product.site.feature/build/product.ant b/features/org.simantics.sysdyn.product.site.feature/build/product.ant
deleted file mode 100644 (file)
index 53fe0cb..0000000
--- a/features/org.simantics.sysdyn.product.site.feature/build/product.ant
+++ /dev/null
@@ -1,58 +0,0 @@
-<project>\r
-        <pathconvert property="equinox.launcher.jar">\r
-          <first count="1">\r
-            <sort>\r
-              <fileset dir="${eclipse.home}/plugins" includes="**/org.eclipse.equinox.launcher_*.jar"/>\r
-              <reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators">\r
-                <date/>\r
-              </reverse>\r
-            </sort>\r
-          </first>\r
-        </pathconvert>\r
-\r
-       <target name="create.product">\r
-               <property name="destination" location="${sp:destination}"/>\r
-               <delete dir="${destination}"></delete>\r
-               <makeurl property="repository" file="${sp:repository}"/>\r
-               <mkdir dir="${destination}"/>\r
-               <echoproperties ></echoproperties>\r
-               <echo message="${equinox.launcher.jar}"/>\r
-               <echo message="${repository}"/>\r
-               <echo message="${destination}"/>\r
-               <java jar="${equinox.launcher.jar}" fork="true" failonerror="false" resultproperty="director.result" outputproperty="director.out" errorproperty="director.err">\r
-                       <arg value="-application"/>\r
-                       <arg value="org.eclipse.equinox.p2.director"/>\r
-                       <arg value="-artifactRepository"/>\r
-                       <arg value="${repository}"/>\r
-                       <arg value="-metadataRepository"/>\r
-                       <arg value="${repository}"/>\r
-                       <arg value="-destination"/>\r
-                       <arg value="${destination}"/>\r
-                       <arg value="-bundlepool"/>\r
-                       <arg value="${destination}"/>\r
-                       <arg value="-roaming"/>\r
-                       <arg value="-profile"/>\r
-                       <arg value="${profile}"/>\r
-                       <arg value="-profileProperties" />\r
-                       <arg value="org.eclipse.update.install.features=true" />\r
-                       <arg value="-installIU"/>\r
-                       <arg value="${iu}"/>\r
-                       <arg value="-p2.os" />\r
-                       <arg value="${target.os}" />\r
-                       <arg value="-p2.ws" />\r
-                       <arg value="${target.ws}" />\r
-                       <arg value="-p2.arch" />\r
-                       <arg value="${target.arch}" />\r
-                       <arg value="-consoleLog"/>\r
-               </java>\r
-               <echo message="director.out: '${director.out}'"/>\r
-               <echo message="director.err: '${director.err}'"/>\r
-               <fail message="P2 director failed">\r
-                       <condition>\r
-                               <not>\r
-                                       <equals arg1="${director.result}" arg2="0" />\r
-                               </not>\r
-                       </condition>\r
-               </fail>\r
-       </target>\r
-</project>
\ No newline at end of file

diff --git a/features/org.simantics.sysdyn.product.site.feature/feature.xml b/features/org.simantics.sysdyn.product.site.feature/feature.xml
deleted file mode 100644 (file)
index 95b2510..0000000
--- a/features/org.simantics.sysdyn.product.site.feature/feature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<feature\r
-      id="org.simantics.sysdyn.product.site"\r
-      label="Sysdyn Product Site"\r
-      version="1.10.0.qualifier"\r
-      provider-name="VTT Technical Research Centre of Finland">\r
-\r
-   <description>\r
-      Sysdyn feature for headless product and feature builds that includes
-      all the other sysdyn features necessary for making the P2 site
-      and product builds.\r
-   </description>\r
-\r
-   <copyright>\r
-      Copyright (c) 2016 Association for Decentralized Information
-Management in Industry THTH ry.&lt;br/&gt;
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0 which accompanies this distribution, and is available at
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;\r
-   </copyright>\r
-\r
-   <license url="http://www.eclipse.org/legal/epl-v10.html">\r
-      Licensed under Eclipse Public License (EPL) 1.0.\r
-   </license>\r
-\r
-   <includes\r
-         id="org.simantics.sysdyn"\r
-         version="0.0.0"/>\r
-\r
-   <includes\r
-         id="org.simantics.om"\r
-         version="0.0.0"/>\r
-\r
-   <includes\r
-         id="org.simantics.sysdyn.build"\r
-         version="0.0.0"/>\r
-\r
-</feature>\r

diff --git a/features/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script b/features/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script
deleted file mode 100644 (file)
index 0a1299b..0000000
--- a/features/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script
+++ /dev/null
@@ -1,8 +0,0 @@
-importtargetdefinition -A 'http://www.simantics.org/download/head/simantics.target'\r
-import 'site.cquery'\r
-build\r
-perform -D target.os=* -D target.ws=* -D target.arch=* org.simantics.sysdyn.product.site#site.p2\r
-perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.Sysdyn -D build.label=Sysdyn-b${BUILD_NUMBER} org.simantics.sysdyn.product.site#create.product.zip\r
-perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86_64 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.Sysdyn -D build.label=Sysdyn-b${BUILD_NUMBER} org.simantics.sysdyn.product.site#create.product.zip\r
-perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.SysdynWithOpenModelica -D build.label=Sysdyn-with-om-b${BUILD_NUMBER} org.simantics.sysdyn.product.site#create.product.zip\r
-perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86_64 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.SysdynWithOpenModelica -D build.label=Sysdyn-with-om-b${BUILD_NUMBER} org.simantics.sysdyn.product.site#create.product.zip
\ No newline at end of file

diff --git a/features/org.simantics.sysdyn.product.site.feature/site.cquery b/features/org.simantics.sysdyn.product.site.feature/site.cquery
deleted file mode 100644 (file)
index 678b963..0000000
--- a/features/org.simantics.sysdyn.product.site.feature/site.cquery
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="Resources.rmap" properties=".credentials.properties">\r
-    <cq:rootRequest name="org.simantics.sysdyn.product.site" componentType="eclipse.feature"/>\r
-    <cq:property key="target.arch" value="*"/>\r
-    <cq:property key="target.os" value="*"/>\r
-    <cq:property key="target.ws" value="*"/>\r
-    <cq:advisorNode namePattern=".*\.source$" componentType="osgi.bundle" skipComponent="true"/>\r
-    <cq:advisorNode namePattern=".*\.source$" componentType="eclipse.feature" skipComponent="true"/>\r
-    <cq:advisorNode namePattern=".*" branchTagPath="main"/>\r
-</cq:componentQuery>\r

diff --git a/features/org.simantics.sysdyn.updatesite.feature/.project b/features/org.simantics.sysdyn.updatesite.feature/.project
deleted file mode 100644 (file)
index 3b0eb9a..0000000
--- a/features/org.simantics.sysdyn.updatesite.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>org.simantics.sysdyn.updatesite.feature</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.pde.FeatureBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.pde.FeatureNature</nature>\r
-       </natures>\r
-</projectDescription>\r

diff --git a/features/org.simantics.sysdyn.updatesite.feature/build.properties b/features/org.simantics.sysdyn.updatesite.feature/build.properties
deleted file mode 100644 (file)
index 82ab19c..0000000
--- a/features/org.simantics.sysdyn.updatesite.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml\r

diff --git a/features/org.simantics.sysdyn.updatesite.feature/feature.xml b/features/org.simantics.sysdyn.updatesite.feature/feature.xml
deleted file mode 100644 (file)
index e8ae051..0000000
--- a/features/org.simantics.sysdyn.updatesite.feature/feature.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<feature\r
-      id="org.simantics.sysdyn.updatesite.feature"\r
-      label="Feature"\r
-      version="1.0.0.qualifier">\r
-\r
-   <description url="http://www.example.com/description">\r
-      [Enter Feature Description here.]\r
-   </description>\r
-\r
-   <copyright url="http://www.example.com/copyright">\r
-      [Enter Copyright Description here.]\r
-   </copyright>\r
-\r
-   <license url="http://www.example.com/license">\r
-      [Enter License Description here.]\r
-   </license>\r
-\r
-   <plugin\r
-         id="org.simantics.sysdyn.ui"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.sysdyn"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.objmap"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.modelica"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.sysdyn.ontology"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.jfreechart.ontology"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.jfreechart"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="fi.semantum.sysdyn.solver"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-</feature>\r

diff --git a/features/pom.xml b/features/pom.xml
index e2c36c529a8220eca3e574168ce48dc60bd7cc62..ba976dc55c5a66bc0929ed9829b8706e9bd0ea4e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -62,11 +62,8 @@
     </build>\r
     \r
     <modules>\r
-        <!--<module>org.simantics.sysdyn.build.feature</module>-->\r
         <!--<module>org.simantics.sysdyn.feature</module>-->\r
         <module>org.simantics.sysdyn.internal.feature</module>\r
         <module>org.simantics.sysdyn.internal.p2.feature</module>\r
-        <!--<module>org.simantics.sysdyn.product.site.feature</module>-->\r
-        <!--<module>org.simantics.sysdyn.updatesite.feature</module>-->\r
     </modules>\r
 </project>\r

diff --git a/releng/inno-setup/sysdyn-om.iss b/releng/inno-setup/sysdyn-om.iss
index 0edcd9631ce9c9eec2f8c564dd85b60478685214..04f466e4a1b0cd2a5d25c6920c4bfdd3a5fb4199 100644 (file)
--- a/releng/inno-setup/sysdyn-om.iss
+++ b/releng/inno-setup/sysdyn-om.iss
@@ -8,7 +8,7 @@ DefaultGroupName=Simantics
 Compression=lzma2
 SolidCompression=yes
 OutputBaseFilename=Sysdyn-OM-1.35.0
-AppCopyright=Copyright © 2018 Simantics Team
+AppCopyright=Copyright � 2020 Simantics Team
 DisableDirPage=no
 WizardSmallImageFile=sysdyn.bmp
 OutputDir=output-om

diff --git a/releng/inno-setup/sysdyn.iss b/releng/inno-setup/sysdyn.iss
index 185e012f46b3bf9bb5c9d200ad3671b89bd4a2ca..d4f88de345bf05ce24486146ad1e1ebb4896da79 100644 (file)
--- a/releng/inno-setup/sysdyn.iss
+++ b/releng/inno-setup/sysdyn.iss
@@ -8,7 +8,7 @@ DefaultGroupName=Simantics
 Compression=lzma2
 SolidCompression=yes
 OutputBaseFilename=Sysdyn-1.35.0
-AppCopyright=Copyright © 2018 Simantics Team
+AppCopyright=Copyright � 2020 Simantics Team
 DisableDirPage=no
 WizardSmallImageFile=sysdyn.bmp
 OutputDir=output

diff --git a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
index 843afbabc08a9f98356b279c315f1022f8721139..5e3fb45d52a9e2c2d9320b0f5472ba17487e91b4 100644 (file)
--- a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
+++ b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
@@ -8,8 +8,8 @@
        <packaging>pom</packaging>
 
        <properties>
-               <tycho.version>1.4.0</tycho.version>
-               <tycho.extras.version>1.4.0</tycho.extras.version>
+               <tycho.version>1.7.0</tycho.version>
+               <tycho.extras.version>1.7.0</tycho.extras.version>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <branch-spec>master</branch-spec>
                <simantics-download-site>http://www.simantics.org/download</simantics-download-site>
@@ -97,36 +97,6 @@
                                        </environments>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.eclipse.tycho.extras</groupId>
-                               <artifactId>tycho-pack200b-plugin</artifactId>
-                               <version>${tycho.extras.version}</version>
-                               <executions>
-                                       <execution>
-                                               <id>pack200-pack</id>
-                                               <goals>
-                                                       <goal>pack</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.eclipse.tycho</groupId>
-                               <artifactId>tycho-p2-plugin</artifactId>
-                               <version>${tycho.version}</version>
-                               <executions>
-                                       <execution>
-                                               <id>attach-p2-metadata</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>p2-metadata</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <defaultP2Metadata>false</defaultP2Metadata>
-                               </configuration>
-                       </plugin>
                </plugins>
        </build>
 </project>

diff --git a/tests/org.simantics.sysdyn.tests/.classpath b/tests/org.simantics.sysdyn.tests/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..7498416355e7b7f46697efb266dbc41716877345 100644 (file)
--- a/tests/org.simantics.sysdyn.tests/.classpath
+++ b/tests/org.simantics.sysdyn.tests/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
+       <classpathentry kind="src" path="src">\r
+               <attributes>\r
+                       <attribute name="test" value="true"/>\r
+               </attributes>\r
+       </classpathentry>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/tests/org.simantics.sysdyn.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.simantics.sysdyn.tests/.settings/org.eclipse.jdt.core.prefs
index f287d53cf450c19c357775d06f02a07c00dcfea6..11265a345a66128f4b4458db91eea094234c194a 100644 (file)
--- a/tests/org.simantics.sysdyn.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.simantics.sysdyn.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
-org.eclipse.jdt.core.compiler.compliance=1.6\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF b/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF
index b9069e236fe19a1ab148ca1c26cf8e4b910d3ba8..7a96d06ba7266344e7e15d600305ad39169eca83 100644 (file)
--- a/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF
+++ b/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Require-Bundle: org.simantics.modelica;bundle-version="1.0.0",
  org.simantics.db.testing;bundle-version="1.0.0",
  org.simantics.fmu;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.osgi.framework