Remove the reconciler product

eclipse-equinox · Feb 10, 2024 · 7819445 · 7819445
1 parent fa81fb9
commit 7819445
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 29 deletions.
diff --git a/bundles/org.eclipse.equinox.p2.tests.reconciler.product/.project b/bundles/org.eclipse.equinox.p2.tests.reconciler.product/.project
diff --git a/...rg.eclipse.equinox.p2.tests.reconciler.product/.settings/org.eclipse.core.resources.prefs b/...rg.eclipse.equinox.p2.tests.reconciler.product/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/org.eclipse.equinox.p2.tests.reconciler.product/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.p2.tests.reconciler.product/forceQualifierUpdate.txt
diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml
@@ -36,18 +36,52 @@
 		</profile>
 	</profiles>
 
-	<dependencies>
-		<!-- The tests require the reconciler product -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>org.eclipse.equinox.p2.reconciler</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-	</dependencies>
+<!--	<dependencies>-->
+<!--		 The tests require the reconciler product -->
+<!--		<dependency>-->
+<!--			<groupId>${project.groupId}</groupId>-->
+<!--			<artifactId>org.eclipse.equinox.p2.reconciler</artifactId>-->
+<!--			<version>1.1.0-SNAPSHOT</version>-->
+<!--			<type>pom</type>-->
+<!--		</dependency>-->
+<!--	</dependencies>-->
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-publisher-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<executions>
+					<execution>
+						<id>publish-products</id>
+						<goals>
+							<goal>publish-products</goal>
+						</goals>
+						<phase>pre-integration-test</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-director-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>materialize-products</id>
+						<goals>
+							<goal>materialize-products</goal>
+						</goals>
+						<phase>pre-integration-test</phase>
+						<configuration>
+							<products>
+								<product>
+									<id>org.eclipse.equinox.p2.reconciler</id>
+								</product>
+							</products>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>

diff --git a/...sts.reconciler.product/reconciler.product → ...lipse.equinox.p2.tests/reconciler.product b/...sts.reconciler.product/reconciler.product → ...lipse.equinox.p2.tests/reconciler.product
@@ -21,9 +21,6 @@
 
    <plugins>
       <plugin id="org.eclipse.equinox.p2.installer"/>
-      <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
    </plugins>
 
    <features>