From 906b8360408b1786a3e9d2f9804f096a3bf3d880 Mon Sep 17 00:00:00 2001 From: Markus Rathgeb Date: Mon, 9 Mar 2015 09:05:32 +0100 Subject: [PATCH] classpath's JRE container and execution enviroment's one does not fit Fix "The JRE container on the classpath is not a perfect match to the 'J2SE-1.5' execution environment" for org.openhab.io.transport.serial. Fix "The JRE container on the classpath is not a perfect match to the 'JavaSE-1.7' execution environment" for org.openhab.core.init and org.openhab.core. Signed-off-by: Markus Rathgeb --- bundles/core/org.openhab.core.init/.classpath | 4 ++-- .../.settings/org.eclipse.jdt.core.prefs | 6 ++++++ bundles/core/org.openhab.core/.classpath | 4 ++-- .../org.openhab.core/.settings/org.eclipse.jdt.core.prefs | 6 ++++++ bundles/io/org.openhab.io.transport.serial/.classpath | 2 +- .../io/org.openhab.io.transport.serial/META-INF/MANIFEST.MF | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/bundles/core/org.openhab.core.init/.classpath b/bundles/core/org.openhab.core.init/.classpath index 913a170d25eb1..1e446acfc621c 100644 --- a/bundles/core/org.openhab.core.init/.classpath +++ b/bundles/core/org.openhab.core.init/.classpath @@ -1,8 +1,8 @@ + + - - diff --git a/bundles/core/org.openhab.core.init/.settings/org.eclipse.jdt.core.prefs b/bundles/core/org.openhab.core.init/.settings/org.eclipse.jdt.core.prefs index 4ede96d8a736c..443e08599a2e6 100644 --- a/bundles/core/org.openhab.core.init/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/core/org.openhab.core.init/.settings/org.eclipse.jdt.core.prefs @@ -1,2 +1,8 @@ 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.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/bundles/core/org.openhab.core/.classpath b/bundles/core/org.openhab.core/.classpath index 913a170d25eb1..1e446acfc621c 100644 --- a/bundles/core/org.openhab.core/.classpath +++ b/bundles/core/org.openhab.core/.classpath @@ -1,8 +1,8 @@ + + - - diff --git a/bundles/core/org.openhab.core/.settings/org.eclipse.jdt.core.prefs b/bundles/core/org.openhab.core/.settings/org.eclipse.jdt.core.prefs index 4ede96d8a736c..443e08599a2e6 100644 --- a/bundles/core/org.openhab.core/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/core/org.openhab.core/.settings/org.eclipse.jdt.core.prefs @@ -1,2 +1,8 @@ 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.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/bundles/io/org.openhab.io.transport.serial/.classpath b/bundles/io/org.openhab.io.transport.serial/.classpath index e5b1c31ae6985..37b651fd08612 100644 --- a/bundles/io/org.openhab.io.transport.serial/.classpath +++ b/bundles/io/org.openhab.io.transport.serial/.classpath @@ -1,7 +1,7 @@ + - diff --git a/bundles/io/org.openhab.io.transport.serial/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.transport.serial/META-INF/MANIFEST.MF index 29ca72fbdc567..0ab79a14d5997 100644 --- a/bundles/io/org.openhab.io.transport.serial/META-INF/MANIFEST.MF +++ b/bundles/io/org.openhab.io.transport.serial/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: openHAB Serial Transport Bundle Bundle-SymbolicName: org.openhab.io.transport.serial Bundle-Version: 2.0.0.qualifier Bundle-Vendor: openHAB.org -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ClassPath: lib/nrjavaserial-3.8.8.jar Export-Package: gnu.io Import-Package: gnu.io