Require JavaSE-11 from now on

org.jcae.opencascade.Shape didn't compile with Java 11, had to change
some private fields/methods from private to protected.

gitlab simantics/platform#524

Change-Id: I9434717f6d9cc537a6e001a1d62c44d77fd06d54

diff --git a/javax.vecmath/.classpath b/javax.vecmath/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..e801ebfb4680123285c15553dc70584276fe0057 100644 (file)
--- a/javax.vecmath/.classpath
+++ b/javax.vecmath/.classpath
@@ -1,7 +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.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/javax.vecmath/.settings/org.eclipse.jdt.core.prefs b/javax.vecmath/.settings/org.eclipse.jdt.core.prefs
index e2df0ba5c5b99d3cb09b24f452186594e164d3fe..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/javax.vecmath/.settings/org.eclipse.jdt.core.prefs
+++ b/javax.vecmath/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,10 @@
-#Fri Apr 01 11:08:58 EEST 2011\r
-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.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/javax.vecmath/META-INF/MANIFEST.MF b/javax.vecmath/META-INF/MANIFEST.MF
index d7b3877d83c67243199e9474833e53c9598e3569..9df56df2b901c036c160e23623f500b64b6cd8a0 100644 (file)
--- a/javax.vecmath/META-INF/MANIFEST.MF
+++ b/javax.vecmath/META-INF/MANIFEST.MF
@@ -3,5 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Vecmath
 Bundle-SymbolicName: javax.vecmath
 Bundle-Version: 1.5.2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: javax.vecmath
+Automatic-Module-Name: javax.vecmath

diff --git a/org.jcae.opencascade.win32.x86_64/.classpath b/org.jcae.opencascade.win32.x86_64/.classpath
index bc74aabe31ccd93a4ecd4c5733766d19686602df..bc3587db4853a4ed6a6079487df4d1ba19de350b 100644 (file)
--- a/org.jcae.opencascade.win32.x86_64/.classpath
+++ b/org.jcae.opencascade.win32.x86_64/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/org.jcae.opencascade.win32.x86_64/.settings/org.eclipse.jdt.core.prefs b/org.jcae.opencascade.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
index f287d53cf450c19c357775d06f02a07c00dcfea6..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.jcae.opencascade.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
+++ b/org.jcae.opencascade.win32.x86_64/.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.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.jcae.opencascade.win32.x86_64/META-INF/MANIFEST.MF b/org.jcae.opencascade.win32.x86_64/META-INF/MANIFEST.MF
index 8d966312aa5de23d8e70dc18f26b9026d518dedd..52713cf3e5dd67f4547b8d6fbf81e30519fcc0dd 100644 (file)
--- a/org.jcae.opencascade.win32.x86_64/META-INF/MANIFEST.MF
+++ b/org.jcae.opencascade.win32.x86_64/META-INF/MANIFEST.MF
@@ -5,6 +5,6 @@ Bundle-Name: X86_64
 Bundle-SymbolicName: org.jcae.opencascade.win32.x86_64
 Bundle-Version: 7.3.0.qualifier
 Fragment-Host: org.jcae.opencascade;bundle-version="7.3.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64))
 Automatic-Module-Name: org.jcae.opencascade.win32.x86_64

diff --git a/org.jcae.opencascade/.classpath b/org.jcae.opencascade/.classpath
index 87a3f2679836844cb402cabd29231f270b9f37db..15dfa142be72b83529ca50366b24c543b172b341 100644 (file)
--- a/org.jcae.opencascade/.classpath
+++ b/org.jcae.opencascade/.classpath
@@ -1,7 +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.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src-java"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="src" path="src-java"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/org.jcae.opencascade/.settings/org.eclipse.jdt.core.prefs b/org.jcae.opencascade/.settings/org.eclipse.jdt.core.prefs
index 77aea377dbc66159997c3ce7eaf2fbb934e9fdd9..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.jcae.opencascade/.settings/org.eclipse.jdt.core.prefs
+++ b/org.jcae.opencascade/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,10 @@
-#Wed Mar 28 17:40:02 EEST 2012\r
-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.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.jcae.opencascade/META-INF/MANIFEST.MF b/org.jcae.opencascade/META-INF/MANIFEST.MF
index d54c0feaf40fd4600fcde45a45002dfc81d8f224..3dd51f35a87a873a633800907c4a9a7650dd8790 100644 (file)
--- a/org.jcae.opencascade/META-INF/MANIFEST.MF
+++ b/org.jcae.opencascade/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 7.3.0.qualifier
 Bundle-Activator: org.jcae.opencascade.Activator
 Require-Bundle: org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.jcae.opencascade,
  org.jcae.opencascade.jni
 Automatic-Module-Name: org.jcae.opencascade

