diff options
6 files changed, 6 insertions, 22 deletions
diff --git a/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs index 4f32b45f6..12a5f90e1 100644 --- a/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Thu Feb 17 07:54:09 CST 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -8,7 +7,7 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=jsr14 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF index e812bd226..25436143a 100644 --- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF @@ -78,12 +78,11 @@ Bundle-Activator: org.eclipse.osgi.framework.internal.core.SystemBundleActivator Bundle-Description: %systemBundle Bundle-Copyright: %copyright Bundle-Vendor: %eclipse.org -Bundle-Version: 3.8.100.qualifier +Bundle-Version: 3.9.0.qualifier Bundle-Localization: systembundle Bundle-DocUrl: http://www.eclipse.org Eclipse-ExtensibleAPI: true Eclipse-SystemBundle: true Main-Class: org.eclipse.core.runtime.adaptor.EclipseStarter -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - OSGi/Minimum-1.2 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Eclipse-BundleShape: jar diff --git a/bundles/org.eclipse.osgi/build.properties b/bundles/org.eclipse.osgi/build.properties index deea927bc..e42fda764 100644 --- a/bundles/org.eclipse.osgi/build.properties +++ b/bundles/org.eclipse.osgi/build.properties @@ -30,13 +30,6 @@ source.. = osgi/src,\ supplement/src/,\ security/src/ output.. = bin/ -jre.compilation.profile = J2SE-1.5 - -# jre.compilation.profile = CDC-1.1/Foundation-1.1 -# bootClasspath=osgi/exceptions.jar;osgi/xmlParserAPIs.jar;${CDC-1.1/Foundation-1.1} - -javacSource=1.5 -javacTarget=jsr14 # To enable building the framework using projects from OSGi repo uncomment customBuildCallbacks # and add the following to the beginning of source.. diff --git a/bundles/org.eclipse.osgi/supplement/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.osgi/supplement/.settings/org.eclipse.jdt.core.prefs index 96f55a769..449cf187f 100644 --- a/bundles/org.eclipse.osgi/supplement/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.osgi/supplement/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Thu Sep 02 15:43:37 CDT 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -8,7 +7,7 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=jsr14 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate diff --git a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF index 30133207b..6ae846519 100644 --- a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.supplement -Bundle-Version: 1.4.100.qualifier +Bundle-Version: 1.5.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.equinox.log;version="1.0", @@ -21,8 +21,7 @@ Export-Package: org.eclipse.equinox.log;version="1.0", org.eclipse.osgi.framework.internal.core;x-internal:=true, org.eclipse.osgi.framework.internal.reliablefile;x-internal:=true, org.eclipse.core.runtime.internal.adaptor;x-internal:=true -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - OSGi/Minimum-1.2 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.osgi.framework, org.osgi.service.log, org.osgi.util.tracker, diff --git a/bundles/org.eclipse.osgi/supplement/build.properties b/bundles/org.eclipse.osgi/supplement/build.properties index 1f31e3624..86dd55177 100644 --- a/bundles/org.eclipse.osgi/supplement/build.properties +++ b/bundles/org.eclipse.osgi/supplement/build.properties @@ -17,9 +17,4 @@ bin.includes = META-INF/,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-1.5 - -javacSource=1.5 -javacTarget=jsr14 - javacWarnings..=-deadCode,-raw,-unchecked |