From 9f7245a32004226342615215ac262c19aa58484d Mon Sep 17 00:00:00 2001
From: Titouan Vervack <titouan.vervack@sigasi.com>
Date: Tue, 18 Jul 2023 14:38:01 +0200
Subject: [PATCH 1/2] Add integration test

---
 tycho-its/projects/brokenp2data/pom.xml       | 52 +++++++++++++++++++
 .../feature.xml                               | 11 ++++
 .../pom.xml                                   | 17 ++++++
 .../test/brokenp2data/BrokenP2DataTest.java   | 19 +++++++
 4 files changed, 99 insertions(+)
 create mode 100644 tycho-its/projects/brokenp2data/pom.xml
 create mode 100644 tycho-its/projects/brokenp2data/tycho-its-project.maven.brokenp2data.feature/feature.xml
 create mode 100644 tycho-its/projects/brokenp2data/tycho-its-project.maven.brokenp2data.feature/pom.xml
 create mode 100644 tycho-its/src/test/java/org/eclipse/tycho/test/brokenp2data/BrokenP2DataTest.java

diff --git a/tycho-its/projects/brokenp2data/pom.xml b/tycho-its/projects/brokenp2data/pom.xml
new file mode 100644
index 0000000000..41de980146
--- /dev/null
+++ b/tycho-its/projects/brokenp2data/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- The main pom used by all plugins, except the test plugins. See pom-test.xml -->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>tycho-its-project.maven.brokenp2data</groupId>
+	<artifactId>parent</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>tycho-its-project.maven.brokenp2data.feature/pom.xml</module>
+	</modules>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<extensions>true</extensions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<deployableFeature>true</deployableFeature>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<repositories>
+		<repository>
+			<id>tmf</id>
+			<url>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.29.0</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>mwe2</id>
+			<url>https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.14.0</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>2021-03</id>
+			<url>https://download.eclipse.org/releases/2021-03/</url>
+			<layout>p2</layout>
+		</repository>
+	</repositories>
+</project>
\ No newline at end of file
diff --git a/tycho-its/projects/brokenp2data/tycho-its-project.maven.brokenp2data.feature/feature.xml b/tycho-its/projects/brokenp2data/tycho-its-project.maven.brokenp2data.feature/feature.xml
new file mode 100644
index 0000000000..082aedef6f
--- /dev/null
+++ b/tycho-its/projects/brokenp2data/tycho-its-project.maven.brokenp2data.feature/feature.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="feature"
+      version="1.0.0.qualifier">
+
+   <includes id="org.eclipse.emf.mwe2.language.sdk" version="0.0.0" />
+
+   <includes id="org.eclipse.emf.mwe2.runtime.sdk" version="0.0.0" />
+
+   <includes id="org.eclipse.xtext.sdk" version="2.29.0.qualifier" />
+</feature>
diff --git a/tycho-its/projects/brokenp2data/tycho-its-project.maven.brokenp2data.feature/pom.xml b/tycho-its/projects/brokenp2data/tycho-its-project.maven.brokenp2data.feature/pom.xml
new file mode 100644
index 0000000000..cd3dc066e3
--- /dev/null
+++ b/tycho-its/projects/brokenp2data/tycho-its-project.maven.brokenp2data.feature/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>tycho-its-project.maven.brokenp2data</groupId>
+	<artifactId>feature</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+
+	<parent>
+		<groupId>tycho-its-project.maven.brokenp2data</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<packaging>eclipse-feature</packaging>
+</project>
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/brokenp2data/BrokenP2DataTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/brokenp2data/BrokenP2DataTest.java
new file mode 100644
index 0000000000..f23cf245ed
--- /dev/null
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/brokenp2data/BrokenP2DataTest.java
@@ -0,0 +1,19 @@
+package org.eclipse.tycho.test.brokenp2data;
+
+import java.util.List;
+
+import org.apache.maven.it.Verifier;
+import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
+import org.junit.Test;
+
+// See #2625
+public class BrokenP2DataTest extends AbstractTychoIntegrationTest {
+
+	@Test
+	public void test() throws Exception {
+		Verifier verifier = getVerifier("brokenp2data");
+
+		verifier.executeGoals(List.of("clean", "verify", "-Dtycho-version=3.0.5"));
+		verifier.verifyErrorFreeLog();
+	}
+}

From 2069c652fe55677506c4f748bf553a314ab82170 Mon Sep 17 00:00:00 2001
From: Titouan Vervack <tivervac@gmail.com>
Date: Mon, 31 Jul 2023 15:59:19 +0200
Subject: [PATCH 2/2] Update
 tycho-its/src/test/java/org/eclipse/tycho/test/brokenp2data/BrokenP2DataTest.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Christoph Läubrich <mail@laeubi-soft.de>
---
 .../org/eclipse/tycho/test/brokenp2data/BrokenP2DataTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/brokenp2data/BrokenP2DataTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/brokenp2data/BrokenP2DataTest.java
index f23cf245ed..8fb21e4a58 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/brokenp2data/BrokenP2DataTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/brokenp2data/BrokenP2DataTest.java
@@ -13,7 +13,7 @@ public class BrokenP2DataTest extends AbstractTychoIntegrationTest {
 	public void test() throws Exception {
 		Verifier verifier = getVerifier("brokenp2data");
 
-		verifier.executeGoals(List.of("clean", "verify", "-Dtycho-version=3.0.5"));
+		verifier.executeGoals(List.of("clean", "verify"));
 		verifier.verifyErrorFreeLog();
 	}
 }