Switch r master to JavaSE-11

gitlab simantics/platform#524

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

diff --git a/bundles/org.simantics.r.fileimport/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.r.fileimport/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/bundles/org.simantics.r.fileimport/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.r.fileimport/.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/bundles/org.simantics.r.fileimport/META-INF/MANIFEST.MF b/bundles/org.simantics.r.fileimport/META-INF/MANIFEST.MF
index 714ad7298b8dce8991fb3b6b4344ba71c9e33d2d..3e00a940152484bf51fed51175f28a9a81dea9ba 100644 (file)
--- a/bundles/org.simantics.r.fileimport/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.r.fileimport/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics.r;bundle-version="0.1.0",
  org.simantics.db,
  org.simantics
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/component.xml

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

diff --git a/bundles/org.simantics.r.ontology/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.r.ontology/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/bundles/org.simantics.r.ontology/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.r.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/bundles/org.simantics.r.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.r.ontology/META-INF/MANIFEST.MF
index db09dafdc7bfebf858f7d317fc24c7dc8513c70e..998965309c1defff38c7ec950bd1c6fdc202f427 100644 (file)
--- a/bundles/org.simantics.r.ontology/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.r.ontology/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: http://www.simantics.org/R
 Bundle-SymbolicName: org.simantics.r.ontology
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.layer0;bundle-version="1.1.0",
  org.simantics.simulation.ontology;bundle-version="1.1.0",
  org.simantics.selectionview.ontology;bundle-version="1.2.0",

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

diff --git a/bundles/org.simantics.r.scl/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.r.scl/.settings/org.eclipse.jdt.core.prefs
index 62b7e4d656958c71040627c53133cf5ebf041613..10e1e2971cb6bc1046416013098572a3c3625aec 100644 (file)
--- a/bundles/org.simantics.r.scl/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.r.scl/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable\r
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11\r
+org.eclipse.jdt.core.compiler.compliance=11\r
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore\r
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled\r
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning\r
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore\r
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore\r
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore\r
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore\r
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\r
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled\r
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning\r
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled\r
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore\r
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning\r
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+org.eclipse.jdt.core.compiler.release=enabled\r
+org.eclipse.jdt.core.compiler.source=11\r

diff --git a/bundles/org.simantics.r.scl/META-INF/MANIFEST.MF b/bundles/org.simantics.r.scl/META-INF/MANIFEST.MF
index 5676aa6906ae5d30bf56892b806998378a102ca5..e2cb1dbd1376416e7d8564e6c75a1c2c0117de46 100644 (file)
--- a/bundles/org.simantics.r.scl/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.r.scl/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: RServe connectivity
 Bundle-SymbolicName: org.simantics.r.scl;singleton:=true
 Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.scl.runtime;bundle-version="0.4.0",
  gnu.trove3;bundle-version="3.0.3",
  org.simantics.simulator.variable;bundle-version="1.0.0",

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

diff --git a/bundles/org.simantics.r/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.r/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/bundles/org.simantics.r/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.r/.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/bundles/org.simantics.r/META-INF/MANIFEST.MF b/bundles/org.simantics.r/META-INF/MANIFEST.MF
index 9d0c09105554fde247982c9b9fbad035c560a247..8f69b05218d481266eb35ca8822676e177afefc7 100644 (file)
--- a/bundles/org.simantics.r/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.r/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: R Variable for Simantics
 Bundle-SymbolicName: org.simantics.r;singleton:=true
 Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.r.ontology;bundle-version="1.0.0",
  org.simantics.r.scl;bundle-version="0.0.1",
  org.simantics.scl.runtime;bundle-version="0.4.0",

diff --git a/releng/org.simantics.r.tycho.configuration/pom.xml b/releng/org.simantics.r.tycho.configuration/pom.xml
index 1af1b61d4f21f2a6280cefe1e39368ea864ce2b5..d7f36a897a8aaa997996830f8c046ad31a2fe037 100644 (file)
--- a/releng/org.simantics.r.tycho.configuration/pom.xml
+++ b/releng/org.simantics.r.tycho.configuration/pom.xml
@@ -8,8 +8,10 @@
        <packaging>pom</packaging>\r
 \r
        <properties>\r
-               <tycho.version>1.0.0</tycho.version>\r
-               <tycho.extras.version>1.0.0</tycho.extras.version>\r
+               <maven.compiler.source>11</maven.compiler.source>\r
+               <maven.compiler.target>11</maven.compiler.target>\r
+               <tycho.version>1.7.0</tycho.version>\r
+               <tycho.extras.version>1.7.0</tycho.extras.version>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <branch-spec>master</branch-spec>\r
                <simantics-download-site>http://www.simantics.org/download</simantics-download-site>\r