From: Tuukka Lehtonen Date: Tue, 21 Apr 2020 22:21:13 +0000 (+0300) Subject: Require JavaSE-11 from now on X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Finterop.git;a=commitdiff_plain;h=7a35eb34c64998f265cdaa3b2e0ad85a31ad40ab Require JavaSE-11 from now on gitlab simantics/platform#524 Change-Id: Ia738363f0169c0dd2e99c2648e6d7b4b54bba8e7 --- diff --git a/org.simantics.excel.poi/.classpath b/org.simantics.excel.poi/.classpath index b862a29..e801ebf 100644 --- a/org.simantics.excel.poi/.classpath +++ b/org.simantics.excel.poi/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.simantics.excel.poi/.settings/org.eclipse.jdt.core.prefs b/org.simantics.excel.poi/.settings/org.eclipse.jdt.core.prefs index 295926d..7adc0fb 100644 --- a/org.simantics.excel.poi/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.excel.poi/.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.excel.poi/META-INF/MANIFEST.MF b/org.simantics.excel.poi/META-INF/MANIFEST.MF index 4356d5c..38c43b4 100644 --- a/org.simantics.excel.poi/META-INF/MANIFEST.MF +++ b/org.simantics.excel.poi/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Bundle-Activator: org.simantics.excel.poi.Activator Bundle-Vendor: VTT Require-Bundle: org.eclipse.core.runtime, org.apache.poi;bundle-version="3.15.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.excel.poi.parser, org.simantics.excel.poi.parser.streaming +Automatic-Module-Name: org.simantics.excel.poi diff --git a/org.simantics.express/.classpath b/org.simantics.express/.classpath index 8a8f166..e801ebf 100644 --- a/org.simantics.express/.classpath +++ b/org.simantics.express/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.simantics.express/META-INF/MANIFEST.MF b/org.simantics.express/META-INF/MANIFEST.MF index 7c315a4..facf5ab 100644 --- a/org.simantics.express/META-INF/MANIFEST.MF +++ b/org.simantics.express/META-INF/MANIFEST.MF @@ -3,4 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: Express Plug-in Bundle-SymbolicName: org.simantics.express Bundle-Version: 1.0.0 -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Automatic-Module-Name: org.simantics.express diff --git a/org.simantics.interop.diagram/.classpath b/org.simantics.interop.diagram/.classpath index eca7bdb..e801ebf 100644 --- a/org.simantics.interop.diagram/.classpath +++ b/org.simantics.interop.diagram/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.simantics.interop.diagram/.settings/org.eclipse.jdt.core.prefs b/org.simantics.interop.diagram/.settings/org.eclipse.jdt.core.prefs index 0c68a61..7adc0fb 100644 --- a/org.simantics.interop.diagram/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.interop.diagram/.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.interop.diagram/META-INF/MANIFEST.MF b/org.simantics.interop.diagram/META-INF/MANIFEST.MF index 0967fb6..fc4e49c 100644 --- a/org.simantics.interop.diagram/META-INF/MANIFEST.MF +++ b/org.simantics.interop.diagram/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Interop Diagram Bundle-SymbolicName: org.simantics.interop.diagram Bundle-Version: 1.0.0.qualifier Automatic-Module-Name: org.simantics.interop.diagram -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.13.0", org.simantics.db;bundle-version="1.1.0", org.simantics.db.layer0;bundle-version="1.1.0", diff --git a/org.simantics.interop.mapping/.classpath b/org.simantics.interop.mapping/.classpath index 8a8f166..e801ebf 100644 --- a/org.simantics.interop.mapping/.classpath +++ b/org.simantics.interop.mapping/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.simantics.interop.mapping/.settings/org.eclipse.jdt.core.prefs b/org.simantics.interop.mapping/.settings/org.eclipse.jdt.core.prefs index f287d53..7adc0fb 100644 --- a/org.simantics.interop.mapping/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.interop.mapping/.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.simantics.interop.mapping/META-INF/MANIFEST.MF b/org.simantics.interop.mapping/META-INF/MANIFEST.MF index 4ddf228..494937c 100644 --- a/org.simantics.interop.mapping/META-INF/MANIFEST.MF +++ b/org.simantics.interop.mapping/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui, org.apache.log4j;bundle-version="1.2.15", org.simantics.db.layer0;bundle-version="1.1.0", org.simantics.ui;bundle-version="1.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.interop.mapping, org.simantics.interop.mapping.data diff --git a/org.simantics.interop.scl/.classpath b/org.simantics.interop.scl/.classpath index eca7bdb..e801ebf 100644 --- a/org.simantics.interop.scl/.classpath +++ b/org.simantics.interop.scl/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.simantics.interop.scl/.settings/org.eclipse.jdt.core.prefs b/org.simantics.interop.scl/.settings/org.eclipse.jdt.core.prefs index 0c68a61..7adc0fb 100644 --- a/org.simantics.interop.scl/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.interop.scl/.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.interop.scl/META-INF/MANIFEST.MF b/org.simantics.interop.scl/META-INF/MANIFEST.MF index 93c3c68..fbac556 100644 --- a/org.simantics.interop.scl/META-INF/MANIFEST.MF +++ b/org.simantics.interop.scl/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Scl Bundle-SymbolicName: org.simantics.interop.scl Bundle-Version: 1.0.0.qualifier Automatic-Module-Name: org.simantics.interop.scl -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.simantics.scl.data;bundle-version="1.0.0", org.simantics.scl.db;bundle-version="0.1.3", org.simantics.scl.expressions;bundle-version="1.0.0", diff --git a/org.simantics.interop.update/.classpath b/org.simantics.interop.update/.classpath index eca7bdb..e801ebf 100644 --- a/org.simantics.interop.update/.classpath +++ b/org.simantics.interop.update/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.simantics.interop.update/.settings/org.eclipse.jdt.core.prefs b/org.simantics.interop.update/.settings/org.eclipse.jdt.core.prefs index 0c68a61..7adc0fb 100644 --- a/org.simantics.interop.update/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.interop.update/.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.interop.update/META-INF/MANIFEST.MF b/org.simantics.interop.update/META-INF/MANIFEST.MF index d0a0ca7..8c67e99 100644 --- a/org.simantics.interop.update/META-INF/MANIFEST.MF +++ b/org.simantics.interop.update/META-INF/MANIFEST.MF @@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui, org.simantics.issues.common;bundle-version="1.1.0", org.simantics.db.layer0;bundle-version="1.1.0", org.simantics.ui;bundle-version="1.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.interop.update.editor, org.simantics.interop.update.model +Automatic-Module-Name: org.simantics.interop.update diff --git a/org.simantics.interop.xmlio/.classpath b/org.simantics.interop.xmlio/.classpath index 8a8f166..e801ebf 100644 --- a/org.simantics.interop.xmlio/.classpath +++ b/org.simantics.interop.xmlio/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.simantics.interop.xmlio/.settings/org.eclipse.jdt.core.prefs b/org.simantics.interop.xmlio/.settings/org.eclipse.jdt.core.prefs index f287d53..7adc0fb 100644 --- a/org.simantics.interop.xmlio/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.interop.xmlio/.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.simantics.interop.xmlio/META-INF/MANIFEST.MF b/org.simantics.interop.xmlio/META-INF/MANIFEST.MF index 75e6d2b..5fd7ea7 100644 --- a/org.simantics.interop.xmlio/META-INF/MANIFEST.MF +++ b/org.simantics.interop.xmlio/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Require-Bundle: org.eclipse.ui, org.simantics.db.common;bundle-version="1.1.0", org.simantics.db.layer0;bundle-version="1.1.0", it.unimi.dsi.fastutil;bundle-version="7.0.13" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.interop.xmlio +Automatic-Module-Name: org.simantics.interop.xmlio diff --git a/org.simantics.interop/.classpath b/org.simantics.interop/.classpath index eca7bdb..e801ebf 100644 --- a/org.simantics.interop/.classpath +++ b/org.simantics.interop/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.simantics.interop/.settings/org.eclipse.jdt.core.prefs b/org.simantics.interop/.settings/org.eclipse.jdt.core.prefs index a698e59..7adc0fb 100644 --- a/org.simantics.interop/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.interop/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate +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.interop/META-INF/MANIFEST.MF b/org.simantics.interop/META-INF/MANIFEST.MF index b7e9fa5..b000165 100644 --- a/org.simantics.interop/META-INF/MANIFEST.MF +++ b/org.simantics.interop/META-INF/MANIFEST.MF @@ -23,9 +23,10 @@ Require-Bundle: org.eclipse.ui, org.simantics.browsing.ui.model;bundle-version="1.0.0", org.simantics.structural.ontology;bundle-version="1.1.0", org.slf4j.api -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.interop.stubs, org.simantics.interop.test, org.simantics.interop.utils +Automatic-Module-Name: org.simantics.interop diff --git a/org.simantics.interop/graph.tg b/org.simantics.interop/graph.tg index 5cc6c8e..53e9840 100644 Binary files a/org.simantics.interop/graph.tg and b/org.simantics.interop/graph.tg differ diff --git a/org.simantics.xml.sax.base/.classpath b/org.simantics.xml.sax.base/.classpath index b1dabee..e801ebf 100644 --- a/org.simantics.xml.sax.base/.classpath +++ b/org.simantics.xml.sax.base/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.simantics.xml.sax.base/.settings/org.eclipse.jdt.core.prefs b/org.simantics.xml.sax.base/.settings/org.eclipse.jdt.core.prefs index 11f6e46..7adc0fb 100644 --- a/org.simantics.xml.sax.base/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.xml.sax.base/.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.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +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.xml.sax.base/META-INF/MANIFEST.MF b/org.simantics.xml.sax.base/META-INF/MANIFEST.MF index a27afd7..e096608 100644 --- a/org.simantics.xml.sax.base/META-INF/MANIFEST.MF +++ b/org.simantics.xml.sax.base/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Sax Parser Base Bundle-SymbolicName: org.simantics.xml.sax.base Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VTT -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.core.runtime, org.simantics.db;bundle-version="1.1.0", org.simantics.db.common;bundle-version="1.1.0", @@ -15,3 +15,4 @@ Export-Package: org.simantics.xml.sax.base, org.simantics.xml.sax.base.datatypes.adapter, org.simantics.xml.sax.base.datatypes.adt, org.simantics.xml.sax.base.datatypes.literal +Automatic-Module-Name: org.simantics.xml.sax.base diff --git a/org.simantics.xml.sax.ontology/.classpath b/org.simantics.xml.sax.ontology/.classpath index b862a29..e801ebf 100644 --- a/org.simantics.xml.sax.ontology/.classpath +++ b/org.simantics.xml.sax.ontology/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.simantics.xml.sax.ontology/.settings/org.eclipse.jdt.core.prefs b/org.simantics.xml.sax.ontology/.settings/org.eclipse.jdt.core.prefs index 295926d..7adc0fb 100644 --- a/org.simantics.xml.sax.ontology/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.xml.sax.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.xml.sax.ontology/META-INF/MANIFEST.MF b/org.simantics.xml.sax.ontology/META-INF/MANIFEST.MF index a3b1741..4129cca 100644 --- a/org.simantics.xml.sax.ontology/META-INF/MANIFEST.MF +++ b/org.simantics.xml.sax.ontology/META-INF/MANIFEST.MF @@ -5,5 +5,6 @@ Bundle-SymbolicName: org.simantics.xml.sax.ontology Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Simantics XML base ontology Require-Bundle: org.simantics.layer0;bundle-version="1.1.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.simantics.xml.sax.ontology +Automatic-Module-Name: org.simantics.xml.sax.ontology diff --git a/org.simantics.xml.sax.ui/.classpath b/org.simantics.xml.sax.ui/.classpath index b1dabee..e801ebf 100644 --- a/org.simantics.xml.sax.ui/.classpath +++ b/org.simantics.xml.sax.ui/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.simantics.xml.sax.ui/.settings/org.eclipse.jdt.core.prefs b/org.simantics.xml.sax.ui/.settings/org.eclipse.jdt.core.prefs index 11f6e46..7adc0fb 100644 --- a/org.simantics.xml.sax.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.xml.sax.ui/.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.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +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.xml.sax.ui/META-INF/MANIFEST.MF b/org.simantics.xml.sax.ui/META-INF/MANIFEST.MF index 16b2876..c8c1f98 100644 --- a/org.simantics.xml.sax.ui/META-INF/MANIFEST.MF +++ b/org.simantics.xml.sax.ui/META-INF/MANIFEST.MF @@ -4,8 +4,10 @@ Bundle-Name: XML Sax Parser Generator Ui Bundle-SymbolicName: org.simantics.xml.sax.ui;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VTT -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.simantics.xml.sax;bundle-version="1.0.0", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.ui, org.simantics.utils.ui;bundle-version="1.1.0" +Import-Package: javax.xml.bind +Automatic-Module-Name: org.simantics.xml.sax.ui diff --git a/org.simantics.xml.sax/.classpath b/org.simantics.xml.sax/.classpath index b1dabee..e801ebf 100644 --- a/org.simantics.xml.sax/.classpath +++ b/org.simantics.xml.sax/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.simantics.xml.sax/.settings/org.eclipse.jdt.core.prefs b/org.simantics.xml.sax/.settings/org.eclipse.jdt.core.prefs index 11f6e46..7adc0fb 100644 --- a/org.simantics.xml.sax/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.xml.sax/.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.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +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.xml.sax/META-INF/MANIFEST.MF b/org.simantics.xml.sax/META-INF/MANIFEST.MF index 62fbab9..642cebc 100644 --- a/org.simantics.xml.sax/META-INF/MANIFEST.MF +++ b/org.simantics.xml.sax/META-INF/MANIFEST.MF @@ -4,7 +4,11 @@ Bundle-Name: Sax parser generator Bundle-SymbolicName: org.simantics.xml.sax Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VTT -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.simantics.xml.data, org.simantics.xml.sax Require-Bundle: org.simantics.utils.datastructures;bundle-version="1.1.0" +Import-Package: javax.xml.bind, + javax.xml.bind.annotation, + javax.xml.bind.annotation.adapters +Automatic-Module-Name: org.simantics.xml.sax diff --git a/pom.xml b/pom.xml index f7b1864..28c1221 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ master http://www.simantics.org/download - 1.0.0 + 1.6.0