From 00a6747c15d9afec7d70f81bde57674d14973e4f 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 14:16:00 +0300
Subject: [PATCH] Fix BasicP2RepositoryIntegrationTest with 2023-03

Bundle id changes.
Simplified setup a bit while at it to be more like rest of the test
suite.
---
 tycho-its/projects/p2Repository/category.xml               | 2 +-
 tycho-its/projects/p2Repository/pom.xml                    | 2 +-
 .../p2Repository/BasicP2RepositoryIntegrationTest.java     | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tycho-its/projects/p2Repository/category.xml b/tycho-its/projects/p2Repository/category.xml
index 1b42d0704d..019caa94d5 100644
--- a/tycho-its/projects/p2Repository/category.xml
+++ b/tycho-its/projects/p2Repository/category.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- includes three bundles in different ways; note: the bundles do not require each other -->
 <site>
-   <bundle id="com.sun.el" version="0.0.0"/>
+   <bundle id="com.sun.el.javax.el" version="0.0.0"/>
    <iu id="org.apache.felix.gogo.runtime" version="0.0.0">
      <category name="Test Category" />
    </iu>
diff --git a/tycho-its/projects/p2Repository/pom.xml b/tycho-its/projects/p2Repository/pom.xml
index dcdc9146cb..866a556cda 100644
--- a/tycho-its/projects/p2Repository/pom.xml
+++ b/tycho-its/projects/p2Repository/pom.xml
@@ -43,7 +43,7 @@
 		<repository>
 			<id>test-data-repo</id>
 			<layout>p2</layout>
-			<url>${test-data-repo}</url>
+			<url>${target-platform}</url>
 		</repository>
 	</repositories>
 
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java
index 39fc5fee9e..845f56564f 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2021 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
@@ -38,8 +38,7 @@ public class BasicP2RepositoryIntegrationTest extends AbstractTychoIntegrationTe
 
 	@BeforeClass
 	public static void executeBuild() throws Exception {
-		verifier = new BasicP2RepositoryIntegrationTest().getVerifier("/p2Repository", false);
-		verifier.addCliOption("-Dtest-data-repo=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString());
+		verifier = new BasicP2RepositoryIntegrationTest().getVerifier("/p2Repository", true);
 		verifier.executeGoal("verify");
 		verifier.verifyErrorFreeLog();
 		p2Repo = P2RepositoryTool.forEclipseRepositoryModule(new File(verifier.getBasedir()));
@@ -48,7 +47,7 @@ public static void executeBuild() throws Exception {
 	@Test
 	public void test381377BundleInclusion() {
 		// check that (separately!) included bundle is there
-		assertTrue(p2Repo.getBundleArtifact("com.sun.el", "2.2.0.v201303151357").isFile());
+		assertTrue(p2Repo.getBundleArtifact("com.sun.el.javax.el", "3.0.0").isFile());
 	}
 
 	@Test