From c0a4a0db52bc0404482aa6fac0b2c1c74f531ab0 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Wed, 22 Apr 2020 01:46:46 +0300 Subject: [PATCH] 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 --- javax.vecmath/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 18 ++++++++++-------- javax.vecmath/META-INF/MANIFEST.MF | 3 ++- org.jcae.opencascade.win32.x86_64/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 17 ++++++++++------- .../META-INF/MANIFEST.MF | 2 +- org.jcae.opencascade/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 18 ++++++++++-------- org.jcae.opencascade/META-INF/MANIFEST.MF | 2 +- .../src-java/org/jcae/opencascade/Shape.java | 8 ++++---- org.simantics.g3d.csg.ontology/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 17 ++++++++++------- .../META-INF/MANIFEST.MF | 2 +- org.simantics.g3d.csg/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 17 ++++++++++------- org.simantics.g3d.csg/META-INF/MANIFEST.MF | 2 +- org.simantics.g3d.jme/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 18 ++++++++++-------- org.simantics.g3d.jme/META-INF/MANIFEST.MF | 2 +- org.simantics.g3d.ontology/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 17 ++++++++++------- .../META-INF/MANIFEST.MF | 2 +- org.simantics.g3d.repository/pom.xml | 17 +++++++++++++++++ org.simantics.g3d.vtk/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 9 ++++++--- org.simantics.g3d.vtk/META-INF/MANIFEST.MF | 2 +- org.simantics.g3d/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 17 ++++++++++------- org.simantics.g3d/META-INF/MANIFEST.MF | 2 +- org.simantics.objmap2/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 17 ++++++++++------- org.simantics.objmap2/META-INF/MANIFEST.MF | 3 ++- org.simantics.opencascade.jme/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 18 ++++++++++-------- .../META-INF/MANIFEST.MF | 2 +- org.simantics.opencascade.vtk/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 17 ++++++++++------- .../META-INF/MANIFEST.MF | 2 +- org.simantics.opencascade/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 17 ++++++++++------- org.simantics.opencascade/META-INF/MANIFEST.MF | 2 +- org.simantics.plant3d.ontology/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 9 ++++++--- .../META-INF/MANIFEST.MF | 2 +- org.simantics.plant3d.product/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 9 ++++++--- .../META-INF/MANIFEST.MF | 1 + org.simantics.plant3d/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 9 ++++++--- org.simantics.plant3d/META-INF/MANIFEST.MF | 2 +- pom.xml | 4 ++-- vtk.rendering.win32.win32.x86_64/.classpath | 12 ++++++------ .../.settings/org.eclipse.jdt.core.prefs | 9 ++++++--- .../META-INF/MANIFEST.MF | 2 +- vtk.rendering/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 9 ++++++--- vtk.rendering/META-INF/MANIFEST.MF | 2 +- vtk.win32.win32.x86_64/.classpath | 12 ++++++------ .../.settings/org.eclipse.jdt.core.prefs | 9 ++++++--- vtk.win32.win32.x86_64/META-INF/MANIFEST.MF | 2 +- vtk/.classpath | 2 +- vtk/.settings/org.eclipse.jdt.core.prefs | 9 ++++++--- vtk/META-INF/MANIFEST.MF | 2 +- 63 files changed, 327 insertions(+), 251 deletions(-) diff --git a/javax.vecmath/.classpath b/javax.vecmath/.classpath index 8a8f1668..e801ebfb 100644 --- a/javax.vecmath/.classpath +++ b/javax.vecmath/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/javax.vecmath/.settings/org.eclipse.jdt.core.prefs b/javax.vecmath/.settings/org.eclipse.jdt.core.prefs index e2df0ba5..7adc0fb9 100644 --- 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 -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.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +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 d7b3877d..9df56df2 100644 --- 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 bc74aabe..bc3587db 100644 --- a/org.jcae.opencascade.win32.x86_64/.classpath +++ b/org.jcae.opencascade.win32.x86_64/.classpath @@ -1,6 +1,6 @@ - + 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 f287d53c..7adc0fb9 100644 --- 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 -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.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +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 8d966312..52713cf3 100644 --- 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 87a3f267..15dfa142 100644 --- a/org.jcae.opencascade/.classpath +++ b/org.jcae.opencascade/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.jcae.opencascade/.settings/org.eclipse.jdt.core.prefs b/org.jcae.opencascade/.settings/org.eclipse.jdt.core.prefs index 77aea377..7adc0fb9 100644 --- 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 -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.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +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 d54c0fea..3dd51f35 100644 --- 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 693f5738..02a7e076 100644 --- 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> implements Comparable } 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> implements Comparable writer.println(""); } - private void dump(PrintWriter writer, Set shapeSet, int[] id) + protected void dump(PrintWriter writer, Set shapeSet, int[] id) { T shape = getDerived(); if (!shapeSet.contains(shape)) @@ -447,7 +447,7 @@ public abstract class Shape> implements Comparable * @param maxsize the maximum number of returned shapes * @param shape exploration will end when this shape will be found */ - private T explore(Collection result, TopAbs_ShapeEnum wantedType, int maxsize, + protected T explore(Collection 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 b862a296..e801ebfb 100644 --- a/org.simantics.g3d.csg.ontology/.classpath +++ b/org.simantics.g3d.csg.ontology/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + 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 295926d9..7adc0fb9 100644 --- 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 -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.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +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 0c5ab4f1..9e43bc88 100644 --- 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 5e4f6d9c..f1d7ba28 100644 --- a/org.simantics.g3d.csg/.classpath +++ b/org.simantics.g3d.csg/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + 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 295926d9..7adc0fb9 100644 --- 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 -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.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +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 46700b06..d4b349a1 100644 --- 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 8a8f1668..e801ebfb 100644 --- a/org.simantics.g3d.jme/.classpath +++ b/org.simantics.g3d.jme/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + 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 c107b6a5..7adc0fb9 100644 --- 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 -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.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +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 59de283d..e68a2b14 100644 --- 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 b862a296..e801ebfb 100644 --- a/org.simantics.g3d.ontology/.classpath +++ b/org.simantics.g3d.ontology/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + 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 295926d9..7adc0fb9 100644 --- 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 -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.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +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 c91a2332..c9ffed53 100644 --- 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 4f26eebe..6edaecee 100644 --- a/org.simantics.g3d.repository/pom.xml +++ b/org.simantics.g3d.repository/pom.xml @@ -62,6 +62,23 @@ + + + org.simantics + + graph-builder-maven-plugin + + + [0.0.9,) + + + compile-graphs + + + + + + diff --git a/org.simantics.g3d.vtk/.classpath b/org.simantics.g3d.vtk/.classpath index b862a296..e801ebfb 100644 --- a/org.simantics.g3d.vtk/.classpath +++ b/org.simantics.g3d.vtk/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + 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 0c68a61d..7adc0fb9 100644 --- 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 1ba1aaf6..86d0da4a 100644 --- 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 b862a296..e801ebfb 100644 --- a/org.simantics.g3d/.classpath +++ b/org.simantics.g3d/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.simantics.g3d/.settings/org.eclipse.jdt.core.prefs b/org.simantics.g3d/.settings/org.eclipse.jdt.core.prefs index 295926d9..7adc0fb9 100644 --- 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 -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.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +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 ea29d780..ce07870b 100644 --- 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 b862a296..e801ebfb 100644 --- a/org.simantics.objmap2/.classpath +++ b/org.simantics.objmap2/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.simantics.objmap2/.settings/org.eclipse.jdt.core.prefs b/org.simantics.objmap2/.settings/org.eclipse.jdt.core.prefs index 295926d9..7adc0fb9 100644 --- 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 -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.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +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 59ec5b1e..2e5ead63 100644 --- 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 8a8f1668..e801ebfb 100644 --- a/org.simantics.opencascade.jme/.classpath +++ b/org.simantics.opencascade.jme/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + 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 27353b81..7adc0fb9 100644 --- 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 -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.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +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 37567820..7e9b8a48 100644 --- 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 b862a296..e801ebfb 100644 --- a/org.simantics.opencascade.vtk/.classpath +++ b/org.simantics.opencascade.vtk/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + 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 295926d9..7adc0fb9 100644 --- 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 -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.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +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 3ee6f40c..87a1c368 100644 --- 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 b862a296..e801ebfb 100644 --- a/org.simantics.opencascade/.classpath +++ b/org.simantics.opencascade/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.simantics.opencascade/.settings/org.eclipse.jdt.core.prefs b/org.simantics.opencascade/.settings/org.eclipse.jdt.core.prefs index 295926d9..7adc0fb9 100644 --- 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 -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.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +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 3a8e7957..58da79d4 100644 --- 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 b862a296..e801ebfb 100644 --- a/org.simantics.plant3d.ontology/.classpath +++ b/org.simantics.plant3d.ontology/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + 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 0c68a61d..7adc0fb9 100644 --- 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 8b7db6f7..8432514a 100644 --- 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 ad32c83a..e801ebfb 100644 --- a/org.simantics.plant3d.product/.classpath +++ b/org.simantics.plant3d.product/.classpath @@ -1,6 +1,6 @@ - + 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 c537b630..7adc0fb9 100644 --- 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 18b269a2..2e189044 100644 --- 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 b862a296..e801ebfb 100644 --- a/org.simantics.plant3d/.classpath +++ b/org.simantics.plant3d/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.simantics.plant3d/.settings/org.eclipse.jdt.core.prefs b/org.simantics.plant3d/.settings/org.eclipse.jdt.core.prefs index 0c68a61d..7adc0fb9 100644 --- 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 4d63758e..5c5909b0 100644 --- 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 5b7d1b96..7ed7b5b1 100644 --- a/pom.xml +++ b/pom.xml @@ -10,8 +10,8 @@ master http://www.simantics.org/download - 1.4.0 - 1.4.0 + 1.6.0 + 1.6.0 SNAPSHOT diff --git a/vtk.rendering.win32.win32.x86_64/.classpath b/vtk.rendering.win32.win32.x86_64/.classpath index dbc0de13..bc3587db 100644 --- a/vtk.rendering.win32.win32.x86_64/.classpath +++ b/vtk.rendering.win32.win32.x86_64/.classpath @@ -1,6 +1,6 @@ - - - - - - + + + + + + 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 0c68a61d..7adc0fb9 100644 --- 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 489c8328..5ea347e5 100644 --- 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 b9bcee7a..da2ee4c0 100644 --- a/vtk.rendering/.classpath +++ b/vtk.rendering/.classpath @@ -2,7 +2,7 @@ - + diff --git a/vtk.rendering/.settings/org.eclipse.jdt.core.prefs b/vtk.rendering/.settings/org.eclipse.jdt.core.prefs index 0c68a61d..7adc0fb9 100644 --- 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 6ee0bfe1..a5d18f97 100644 --- 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 dbc0de13..bc3587db 100644 --- a/vtk.win32.win32.x86_64/.classpath +++ b/vtk.win32.win32.x86_64/.classpath @@ -1,6 +1,6 @@ - - - - - - + + + + + + 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 0c68a61d..7adc0fb9 100644 --- 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 b75d2443..2884be37 100644 --- 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 eca7bdba..e801ebfb 100644 --- a/vtk/.classpath +++ b/vtk/.classpath @@ -1,6 +1,6 @@ - + diff --git a/vtk/.settings/org.eclipse.jdt.core.prefs b/vtk/.settings/org.eclipse.jdt.core.prefs index 0c68a61d..7adc0fb9 100644 --- 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 b69953b7..7e5a87a1 100644 --- 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 -- 2.45.2