From 05367ee60c169e353c9dff4a28bd6e1aa92e8cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Wed, 27 Sep 2023 15:28:16 +0300
Subject: [PATCH] Fix CustomProfileIntegrationTest with 2023-09

Add JavaSE-17 osgi.ee capability to allow resolving.
Simplify test setup while at it.
---
 tycho-its/projects/eeProfile.custom/build/pom.xml            | 2 +-
 tycho-its/projects/eeProfile.custom/repository/content.xml   | 1 +
 .../tycho/test/eeProfile/CustomProfileIntegrationTest.java   | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tycho-its/projects/eeProfile.custom/build/pom.xml b/tycho-its/projects/eeProfile.custom/build/pom.xml
index 14d46ce6d5..8b831db758 100644
--- a/tycho-its/projects/eeProfile.custom/build/pom.xml
+++ b/tycho-its/projects/eeProfile.custom/build/pom.xml
@@ -46,7 +46,7 @@
 		</repository>
 		<repository>
 			<id>repo-with-test-runtime</id>
-			<url>${test-runtime-repo}</url>
+			<url>${target-platform}</url>
 			<layout>p2</layout>
 		</repository>
 	</repositories>
diff --git a/tycho-its/projects/eeProfile.custom/repository/content.xml b/tycho-its/projects/eeProfile.custom/repository/content.xml
index f9389ae5c3..2fae91d1fd 100644
--- a/tycho-its/projects/eeProfile.custom/repository/content.xml
+++ b/tycho-its/projects/eeProfile.custom/repository/content.xml
@@ -212,6 +212,7 @@
         <provided namespace='osgi.ee' name='JavaSE' version='1.8.0'/>
         <provided namespace='osgi.ee' name='JavaSE/compact1' version='1.8.0'/>
         <provided namespace='osgi.ee' name='JavaSE' version='11'/>
+        <provided namespace='osgi.ee' name='JavaSE' version='17'/>
       </provides>
       <touchpoint id='org.eclipse.equinox.p2.native' version='1.0.0'/>
     </unit>
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/CustomProfileIntegrationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/CustomProfileIntegrationTest.java
index e6184248cd..915211f536 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/CustomProfileIntegrationTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/CustomProfileIntegrationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 SAP AG and others.
+ * Copyright (c) 2012, 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
@@ -27,14 +27,13 @@ public class CustomProfileIntegrationTest extends AbstractTychoIntegrationTest {
 	@Test
 	public void testBuildWithCustomProfile() throws Exception {
 		// reactor with a test bundle importing javax.activation;version="1.1.0"
-		Verifier verifier = getVerifier("eeProfile.custom/build", false);
+		Verifier verifier = getVerifier("eeProfile.custom/build", true);
 
 		// repository where the custom EE is the only provider of
 		// javax.activation;version="1.1.0"
 		verifier.setSystemProperty("custom-profile-repo",
 				ResourceUtil.resolveTestResource("projects/eeProfile.custom/repository").toURI().toString());
 
-		verifier.setSystemProperty("test-runtime-repo", ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString());
 		verifier.executeGoal("verify");
 		verifier.verifyErrorFreeLog();