diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 916d3db10c..e265007804 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho tycho-build - 4.0.7 + 4.0.10 \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index ef2d9528ff..0c292c6913 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { } tools { maven 'apache-maven-latest' - jdk 'temurin-jdk17-latest' + jdk 'temurin-jdk21-latest' } stages { stage('Build') { diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF index 0be133d9be..20e4989a4d 100644 --- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Export-Package: org.eclipse.equinox.p2.tests;version="2.0.0", Require-Bundle: org.eclipse.equinox.frameworkadmin, org.eclipse.equinox.common, org.eclipse.core.tests.harness;bundle-version="3.4.0", - org.eclipse.core.runtime;bundle-version="3.29.0", + org.eclipse.core.runtime;bundle-version="3.30.0", org.eclipse.equinox.p2.publisher;bundle-version="1.0.0", org.eclipse.equinox.frameworkadmin.test;bundle-version="1.0.0", org.junit;bundle-version="4.8.0", diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/SharedInstallTestsProfileSpoofEnabledConfigured.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/SharedInstallTestsProfileSpoofEnabledConfigured.java index dcd61d1d5c..ae0ff38611 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/SharedInstallTestsProfileSpoofEnabledConfigured.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/SharedInstallTestsProfileSpoofEnabledConfigured.java @@ -98,18 +98,18 @@ public void testBasicStartup() throws IOException { try { File userBundlesInfo = new File(userBase, "configuration/org.eclipse.equinox.simpleconfigurator/bundles.info"); File userConfigIni = new File(userBase, "configuration/config.ini"); - assertFalse("0.1", userBundlesInfo.exists()); - assertFalse("0.2", userConfigIni.exists()); - reconcileReadOnly("0.21", extensions); - assertFalse("0.3", userBundlesInfo.exists()); - assertTrue("0.4", userConfigIni.exists()); + assertFalse(userBundlesInfo.exists()); + assertFalse(userConfigIni.exists()); + reconcileReadOnly("", extensions); + assertFalse(userBundlesInfo.exists()); + assertTrue(userConfigIni.exists()); Properties props = new Properties(); try (InputStream is = new BufferedInputStream(new FileInputStream(userConfigIni))) { props.load(is); } - assertTrue("0.5", props.containsKey("osgi.sharedConfiguration.area")); - assertTrue("0.6", props.size() == 1); + assertTrue(props.containsKey("osgi.sharedConfiguration.area")); + assertEquals(1, props.size()); } finally { cleanupReadOnlyInstall(); } @@ -117,7 +117,7 @@ public void testBasicStartup() throws IOException { @Override public void testReadOnlyDropinsStartup() throws IOException { - if (Platform.getOS().equals(Platform.OS_MACOSX)) + if (Platform.OS.isMac()) return; assertInitialized(); @@ -128,13 +128,13 @@ public void testReadOnlyDropinsStartup() throws IOException { try { File userBundlesInfo = new File(userBase, "configuration/org.eclipse.equinox.simpleconfigurator/bundles.info"); File userConfigIni = new File(userBase, "configuration/config.ini"); - assertFalse("0.1", userBundlesInfo.exists()); - assertFalse("0.2", userConfigIni.exists()); + assertFalse(userBundlesInfo.exists()); + assertFalse(userConfigIni.exists()); reconcileReadOnly("0.21", extensions); - assertTrue("0.3", userBundlesInfo.exists()); - assertTrue("0.4", userConfigIni.exists()); + assertTrue(userBundlesInfo.exists()); + assertTrue(userConfigIni.exists()); assertTrue(isInBundlesInfo(userBundlesInfo, "myBundle", null)); assertTrue(isInBundlesInfo(userBundlesInfo, "zzz", null)); @@ -142,7 +142,7 @@ public void testReadOnlyDropinsStartup() throws IOException { // remove the bundle from the dropins and reconcile setReadOnly(readOnlyBase, false); AbstractSharedInstallTest.removeReallyReadOnly(readOnlyBase); - assertTrue("0.7", readOnlyBase.canWrite()); + assertTrue(readOnlyBase.canWrite()); remove("1.0", "dropins", "myBundle_1.0.0.jar"); setReadOnly(readOnlyBase, true); AbstractSharedInstallTest.reallyReadOnly(readOnlyBase); @@ -164,7 +164,7 @@ public void testReadOnlyDropinsStartup() throws IOException { // new, up-to-date bundles.info setReadOnly(readOnlyBase, false); AbstractSharedInstallTest.removeReallyReadOnly(readOnlyBase); - assertTrue("0.7", readOnlyBase.canWrite()); + assertTrue(readOnlyBase.canWrite()); add("0.211", "dropins", jar); setReadOnly(readOnlyBase, true); AbstractSharedInstallTest.reallyReadOnly(readOnlyBase); @@ -183,7 +183,7 @@ public void testReadOnlyDropinsStartup() throws IOException { @Override public void testUserDropinsStartup() throws IOException { - if (Platform.getOS().equals(Platform.OS_MACOSX)) + if (Platform.OS.isMac()) return; assertInitialized(); @@ -198,13 +198,13 @@ public void testUserDropinsStartup() throws IOException { File userBundlesInfo = new File(userBase, "configuration/org.eclipse.equinox.simpleconfigurator/bundles.info"); File userConfigIni = new File(userBase, "configuration/config.ini"); - assertFalse("0.1", userBundlesInfo.exists()); - assertFalse("0.2", userConfigIni.exists()); + assertFalse(userBundlesInfo.exists()); + assertFalse(userConfigIni.exists()); reconcileReadOnly("0.21", extensions); - assertTrue("0.3", userBundlesInfo.exists()); - assertTrue("0.4", userConfigIni.exists()); + assertTrue(userBundlesInfo.exists()); + assertTrue(userConfigIni.exists()); assertTrue(isInBundlesInfo(userBundlesInfo, "myBundle", null)); assertTrue(isInBundlesInfo(userBundlesInfo, "zzz", null)); diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/META-INF/MANIFEST.MF b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/META-INF/MANIFEST.MF index ec92b2cb84..a48ce8ffc0 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.examples.rcp.discovery;singleton:=tr Bundle-Version: 2.3.100.qualifier Bundle-Activator: org.eclipse.equinox.p2.examples.rcp.cloud.Activator Bundle-Localization: plugin +Bundle-Vendor: Eclipse.org - Equinox Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.core.runtime, org.eclipse.equinox.p2.operations;bundle-version="2.0.0",