Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2016-09-29 13:21:39 +0000
committerThomas Watson2016-09-29 14:33:09 +0000
commitd200e63587ccac6d7c2d0f506b8f30a2ebe47fe5 (patch)
treeef5c26fed11b745185a6a5040d2572cb2b44a647 /bundles/org.eclipse.osgi/container
parent711ff81d73350c6492b5acc96cc4cddc6906f30f (diff)
downloadrt.equinox.framework-d200e63587ccac6d7c2d0f506b8f30a2ebe47fe5.tar.gz
rt.equinox.framework-d200e63587ccac6d7c2d0f506b8f30a2ebe47fe5.tar.xz
rt.equinox.framework-d200e63587ccac6d7c2d0f506b8f30a2ebe47fe5.zip
Bug 502425 - Move Equinox Framework up to Java 7
Change-Id: I2dd55f8926f6d3fe4c15c664b0cc839545711bc1 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi/container')
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java6
1 files changed, 3 insertions, 3 deletions
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 a58275014..b4e3051d5 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
@@ -1465,8 +1465,8 @@ public class Storage {
profileIn = getNextBestProfile(systemGeneration, javaEdition, javaVersion, embeddedProfileName);
}
if (profileIn == null)
- // the profile url is still null then use the osgi min profile in OSGi by default
- profileIn = findInSystemBundle(systemGeneration, "JavaSE-1.6.profile"); //$NON-NLS-1$
+ // the profile url is still null then use the min profile the framework can use
+ profileIn = findInSystemBundle(systemGeneration, "JavaSE-1.7.profile"); //$NON-NLS-1$
if (profileIn != null) {
try {
result.load(new BufferedInputStream(profileIn));
@@ -1486,7 +1486,7 @@ public class Storage {
result.put(EquinoxConfiguration.PROP_OSGI_JAVA_PROFILE_NAME, vmProfile.replace('_', '/'));
else
// last resort; default to the absolute minimum profile name for the framework
- result.put(EquinoxConfiguration.PROP_OSGI_JAVA_PROFILE_NAME, "JavaSE-1.6"); //$NON-NLS-1$
+ result.put(EquinoxConfiguration.PROP_OSGI_JAVA_PROFILE_NAME, "JavaSE-1.7"); //$NON-NLS-1$
return result;
}

Back to the top