From f04ebb2b0865db0642fdb12b1914a4bae99d6d06 Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Thu, 12 Nov 2015 15:15:20 +0100 Subject: [PATCH 1/1] Update eclipse compile / runtime to JavaSE-1.7 Conflicts: eu.etaxonomy.taxeditor.application/.classpath --- eu.etaxonomy.taxeditor.application/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.bulkeditor/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.cdmlib/.classpath | 5 ++-- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.editor/.classpath | 18 +++++++------- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.help/.classpath | 14 +++++------ .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 1 + eu.etaxonomy.taxeditor.molecular/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.navigation/.classpath | 18 +++++++------- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.store/.classpath | 20 ++++++++-------- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.test/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 ++--- .../META-INF/MANIFEST.MF | 5 ++-- eu.etaxonomy.taxeditor/.classpath | 24 +++++++++---------- 24 files changed, 71 insertions(+), 70 deletions(-) diff --git a/eu.etaxonomy.taxeditor.application/.classpath b/eu.etaxonomy.taxeditor.application/.classpath index 4c0364cad..6bca977be 100644 --- a/eu.etaxonomy.taxeditor.application/.classpath +++ b/eu.etaxonomy.taxeditor.application/.classpath @@ -1,6 +1,6 @@ - + diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF index e2399fc7e..1d3e864b3 100644 --- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: EDIT Bundle-Localization: OSGI-INF/l10n/plugin Export-Package: eu.etaxonomy.taxeditor Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: eu.etaxonomy.cdm.database, org.apache.log4j, org.eclipse.equinox.app, diff --git a/eu.etaxonomy.taxeditor.bulkeditor/.classpath b/eu.etaxonomy.taxeditor.bulkeditor/.classpath index 3bf936df7..264aebb56 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/.classpath +++ b/eu.etaxonomy.taxeditor.bulkeditor/.classpath @@ -1,6 +1,6 @@ - + diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF index 7a0db176e..a17f53efc 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.expressions, eu.etaxonomy.taxeditor.store, eu.etaxonomy.taxeditor.cdmlib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Import-Package: eu.etaxonomy.taxeditor.editor, org.eclipse.core.runtime, diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index 442ca897d..824993637 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -1,6 +1,6 @@ - + @@ -193,10 +193,9 @@ - + - diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index 5e1f96d91..1388318fa 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -467,7 +467,7 @@ Export-Package: com.google.api, org.springframework.ui, javax.servlet.http" Bundle-Vendor: EDIT -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.osgi, org.eclipse.equinox.common, org.apache.commons.httpclient;bundle-version="3.1.0", diff --git a/eu.etaxonomy.taxeditor.editor/.classpath b/eu.etaxonomy.taxeditor.editor/.classpath index 1389dff1f..13a030a92 100644 --- a/eu.etaxonomy.taxeditor.editor/.classpath +++ b/eu.etaxonomy.taxeditor.editor/.classpath @@ -1,9 +1,9 @@ - - - - - - - - - + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF index b41d0021e..fd93d85d7 100644 --- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF @@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.zest.layouts, eu.etaxonomy.taxeditor.cdmlib, org.eclipse.ui.ide -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.core.databinding.beans, org.eclipse.core.databinding.observable.list, diff --git a/eu.etaxonomy.taxeditor.help/.classpath b/eu.etaxonomy.taxeditor.help/.classpath index 46c533388..bcb633e0f 100644 --- a/eu.etaxonomy.taxeditor.help/.classpath +++ b/eu.etaxonomy.taxeditor.help/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF index b93f49c3a..ca7c794c0 100644 --- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.help.ui, org.eclipse.help.webapp -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy diff --git a/eu.etaxonomy.taxeditor.molecular.lib/.classpath b/eu.etaxonomy.taxeditor.molecular.lib/.classpath index 1d66dd2b8..93500de9a 100644 --- a/eu.etaxonomy.taxeditor.molecular.lib/.classpath +++ b/eu.etaxonomy.taxeditor.molecular.lib/.classpath @@ -1,6 +1,6 @@ - + diff --git a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF index 5fa66f8fb..b0a7f0a20 100644 --- a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF @@ -162,3 +162,4 @@ Export-Package: info.bioinfweb.commons, Bundle-ActivationPolicy: lazy Import-Package: javax.swing Require-Bundle: org.eclipse.swt +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/eu.etaxonomy.taxeditor.molecular/.classpath b/eu.etaxonomy.taxeditor.molecular/.classpath index f14ba2c2e..60dea2f68 100644 --- a/eu.etaxonomy.taxeditor.molecular/.classpath +++ b/eu.etaxonomy.taxeditor.molecular/.classpath @@ -1,6 +1,6 @@ - + diff --git a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF index ee9813cbc..f9e434115 100644 --- a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui, eu.etaxonomy.taxeditor.editor, eu.etaxonomy.taxeditor.store, eu.etaxonomy.taxeditor.molecular.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Bundle-Vendor: EDIT Export-Package: eu.etaxonomy.taxeditor.molecular, diff --git a/eu.etaxonomy.taxeditor.navigation/.classpath b/eu.etaxonomy.taxeditor.navigation/.classpath index 5676d8def..3a227f058 100644 --- a/eu.etaxonomy.taxeditor.navigation/.classpath +++ b/eu.etaxonomy.taxeditor.navigation/.classpath @@ -1,9 +1,9 @@ - - - - - - - - - + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF index 78d112612..a241bb038 100644 --- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF @@ -27,7 +27,7 @@ Import-Package: org.eclipse.core.resources, org.eclipse.ui.forms.widgets, org.osgi.framework Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ClassPath: ., activation-1.1.jar, antlr-2.7.6.jar, diff --git a/eu.etaxonomy.taxeditor.printpublisher/.classpath b/eu.etaxonomy.taxeditor.printpublisher/.classpath index f14ba2c2e..60dea2f68 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/.classpath +++ b/eu.etaxonomy.taxeditor.printpublisher/.classpath @@ -1,6 +1,6 @@ - + diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF index b48e075d0..6803847a1 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Import-Package: org.apache.log4j, Bundle-ActivationPolicy: lazy Bundle-Vendor: EDIT Bundle-Activator: eu.etaxonomy.taxeditor.printpublisher.internal.PrintpublisherPlugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ClassPath: ., activation-1.1.jar, antlr-2.7.6.jar, diff --git a/eu.etaxonomy.taxeditor.store/.classpath b/eu.etaxonomy.taxeditor.store/.classpath index acbc97488..db46751e9 100644 --- a/eu.etaxonomy.taxeditor.store/.classpath +++ b/eu.etaxonomy.taxeditor.store/.classpath @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF index 06ed980ec..061e66834 100644 --- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF @@ -90,7 +90,7 @@ Import-Package: org.eclipse.core.commands, org.osgi.framework, org.osgi.service.prefs;version="1.1.1" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ClassPath: ., activation-1.1.1.jar, antlr-2.7.7.jar, diff --git a/eu.etaxonomy.taxeditor.test/.classpath b/eu.etaxonomy.taxeditor.test/.classpath index c2021ac9d..cc0f994d1 100644 --- a/eu.etaxonomy.taxeditor.test/.classpath +++ b/eu.etaxonomy.taxeditor.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/eu.etaxonomy.taxeditor.test/.settings/org.eclipse.jdt.core.prefs b/eu.etaxonomy.taxeditor.test/.settings/org.eclipse.jdt.core.prefs index c537b6306..f42de363a 100644 --- a/eu.etaxonomy.taxeditor.test/.settings/org.eclipse.jdt.core.prefs +++ b/eu.etaxonomy.taxeditor.test/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ 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=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.6 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF index 65c904cfd..9dd1f4af8 100644 --- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF @@ -5,11 +5,12 @@ Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true Bundle-Version: 3.12.0.qualifier Bundle-ActivationPolicy: lazy Bundle-Vendor: EDIT -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.ui.ide, org.junit;bundle-version="4.8.2", + eu.etaxonomy.taxeditor.webapp, eu.etaxonomy.taxeditor.cdmlib, eu.etaxonomy.taxeditor.bulkeditor, eu.etaxonomy.taxeditor.editor, @@ -30,4 +31,4 @@ Bundle-ClassPath: ., lib/unitils-dbmaintainer-3.4.2.jar, lib/unitils-dbunit-3.4.2.jar, lib/unitils-spring-3.4.2.jar, - lib/dbunit-2.4.9.jar \ No newline at end of file + lib/dbunit-2.4.9.jar diff --git a/eu.etaxonomy.taxeditor/.classpath b/eu.etaxonomy.taxeditor/.classpath index 3446faf90..412e52cde 100644 --- a/eu.etaxonomy.taxeditor/.classpath +++ b/eu.etaxonomy.taxeditor/.classpath @@ -1,12 +1,12 @@ - - - - - - - - - - - - + + + + + + + + + + + + -- 2.34.1