diff --git a/org.jcae.opencascade/src-java/org/jcae/opencascade/Shape.java b/org.jcae.opencascade/src-java/org/jcae/opencascade/Shape.java
index 693f5738a262861fbb9131c18815558481f180b0..02a7e0768f09b58f0a09ead739defe968f159f44 100644 (file)
--- a/org.jcae.opencascade/src-java/org/jcae/opencascade/Shape.java
+++ b/org.jcae.opencascade/src-java/org/jcae/opencascade/Shape.java
@@ -168,8 +168,8 @@ public abstract class Shape<T extends Shape<T>> implements Comparable<T>
        }
        
        protected TopoDS_Shape impl;
-       private T[] children;
-       private T[] parents;
+       protected T[] children;
+       protected T[] parents;
 
        protected Shape()
        {
@@ -343,7 +343,7 @@ public abstract class Shape<T extends Shape<T>> implements Comparable<T>
                writer.println("</geometry>");
        }
 
-       private void dump(PrintWriter writer, Set<T> shapeSet, int[] id)
+       protected void dump(PrintWriter writer, Set<T> shapeSet, int[] id)
        {
                T shape = getDerived();
                if (!shapeSet.contains(shape))
@@ -447,7 +447,7 @@ public abstract class Shape<T extends Shape<T>> implements Comparable<T>
         * @param maxsize the maximum number of returned shapes
         * @param shape exploration will end when this shape will be found
         */
-       private T explore(Collection<T> result, TopAbs_ShapeEnum wantedType, int maxsize,
+       protected T explore(Collection<T> result, TopAbs_ShapeEnum wantedType, int maxsize,
                TopoDS_Shape shape)
        {
                if(impl.shapeType().equals(wantedType))

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

diff --git a/org.simantics.g3d.csg.ontology/.settings/org.eclipse.jdt.core.prefs b/org.simantics.g3d.csg.ontology/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.g3d.csg.ontology/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.g3d.csg.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.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.simantics.g3d.csg.ontology/META-INF/MANIFEST.MF b/org.simantics.g3d.csg.ontology/META-INF/MANIFEST.MF
index 0c5ab4f1b6efc7d25d6253f5d5fc57439b1b910f..9e43bc88827da464553b16aeb3255027d831d409 100644 (file)
--- a/org.simantics.g3d.csg.ontology/META-INF/MANIFEST.MF
+++ b/org.simantics.g3d.csg.ontology/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics.action.ontology;bundle-version="1.0.0",
  org.simantics.selectionview.ontology;bundle-version="1.0.0",
  org.simantics.simulation.ontology;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.simantics.g3d.csg.ontology
 Automatic-Module-Name: org.simantics.g3d.csg.ontology

diff --git a/org.simantics.g3d.csg/.classpath b/org.simantics.g3d.csg/.classpath
index 5e4f6d9ca4fb209ecb24f05b098dec961aee287b..f1d7ba28d9f77c5c927cadc7e71c0d3a198dd8b0 100644 (file)
--- a/org.simantics.g3d.csg/.classpath
+++ b/org.simantics.g3d.csg/.classpath
@@ -1,7 +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="src" path="src"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/org.simantics.g3d.csg/.settings/org.eclipse.jdt.core.prefs b/org.simantics.g3d.csg/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.g3d.csg/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.g3d.csg/.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.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.simantics.g3d.csg/META-INF/MANIFEST.MF b/org.simantics.g3d.csg/META-INF/MANIFEST.MF
index 46700b064ae5d76c1fca1197e0b843393a85b877..d4b349a16f5d7349685787770d9b3fca40c73ccd 100644 (file)
--- a/org.simantics.g3d.csg/META-INF/MANIFEST.MF
+++ b/org.simantics.g3d.csg/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics.objmap2;bundle-version="1.0.0",
  org.simantics.opencascade.vtk;bundle-version="1.0.0",
  org.slf4j.api
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.g3d.csg.handler,
  org.simantics.g3d.csg.model

diff --git a/org.simantics.g3d.jme/.classpath b/org.simantics.g3d.jme/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..e801ebfb4680123285c15553dc70584276fe0057 100644 (file)
--- a/org.simantics.g3d.jme/.classpath
+++ b/org.simantics.g3d.jme/.classpath
@@ -1,7 +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.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/org.simantics.g3d.jme/.settings/org.eclipse.jdt.core.prefs b/org.simantics.g3d.jme/.settings/org.eclipse.jdt.core.prefs
index c107b6a572e8bd50b92dd48dfc47fd1f57a3ce42..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.g3d.jme/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.g3d.jme/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,10 @@
-#Wed Aug 08 16:41:22 EEST 2012\r
-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.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.simantics.g3d.jme/META-INF/MANIFEST.MF b/org.simantics.g3d.jme/META-INF/MANIFEST.MF
index 59de283d5f9067215bc9fe945e943cf706734905..e68a2b14ffdbb9b07212c3c8aadcb5414a04a757 100644 (file)
--- a/org.simantics.g3d.jme/META-INF/MANIFEST.MF
+++ b/org.simantics.g3d.jme/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.objmap2;bundle-version="1.0.0",
  org.eclipse.ui.views;bundle-version="3.6.0"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.simantics.g3d.jme.common,
  org.simantics.g3d.jme.shape,
  org.simantics.g3d.jme.system,

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

diff --git a/org.simantics.g3d.ontology/.settings/org.eclipse.jdt.core.prefs b/org.simantics.g3d.ontology/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.g3d.ontology/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.g3d.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.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.simantics.g3d.ontology/META-INF/MANIFEST.MF b/org.simantics.g3d.ontology/META-INF/MANIFEST.MF
index c91a2332f9d701b14b5c252efe4bc8ee1aac0fc0..c9ffed5311724a5d4006e90f25aa3a8634c483eb 100644 (file)
--- a/org.simantics.g3d.ontology/META-INF/MANIFEST.MF
+++ b/org.simantics.g3d.ontology/META-INF/MANIFEST.MF
@@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: VTT
 Require-Bundle: org.eclipse.core.runtime,
  org.simantics.layer0;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.simantics.g3d.ontology
 Automatic-Module-Name: org.simantics.g3d.ontology

diff --git a/org.simantics.g3d.repository/pom.xml b/org.simantics.g3d.repository/pom.xml
index 4f26eebe1a5fab84632df70f5bff8b62151646cf..6edaecee88b78c2e8d8fd663adb994301e95172c 100644 (file)
--- a/org.simantics.g3d.repository/pom.xml
+++ b/org.simantics.g3d.repository/pom.xml
@@ -62,6 +62,23 @@
                                                                                <ignore></ignore>
                                                                        </action>
                                                                </pluginExecution>
+                                                               <pluginExecution>
+                                                                       <pluginExecutionFilter>
+                                                                               <groupId>org.simantics</groupId>
+                                                                               <artifactId>
+                                                                                       graph-builder-maven-plugin
+                                                                               </artifactId>
+                                                                               <versionRange>
+                                                                                       [0.0.9,)
+                                                                               </versionRange>
+                                                                               <goals>
+                                                                                       <goal>compile-graphs</goal>
+                                                                               </goals>
+                                                                       </pluginExecutionFilter>
+                                                                       <action>
+                                                                               <ignore></ignore>
+                                                                       </action>
+                                                               </pluginExecution>
                                                        </pluginExecutions>
                                                </lifecycleMappingMetadata>
                                        </configuration>

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

diff --git a/org.simantics.g3d.vtk/.settings/org.eclipse.jdt.core.prefs b/org.simantics.g3d.vtk/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.g3d.vtk/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.g3d.vtk/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.simantics.g3d.vtk/META-INF/MANIFEST.MF b/org.simantics.g3d.vtk/META-INF/MANIFEST.MF
index 1ba1aaf62e4cc3e07c7ce0c8ab934df446ec188b..86d0da4ab89b239f0ab3941dbf6bc61ca83e684e 100644 (file)
--- a/org.simantics.g3d.vtk/META-INF/MANIFEST.MF
+++ b/org.simantics.g3d.vtk/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime,
  vtk.rendering;bundle-version="8.2.0",
  org.simantics.utils.thread.swt;bundle-version="1.1.0",
  org.slf4j.api
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.g3d.vtk.action,
  org.simantics.g3d.vtk.awt,

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

diff --git a/org.simantics.g3d/.settings/org.eclipse.jdt.core.prefs b/org.simantics.g3d/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.g3d/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.g3d/.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.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.simantics.g3d/META-INF/MANIFEST.MF b/org.simantics.g3d/META-INF/MANIFEST.MF
index ea29d7808a8b7a9d088c9f89faa56fa6ab65f285..ce07870b9d45b45a42592382e75decffb22da0b3 100644 (file)
--- a/org.simantics.g3d/META-INF/MANIFEST.MF
+++ b/org.simantics.g3d/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.nebula.widgets.tablecombo;bundle-version="1.0.0",
  org.simantics.ui;bundle-version="1.0.0",
  org.simantics.scl.osgi;bundle-version="1.0.4"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.g3d,
  org.simantics.g3d.adapters,

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

diff --git a/org.simantics.objmap2/.settings/org.eclipse.jdt.core.prefs b/org.simantics.objmap2/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.objmap2/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.objmap2/.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.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.simantics.objmap2/META-INF/MANIFEST.MF b/org.simantics.objmap2/META-INF/MANIFEST.MF
index 59ec5b1e7f9e2eecf4370d7f678a09e538777a46..2e5ead630516f8ca4a8a209c0232624d20a692f0 100644 (file)
--- a/org.simantics.objmap2/META-INF/MANIFEST.MF
+++ b/org.simantics.objmap2/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Objmap2
 Bundle-SymbolicName: org.simantics.objmap2
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.db;bundle-version="1.1.0",
  gnu.trove3;bundle-version="3.0.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
@@ -23,3 +23,4 @@ Export-Package: org.simantics.objmap.backward,
  org.simantics.objmap.structural,
  org.simantics.objmap.structural.annotations,
  org.simantics.objmap.structural.schema
+Automatic-Module-Name: org.simantics.objmap2

diff --git a/org.simantics.opencascade.jme/.classpath b/org.simantics.opencascade.jme/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..e801ebfb4680123285c15553dc70584276fe0057 100644 (file)
--- a/org.simantics.opencascade.jme/.classpath
+++ b/org.simantics.opencascade.jme/.classpath
@@ -1,7 +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.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/org.simantics.opencascade.jme/.settings/org.eclipse.jdt.core.prefs b/org.simantics.opencascade.jme/.settings/org.eclipse.jdt.core.prefs
index 27353b8121eb09c03ff85c9ed3c3b899721d746f..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.opencascade.jme/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.opencascade.jme/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,10 @@
-#Mon Aug 13 10:36:56 EEST 2012\r
-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.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.simantics.opencascade.jme/META-INF/MANIFEST.MF b/org.simantics.opencascade.jme/META-INF/MANIFEST.MF
index 3756782098a3add625040ef2ef9219724f186346..7e9b8a48dfa87a55e4fd5224dbff0f9213c2033d 100644 (file)
--- a/org.simantics.opencascade.jme/META-INF/MANIFEST.MF
+++ b/org.simantics.opencascade.jme/META-INF/MANIFEST.MF
@@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.ui,
  com.jme;bundle-version="1.0.0",
  javax.vecmath;bundle-version="1.5.2",
  org.simantics.utils.datastructures;bundle-version="1.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.opencascade.jme

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

diff --git a/org.simantics.opencascade.vtk/.settings/org.eclipse.jdt.core.prefs b/org.simantics.opencascade.vtk/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.opencascade.vtk/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.opencascade.vtk/.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.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.simantics.opencascade.vtk/META-INF/MANIFEST.MF b/org.simantics.opencascade.vtk/META-INF/MANIFEST.MF
index 3ee6f40c64109144d908e6024a182852950f3e77..87a1c368d34633c4cf6dc219e27b0180dcfca6ea 100644 (file)
--- a/org.simantics.opencascade.vtk/META-INF/MANIFEST.MF
+++ b/org.simantics.opencascade.vtk/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui,
  javax.vecmath;bundle-version="1.5.2",
  org.simantics.utils.datastructures;bundle-version="1.1.0",
  org.simantics.g3d.vtk;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.opencascade.vtk
 Automatic-Module-Name: org.simantics.opencascade.vtk

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

diff --git a/org.simantics.opencascade/.settings/org.eclipse.jdt.core.prefs b/org.simantics.opencascade/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.opencascade/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.opencascade/.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.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.simantics.opencascade/META-INF/MANIFEST.MF b/org.simantics.opencascade/META-INF/MANIFEST.MF
index 3a8e79577be0acd5db2d856d8454fbe573ae9a10..58da79d4c547c1c278fb682c2eabf4be860da192 100644 (file)
--- a/org.simantics.opencascade/META-INF/MANIFEST.MF
+++ b/org.simantics.opencascade/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jcae.opencascade;bundle-version="1.0.0",
  org.simantics.utils.datastructures;bundle-version="1.1.0",
  org.simantics.g3d;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.opencascade
 Automatic-Module-Name: org.simantics.opencascade

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

diff --git a/org.simantics.plant3d.ontology/.settings/org.eclipse.jdt.core.prefs b/org.simantics.plant3d.ontology/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.plant3d.ontology/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.plant3d.ontology/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.simantics.plant3d.ontology/META-INF/MANIFEST.MF b/org.simantics.plant3d.ontology/META-INF/MANIFEST.MF
index 8b7db6f78cb8b7f6bead3a799a995808a8fe3e55..8432514a41f8c30d21b7eb940d642dcb2f30c25a 100644 (file)
--- a/org.simantics.plant3d.ontology/META-INF/MANIFEST.MF
+++ b/org.simantics.plant3d.ontology/META-INF/MANIFEST.MF
@@ -15,6 +15,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics.image2.ontology;bundle-version="1.2.0",
  org.simantics.silk.ontology;bundle-version="1.1.0",
  org.simantics.project.ontology;bundle-version="1.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.simantics.plant3d.ontology
 Automatic-Module-Name: org.simantics.plant3d.ontology

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

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

diff --git a/org.simantics.plant3d.product/META-INF/MANIFEST.MF b/org.simantics.plant3d.product/META-INF/MANIFEST.MF
index 18b269a2377af3aeaf644e52c785031b6d02b662..2e189044fdd78835d970ddff18e39415411b457d 100644 (file)
--- a/org.simantics.plant3d.product/META-INF/MANIFEST.MF
+++ b/org.simantics.plant3d.product/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics.layer0;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: VTT
+Bundle-RequiredExecutionEnvironment: JavaSE-11

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

diff --git a/org.simantics.plant3d/.settings/org.eclipse.jdt.core.prefs b/org.simantics.plant3d/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.plant3d/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.plant3d/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.simantics.plant3d/META-INF/MANIFEST.MF b/org.simantics.plant3d/META-INF/MANIFEST.MF
index 4d63758ed670d33e66e24b5a78e2b8b93a445620..5c5909b0a5a82dfb5488e84454b842e2c7486868 100644 (file)
--- a/org.simantics.plant3d/META-INF/MANIFEST.MF
+++ b/org.simantics.plant3d/META-INF/MANIFEST.MF
@@ -35,7 +35,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics.g3d.csg;bundle-version="1.0.0",
  org.simantics.utils.thread.swt;bundle-version="1.1.0",
  org.slf4j.api
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.plant3d.actions,
  org.simantics.plant3d.browser,

diff --git a/pom.xml b/pom.xml
index 5b7d1b96014d92e66c29500d414fedff432961e9..7ed7b5b13546128f503deae0e58ffdfbb19e2d30 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
        <properties>
                <branch-spec>master</branch-spec>
                <simantics-download-site>http://www.simantics.org/download</simantics-download-site>
-               <tycho-version>1.4.0</tycho-version>
-               <tycho-extras-version>1.4.0</tycho-extras-version>
+               <tycho-version>1.6.0</tycho-version>
+               <tycho-extras-version>1.6.0</tycho-extras-version>
                <build.tag>SNAPSHOT</build.tag>
        </properties>
 

diff --git a/vtk.rendering.win32.win32.x86_64/.classpath b/vtk.rendering.win32.win32.x86_64/.classpath
index dbc0de13c3f3062651c6c05918505dd90112518d..bc3587db4853a4ed6a6079487df4d1ba19de350b 100644 (file)
--- a/vtk.rendering.win32.win32.x86_64/.classpath
+++ b/vtk.rendering.win32.win32.x86_64/.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.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/vtk.rendering.win32.win32.x86_64/.settings/org.eclipse.jdt.core.prefs b/vtk.rendering.win32.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/vtk.rendering.win32.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
+++ b/vtk.rendering.win32.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/vtk.rendering.win32.win32.x86_64/META-INF/MANIFEST.MF b/vtk.rendering.win32.win32.x86_64/META-INF/MANIFEST.MF
index 489c8328a30111a1be8510f23edf6a467d080d28..5ea347e575b24b06b9ce6f2042524946f393a944 100644 (file)
--- a/vtk.rendering.win32.win32.x86_64/META-INF/MANIFEST.MF
+++ b/vtk.rendering.win32.win32.x86_64/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Bundle-SymbolicName: vtk.rendering.win32.win32.x86_64
 Bundle-Version: 8.2.0.qualifier
 Fragment-Host: vtk.rendering;bundle-version="8.2.0"
 Automatic-Module-Name: vtk.rendering.win32.win32.x86_64
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64))

diff --git a/vtk.rendering/.classpath b/vtk.rendering/.classpath
index b9bcee7a4dc467168bf068b985a9a1d4b1225cde..da2ee4c0e17194f6bbf743ce43f70bf84aba87cd 100644 (file)
--- a/vtk.rendering/.classpath
+++ b/vtk.rendering/.classpath
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry exported="true" kind="lib" path="lib/gluegen-rt.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jogl-all.jar"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>

diff --git a/vtk.rendering/.settings/org.eclipse.jdt.core.prefs b/vtk.rendering/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/vtk.rendering/.settings/org.eclipse.jdt.core.prefs
+++ b/vtk.rendering/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/vtk.rendering/META-INF/MANIFEST.MF b/vtk.rendering/META-INF/MANIFEST.MF
index 6ee0bfe19bbfc98a60da4fc280eeb0e3a48bdba2..a5d18f97eb78dbf4db03b98c6645a1354d523651 100644 (file)
--- a/vtk.rendering/META-INF/MANIFEST.MF
+++ b/vtk.rendering/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: VTK Rendering
 Bundle-SymbolicName: vtk.rendering
 Bundle-Version: 8.2.0.qualifier
 Automatic-Module-Name: vtk.rendering
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.swt;bundle-version="3.106.0",
  vtk;bundle-version="8.2.0"
 Bundle-ClassPath: lib/jogl-all.jar,

diff --git a/vtk.win32.win32.x86_64/.classpath b/vtk.win32.win32.x86_64/.classpath
index dbc0de13c3f3062651c6c05918505dd90112518d..bc3587db4853a4ed6a6079487df4d1ba19de350b 100644 (file)
--- a/vtk.win32.win32.x86_64/.classpath
+++ b/vtk.win32.win32.x86_64/.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.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/vtk.win32.win32.x86_64/.settings/org.eclipse.jdt.core.prefs b/vtk.win32.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/vtk.win32.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
+++ b/vtk.win32.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/vtk.win32.win32.x86_64/META-INF/MANIFEST.MF b/vtk.win32.win32.x86_64/META-INF/MANIFEST.MF
index b75d24431f87b59f61c8ebd8a2f792ef86383b6e..2884be37cc09ca29e2aeaa565f8409518109e805 100644 (file)
--- a/vtk.win32.win32.x86_64/META-INF/MANIFEST.MF
+++ b/vtk.win32.win32.x86_64/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Bundle-SymbolicName: vtk.win32.win32.x86_64
 Bundle-Version: 8.2.0.qualifier
 Fragment-Host: vtk;bundle-version="8.2.0"
 Automatic-Module-Name: vtk.win32.win32.x86_64
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64))

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

diff --git a/vtk/.settings/org.eclipse.jdt.core.prefs b/vtk/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/vtk/.settings/org.eclipse.jdt.core.prefs
+++ b/vtk/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/vtk/META-INF/MANIFEST.MF b/vtk/META-INF/MANIFEST.MF
index b69953b71b8b4aced83c04a4999f7812f235324e..7e5a87a1464925344caf871f8e5179a8e068fb7c 100644 (file)
--- a/vtk/META-INF/MANIFEST.MF
+++ b/vtk/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: VTK
 Bundle-SymbolicName: vtk
 Bundle-Version: 8.2.0.qualifier
 Automatic-Module-Name: vtk
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: vtk
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: vtk.Activator