diff --git a/tycho-its/projects/resolver.split/org.eclipse.equinox.security/pom.xml b/tycho-its/projects/resolver.split/org.eclipse.equinox.security/pom.xml
index 01d3df53a8..32e651f987 100644
--- a/tycho-its/projects/resolver.split/org.eclipse.equinox.security/pom.xml
+++ b/tycho-its/projects/resolver.split/org.eclipse.equinox.security/pom.xml
@@ -24,7 +24,7 @@
repository
p2
- ${repo}
+ ${target-platform}
diff --git a/tycho-its/projects/surefire.requireBundle.multipleVersions/pom.xml b/tycho-its/projects/surefire.requireBundle.multipleVersions/pom.xml
index 6657fba908..150412e7a2 100755
--- a/tycho-its/projects/surefire.requireBundle.multipleVersions/pom.xml
+++ b/tycho-its/projects/surefire.requireBundle.multipleVersions/pom.xml
@@ -20,7 +20,7 @@
repo
p2
- ${repo}
+ ${target-platform}
diff --git a/tycho-its/projects/surefire.requireBundle/pom.xml b/tycho-its/projects/surefire.requireBundle/pom.xml
index b8ed316b6e..0924022fbe 100755
--- a/tycho-its/projects/surefire.requireBundle/pom.xml
+++ b/tycho-its/projects/surefire.requireBundle/pom.xml
@@ -19,7 +19,7 @@
oxygen
p2
- ${oxygen-repo}
+ ${target-platform}
diff --git a/tycho-its/projects/tycho98/bundle.tests/META-INF/MANIFEST.MF b/tycho-its/projects/tycho98/bundle.tests/META-INF/MANIFEST.MF
index c6c3e56bbe..08a1e9f8ae 100644
--- a/tycho-its/projects/tycho98/bundle.tests/META-INF/MANIFEST.MF
+++ b/tycho-its/projects/tycho98/bundle.tests/META-INF/MANIFEST.MF
@@ -6,4 +6,4 @@ Bundle-Version: 0.0.1.qualifier
Require-Bundle: bundle;bundle-version="0.0.1",
org.junit;bundle-version="4.12.0",
org.eclipse.core.runtime;bundle-version="3.2.0",
- javax.annotation
+ jakarta.annotation-api
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java
index 4db8bb13a2..0fb4799351 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021, 2022 Christoph Läubrich and others.
+ * Copyright (c) 2021, 2023 Christoph Läubrich and others.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -22,8 +22,8 @@
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
+import org.eclipse.tycho.TychoConstants;
import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
-import org.eclipse.tycho.test.util.EnvironmentUtil;
import org.junit.Test;
public class CompilerClasspathEntryTest extends AbstractTychoIntegrationTest {
@@ -64,7 +64,7 @@ public void testLibEntry() throws Exception {
@Test
public void testDSComponents() throws Exception {
Verifier verifier = getVerifier("tycho-ds", false, true);
- verifier.setSystemProperty("repo-url", EnvironmentUtil.ECLIPSE_LATEST);
+ verifier.setSystemProperty("repo-url", TychoConstants.ECLIPSE_LATEST);
// first test to consume from target platform
verifyDs(verifier);
// now test consume from maven directly
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/SplitPackagesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/SplitPackagesTest.java
index 255f253d27..1605f6f7fe 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/SplitPackagesTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/SplitPackagesTest.java
@@ -11,7 +11,6 @@
import org.apache.maven.it.Verifier;
import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
-import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories;
import org.junit.Test;
public class SplitPackagesTest extends AbstractTychoIntegrationTest {
@@ -19,7 +18,6 @@ public class SplitPackagesTest extends AbstractTychoIntegrationTest {
@Test
public void testSplitPackage() throws Exception {
Verifier verifier = getVerifier("/resolver.split/org.eclipse.equinox.security");
- verifier.addCliOption("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString());
verifier.executeGoal("compile");
verifier.verifyErrorFreeLog();
}
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RequireBundleTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RequireBundleTest.java
index bfbd589b5f..cd9fb40557 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RequireBundleTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RequireBundleTest.java
@@ -14,7 +14,6 @@
import org.apache.maven.it.Verifier;
import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
-import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories;
import org.junit.Test;
public class RequireBundleTest extends AbstractTychoIntegrationTest {
@@ -22,16 +21,14 @@ public class RequireBundleTest extends AbstractTychoIntegrationTest {
// requested in bug 485926
@Test
public void loadResourceFromRequireBundle() throws Exception {
- Verifier verifier = getVerifier("/surefire.requireBundle", false, true);
- verifier.addCliOption("-Doxygen-repo=" + P2Repositories.ECLIPSE_LATEST.toString());
+ Verifier verifier = getVerifier("/surefire.requireBundle", true, true);
verifier.executeGoal("integration-test");
verifier.verifyErrorFreeLog();
}
@Test
public void requireMultipleVersionsOfABundle() throws Exception {
- Verifier verifier = getVerifier("/surefire.requireBundle.multipleVersions", false, true);
- verifier.addCliOption("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString());
+ Verifier verifier = getVerifier("/surefire.requireBundle.multipleVersions", true, true);
verifier.executeGoal("integration-test");
verifier.verifyErrorFreeLog();
}
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/util/ResourceUtil.java b/tycho-its/src/test/java/org/eclipse/tycho/test/util/ResourceUtil.java
index 4036894c67..683a324d7b 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/util/ResourceUtil.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/util/ResourceUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2022 SAP AG and others.
+ * Copyright (c) 2011, 2023 SAP AG and others.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -15,6 +15,8 @@
import java.io.File;
import java.net.URI;
+import org.eclipse.tycho.TychoConstants;
+
/**
* Helper for accessing test resources.
*/
@@ -22,7 +24,7 @@ public class ResourceUtil {
public enum P2Repositories {
ECLIPSE_342("e342"), ECLIPSE_352("e352"), ECLIPSE_OXYGEN("https:////download.eclipse.org/releases/oxygen/"),
- ECLIPSE_LATEST(EnvironmentUtil.ECLIPSE_LATEST);
+ ECLIPSE_LATEST(TychoConstants.ECLIPSE_LATEST);
private final String path;
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
index 10e53fb2e4..e0505f8331 100644
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2022 Sonatype Inc. and others.
+ * Copyright (c) 2008, 2023 Sonatype Inc. and others.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -119,7 +119,7 @@ protected Verifier getVerifier(String test, boolean setTargetPlatform, File user
tmpDir.mkdirs();
verifier.addCliOption("-Djava.io.tmpdir=" + tmpDir.getAbsolutePath());
if (setTargetPlatform) {
- verifier.addCliOption("-Dtarget-platform=" + getTargetPlatform());
+ verifier.addCliOption("-Dtarget-platform=" + getTargetPlatform().replace("/", "//"));
}
if (ignoreLocalArtifacts) {
verifier.addCliOption("-Dtycho.localArtifacts=ignore");
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/EnvironmentUtil.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/EnvironmentUtil.java
index 68fbb9fe16..4190114d06 100644
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/EnvironmentUtil.java
+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/EnvironmentUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2020 Sonatype Inc. and others.
+ * Copyright (c) 2008, 2023 Sonatype Inc. and others.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.eclipse.tycho.TychoConstants;
import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
/**
@@ -36,8 +37,6 @@ public class EnvironmentUtil {
private static final String MAVEN_HOME_INFO = "Maven home:";
- public static final String ECLIPSE_LATEST = "https:////download.eclipse.org/releases/2023-09/";
-
private static final Properties props;
static {
@@ -85,7 +84,7 @@ public static boolean isMac() {
}
public static String getTargetPlatform() {
- return ECLIPSE_LATEST;
+ return TychoConstants.ECLIPSE_LATEST;
}
public static String getTestSettings() {