diff options
| author | Thomas Watson | 2013-04-03 15:21:14 +0000 |
|---|---|---|
| committer | Thomas Watson | 2013-04-03 15:21:14 +0000 |
| commit | aaeeb05df81b83e0e67697ea1d0617923263ec51 (patch) | |
| tree | ad780a50974f108813852bc1e09e51eedc8527b6 /bundles/org.eclipse.osgi.tests | |
| parent | 54558d4aa45ada6f3d1f00d38aaaa1486f4fdf60 (diff) | |
| download | rt.equinox.framework-aaeeb05df81b83e0e67697ea1d0617923263ec51.tar.gz rt.equinox.framework-aaeeb05df81b83e0e67697ea1d0617923263ec51.tar.xz rt.equinox.framework-aaeeb05df81b83e0e67697ea1d0617923263ec51.zip | |
Bug 386298: 37 compilation errors after switching org.eclipse.osgi.testsI20130409-0800
to 1.5 compliance
- need to update the BREE to Java 5.
Diffstat (limited to 'bundles/org.eclipse.osgi.tests')
| -rw-r--r-- | bundles/org.eclipse.osgi.tests/.classpath | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.osgi.tests/.classpath b/bundles/org.eclipse.osgi.tests/.classpath index a8cc9cb0f..273e9f393 100644 --- a/bundles/org.eclipse.osgi.tests/.classpath +++ b/bundles/org.eclipse.osgi.tests/.classpath @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" output="bundle_tests/test" path="bundles_src/test"/> <classpathentry kind="src" output="bundle_tests/test2" path="bundles_src/test2"/> @@ -113,7 +115,5 @@ <classpathentry kind="src" output="bundle_tests/test.logging.a" path="bundles_src/test.logging.a"/> <classpathentry kind="src" output="bundle_tests/console.test" path="bundles_src/console.test"/> <classpathentry kind="src" output="bundle_tests/geturl" path="bundles_src/geturl"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs index 446769e65..673621a6c 100644 --- a/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 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 diff --git a/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF index 64a7849bd..6bc5a1b33 100644 --- a/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF @@ -16,6 +16,6 @@ Bundle-Activator: org.eclipse.osgi.tests.OSGiTestsActivator Import-Package: org.osgi.service.event; resolution:="optional" Export-Package: org.eclipse.osgi.tests.bundles, org.eclipse.osgi.tests.appadmin -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 DynamicImport-Package: ext.framework.b Eclipse-BundleShape: dir |