diff options
| author | Thomas Watson | 2016-02-04 19:58:52 +0000 |
|---|---|---|
| committer | Thomas Watson | 2016-02-04 19:58:52 +0000 |
| commit | db3826d75d3dd0e2c62ff63222abd169a8b53a9d (patch) | |
| tree | 884dea55fc95990e1d18a01a80c21be7250b8a4c | |
| parent | 614d32e72d968add913e9e0b2da9ef3b44c773d9 (diff) | |
| download | rt.equinox.framework-db3826d75d3dd0e2c62ff63222abd169a8b53a9d.tar.gz rt.equinox.framework-db3826d75d3dd0e2c62ff63222abd169a8b53a9d.tar.xz rt.equinox.framework-db3826d75d3dd0e2c62ff63222abd169a8b53a9d.zip | |
Bug 478175 - Adapt EE definition to java 9s new version scheme (JEP 223
ak verona)
- rename JavaSE-9.0 execution environment to JavaSE-9
Change-Id: Iaedb1185949ae5d759ca43780d40c6e86b6a16b1
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
| -rw-r--r-- | bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi/JavaSE-9.profile (renamed from bundles/org.eclipse.osgi/JavaSE-9.0.profile) | 6 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java index 2decd5802..93577eb2b 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java @@ -2590,8 +2590,8 @@ public class SystemBundleTests extends AbstractBundleTests { public void testJavaProfile() { String original = System.getProperty("java.specification.version"); try { - doTestJavaProfile("9.3.1", "JavaSE-9.0"); - doTestJavaProfile("9", "JavaSE-9.0"); + doTestJavaProfile("9.3.1", "JavaSE-9"); + doTestJavaProfile("9", "JavaSE-9"); doTestJavaProfile("8.4", "JavaSE-1.8"); doTestJavaProfile("1.10.1", "JavaSE-1.8"); doTestJavaProfile("1.9", "JavaSE-1.8"); diff --git a/bundles/org.eclipse.osgi/JavaSE-9.0.profile b/bundles/org.eclipse.osgi/JavaSE-9.profile index 9c8400824..0fbc32c25 100644 --- a/bundles/org.eclipse.osgi/JavaSE-9.0.profile +++ b/bundles/org.eclipse.osgi/JavaSE-9.profile @@ -9,7 +9,7 @@ # IBM Corporation - initial API and implementation ############################################################################### -# NOTE: The JavaSE-1.9 profile is not yet finalized. +# NOTE: The JavaSE-9 profile is not yet finalized. org.osgi.framework.system.packages = \ javax.accessibility,\ @@ -195,7 +195,7 @@ org.osgi.framework.executionenvironment = \ JavaSE-1.6,\ JavaSE-1.7,\ JavaSE-1.8,\ - JavaSE-9.0 + JavaSE-9 org.osgi.framework.system.capabilities = \ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\ @@ -203,7 +203,7 @@ org.osgi.framework.system.capabilities = \ osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8, 9.0",\ osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8, 9.0",\ osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8, 9.0" -osgi.java.profile.name = JavaSE-9.0 +osgi.java.profile.name = JavaSE-9 org.eclipse.jdt.core.compiler.compliance=1.9 org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java index 8cf7de1db..d39d30c58 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java @@ -1483,7 +1483,9 @@ public class Storage { int major = javaVersion.getMajor(); int minor = javaVersion.getMinor(); do { - result = findInSystemBundle(systemGeneration, javaEdition + embeddedProfileName + major + "." + minor + PROFILE_EXT); //$NON-NLS-1$ + // If minor is zero then it is not included in the name + String profileResourceName = javaEdition + embeddedProfileName + major + ((minor > 0) ? "." + minor : "") + PROFILE_EXT; //$NON-NLS-1$ //$NON-NLS-2$ + result = findInSystemBundle(systemGeneration, profileResourceName); if (minor > 0) { minor -= 1; } else if (major > 9) { |