From 077a6f801127e8f6704b59b7a504bfc58b1a6fd7 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Fri, 8 May 2020 09:53:36 +0200 Subject: [PATCH] update to Eclipse 2020-03 RCP base --- .../META-INF/MANIFEST.MF | 1 - .../.settings/org.eclipse.jdt.core.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 1 + .../DatabaseServicesTest.launch | 144 ++++++++++++------ .../META-INF/MANIFEST.MF | 1 - .../.settings/org.eclipse.jdt.core.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 1 + .../META-INF/MANIFEST.MF | 1 - .../.settings/org.eclipse.jdt.core.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 1 + .../META-INF/MANIFEST.MF | 1 - .../scviewer/e4/application/E4LifeCycle.java | 1 - .../com.minres.scviewer.target.target | 29 ++-- .../.settings/org.eclipse.jdt.core.prefs | 1 + 14 files changed, 124 insertions(+), 61 deletions(-) diff --git a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF b/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF index 7e68178..ff10c05 100644 --- a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Import-Package: org.osgi.framework;version="1.3.0" Automatic-Module-Name: com.minres.scviewer.database.leveldb Service-Component: OSGI-INF/*.xml Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0", - org.eclipse.equinox.util;bundle-version="1.0.500", org.eclipse.equinox.ds;bundle-version="1.4.200", org.eclipse.osgi.services;bundle-version="3.4.0" Bundle-ActivationPolicy: lazy diff --git a/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs index 0c68a61..9f6ece8 100644 --- a/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs +++ b/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs @@ -4,4 +4,5 @@ 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.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs index 6e80039..4e4a3ad 100644 --- a/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs +++ b/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs @@ -5,4 +5,5 @@ 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.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/com.minres.scviewer.database.test/DatabaseServicesTest.launch b/com.minres.scviewer.database.test/DatabaseServicesTest.launch index c44770d..f8e3594 100644 --- a/com.minres.scviewer.database.test/DatabaseServicesTest.launch +++ b/com.minres.scviewer.database.test/DatabaseServicesTest.launch @@ -1,46 +1,104 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF index 605975f..d073c7a 100644 --- a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: com.minres.scviewer.database, org.codehaus.groovy;bundle-version="2.5.8", - org.eclipse.equinox.util;bundle-version="1.0.500", org.eclipse.equinox.ds;bundle-version="1.4.200", org.eclipse.osgi.services;bundle-version="3.4.0", com.google.guava;bundle-version="15.0.0" diff --git a/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs index ce96ddf..ddb046a 100644 --- a/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs +++ b/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs @@ -98,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs index 0c68a61..9f6ece8 100644 --- a/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs +++ b/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs @@ -4,4 +4,5 @@ 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.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF index 3f0cc56..f83fd29 100644 --- a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Version: 2.0.2.qualifier Bundle-Vendor: MINRES Technologies GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0", - org.eclipse.equinox.util;bundle-version="1.0.500", org.eclipse.equinox.ds;bundle-version="1.4.200", org.eclipse.osgi.services;bundle-version="3.4.0", com.google.guava;bundle-version="15.0.0" diff --git a/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs index 6e80039..4e4a3ad 100644 --- a/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs +++ b/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs @@ -5,4 +5,5 @@ 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.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs index a698e59..87b7a7a 100644 --- a/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs +++ b/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs @@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF index 21b1443..32d5ccc 100644 --- a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF @@ -18,7 +18,6 @@ Require-Bundle: javax.inject;bundle-version="1.0.0", com.minres.scviewer.database.ui, com.minres.scviewer.database;bundle-version="1.0.0", org.eclipse.equinox.ds;bundle-version="1.4.300", - org.eclipse.equinox.util;bundle-version="1.0.500", org.eclipse.osgi.services;bundle-version="3.5.0", org.eclipse.e4.core.services;bundle-version="2.0.0", org.eclipse.osgi.services;bundle-version="3.5.0", diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java index 7532fb8..310323a 100644 --- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java +++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java @@ -46,7 +46,6 @@ import com.minres.scviewer.e4.application.options.Options.Separator; * org.eclipse.core.runtime.products' extension point) that references * this class. **/ -@SuppressWarnings("restriction") public class E4LifeCycle { /** diff --git a/com.minres.scviewer.target/com.minres.scviewer.target.target b/com.minres.scviewer.target/com.minres.scviewer.target.target index 4571d61..e7ffad1 100644 --- a/com.minres.scviewer.target/com.minres.scviewer.target.target +++ b/com.minres.scviewer.target/com.minres.scviewer.target.target @@ -3,23 +3,26 @@ - - - - - - - - + + + + + + + + + + - - - + + + + - - + + diff --git a/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs index a698e59..87b7a7a 100644 --- a/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs +++ b/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs @@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8