# HG changeset patch # User bkirk # Date 1285090110 25200 # Node ID cc55c9707fe433c4b126c0f743a48341fce63e6f # Parent 588b26a6b387ddcf824d321d98842b1f4768c349 should be using JavaSE-1.6 VM, and .classpath, codegen.targetPlatform, compliance and source should also all be 1.6 diff -r 588b26a6b387 -r cc55c9707fe4 connectivity/com.nokia.carbide.remoteConnections/.classpath --- a/connectivity/com.nokia.carbide.remoteConnections/.classpath Tue Sep 21 11:35:38 2010 -0500 +++ b/connectivity/com.nokia.carbide.remoteConnections/.classpath Tue Sep 21 10:28:30 2010 -0700 @@ -1,10 +1,10 @@ - - + - - - + + + + diff -r 588b26a6b387 -r cc55c9707fe4 connectivity/com.nokia.carbide.remoteConnections/.settings/org.eclipse.jdt.core.prefs --- a/connectivity/com.nokia.carbide.remoteConnections/.settings/org.eclipse.jdt.core.prefs Tue Sep 21 11:35:38 2010 -0500 +++ b/connectivity/com.nokia.carbide.remoteConnections/.settings/org.eclipse.jdt.core.prefs Tue Sep 21 10:28:30 2010 -0700 @@ -1,7 +1,8 @@ -#Mon May 12 10:44:43 CDT 2008 +#Mon Sep 20 18:49:13 PDT 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +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.5 +org.eclipse.jdt.core.compiler.source=1.6 diff -r 588b26a6b387 -r cc55c9707fe4 connectivity/com.nokia.carbide.remoteConnections/META-INF/MANIFEST.MF --- a/connectivity/com.nokia.carbide.remoteConnections/META-INF/MANIFEST.MF Tue Sep 21 11:35:38 2010 -0500 +++ b/connectivity/com.nokia.carbide.remoteConnections/META-INF/MANIFEST.MF Tue Sep 21 10:28:30 2010 -0700 @@ -11,9 +11,8 @@ com.nokia.cpp.utils.core, org.eclipse.emf.ecore.xmi;bundle-version="2.4.0", org.eclipse.core.net;bundle-version="1.1.0", - com.nokia.cpp.utils.ui, - org.eclipse.help;bundle-version="3.5.0" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 + com.nokia.cpp.utils.ui +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: com.nokia.carbide.installpackages, com.nokia.carbide.installpackages.gen.InstallPackages,