diff options
author | Alexander Kurtakov | 2018-01-23 08:33:21 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2018-01-23 10:07:51 +0000 |
commit | 631cdd4b4d83bc5cd89e9d8d9118dc9faa420588 (patch) | |
tree | 6a45cbf42b29159ea4d3591b61f4a5ec611fe0cb | |
parent | b5fe42dfc2ca68d6153010efb901560e415c6dad (diff) | |
download | rt.equinox.p2-631cdd4b4d83bc5cd89e9d8d9118dc9faa420588.tar.gz rt.equinox.p2-631cdd4b4d83bc5cd89e9d8d9118dc9faa420588.tar.xz rt.equinox.p2-631cdd4b4d83bc5cd89e9d8d9118dc9faa420588.zip |
Bug 530150 - Move JREAction default profile to Java 9S4_8_0_M5I20180124-2000I20180124-0800I20180123-2000I20180123-1010I20180123-0800
People not specifying EE will get some sane default, Java 6 is quire
rare nowadays I would say. The version here sould be the maximum
compatible profile so a.jre.javase installed allow installing bundles
requiring this max profile.
Change-Id: I96dfb0c900441c1bf9eccc8994a7425f456ccff7
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
3 files changed, 16 insertions, 11 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java index 26a1b0da3..bab154b5b 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 Code 9 and others. All rights reserved. This + * Copyright (c) 2008, 2018 Code 9 and others. All rights reserved. This * program and the accompanying materials are made available under the terms of * the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * + * Contributors: * Code 9 - initial API and implementation * IBM - ongoing development * SAP AG - ongoing development @@ -33,8 +33,8 @@ import org.osgi.framework.*; public class JREAction extends AbstractPublisherAction { private static final String DEFAULT_JRE_NAME = "a.jre"; //$NON-NLS-1$ - private static final Version DEFAULT_JRE_VERSION = Version.parseVersion("1.6"); //$NON-NLS-1$ - private static final String DEFAULT_PROFILE = "JavaSE-1.6"; //$NON-NLS-1$ + private static final Version DEFAULT_JRE_VERSION = Version.parseVersion("9.0"); //$NON-NLS-1$ + private static final String DEFAULT_PROFILE = "JavaSE-9"; //$NON-NLS-1$ private static final String PROFILE_LOCATION = "jre.action.profile.location"; //$NON-NLS-1$ private static final String PROFILE_NAME = "osgi.java.profile.name"; //$NON-NLS-1$ private static final String PROFILE_TARGET_VERSION = "org.eclipse.jdt.core.compiler.codegen.targetPlatform"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java index 3b7990d22..7e219b358 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java @@ -129,7 +129,7 @@ public class JREActionTest extends ActionTest { performAction(new JREAction((String) null)); // these assertions need to be changed each time the default java profile, hardcoded in o.e.e.p2.publisher.actions.JREAction, is changed; - verifyMetadataIU("a.jre.javase", 210, 12, Version.parseVersion("1.6")); + verifyMetadataIU("a.jre.javase", 226, 21, Version.parseVersion("9.0.0")); // verifyConfigIU(DEFAULT_JRE_NAME, DEFAULT_JRE_VERSION); // TODO config IU is not needed!? } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductContentTypeTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductContentTypeTest.java index 1ab27559c..d85619dca 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductContentTypeTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductContentTypeTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2017 SAP AG and others. + * Copyright (c) 2011, 2018 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,10 +16,15 @@ import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; import org.eclipse.core.runtime.IStatus; import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.metadata.IRequirement; +import org.eclipse.equinox.p2.metadata.Version; import org.eclipse.equinox.p2.publisher.IPublisherResult; import org.eclipse.equinox.p2.publisher.PublisherInfo; import org.eclipse.equinox.p2.publisher.eclipse.ProductAction; @@ -121,8 +126,8 @@ public class ProductContentTypeTest extends ActionTest { cusList.add(createIU(flavor + ".source.default")); cusList.add(createIU(flavor + ".osgi.bundle.default")); cusList.add(createIU(flavor + ".org.eclipse.update.feature.default")); - cusList.add(createIU("a.jre.javase", Version.create("1.6.0"))); - cusList.add(createIU("config.a.jre.javase", Version.create("1.6.0"))); + cusList.add(createIU("a.jre.javase", Version.create("9.0"))); + cusList.add(createIU("config.a.jre.javase", Version.create("9.0"))); } private void testTemplate(String productFileName, String productVersion, int expectedRequirementsSize, IInstallableUnit... requiredInstallableUnits) throws Exception { |