commit 2ce052a444ca5f7a3b9482cd40ba6ef490476b8f
author Andrey Loskutov <loskutov@gmx.de> Wed Jun 02 16:53:51 2021 +0200
committer Thomas Watson <tjwatson@us.ibm.com> Wed Jun 02 13:09:42 2021 -0400
tree bb98f9d96d2c97a49d72e8e534c0a20bc0844836
parent ae7f11a54f34fc3e8d68661d953724f04852729d

Bug 573927 - org.eclipse.equinox.cm.test.ConfigurationAdminTest fails on
Gerrit

Possible fix is to use tycho & extra dependency

Change-Id: I534559ee04a2637f1bfec309fe1a46a564dceb87
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.bundles/+/181287
Tested-by: Equinox Bot <equinox-bot@eclipse.org>
Reviewed-by: Thomas Watson <tjwatson@us.ibm.com>

bundles/org.eclipse.equinox.cm.test/META-INF/MANIFEST.MF

diff --git a/bundles/org.eclipse.equinox.cm.test/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.cm.test/META-INF/MANIFEST.MF
index 3c762aa..695c061 100644
--- a/bundles/org.eclipse.equinox.cm.test/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.cm.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: Test Plug-in
 Bundle-Vendor: Eclipse.org - Equinox
 Bundle-SymbolicName: org.eclipse.equinox.cm.test
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Activator: org.eclipse.equinox.cm.test.Activator
 Import-Package: org.eclipse.equinox.log,
  org.junit;version="4.12.0",

bundles/org.eclipse.equinox.cm.test/pom.xml

diff --git a/bundles/org.eclipse.equinox.cm.test/pom.xml b/bundles/org.eclipse.equinox.cm.test/pom.xml
index c553315..1d5e0fd 100644
--- a/bundles/org.eclipse.equinox.cm.test/pom.xml
+++ b/bundles/org.eclipse.equinox.cm.test/pom.xml
@@ -24,6 +24,34 @@
 
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.cm.test</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>  
+  <version>1.1.100-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+  
+  <build>
+  	<plugins>
+  		<plugin>
+  			<groupId>org.eclipse.tycho</groupId>
+  			<artifactId>tycho-surefire-plugin</artifactId>
+  			<version>${tycho.version}</version>
+  		</plugin>
+  
+  		<plugin>
+  			<groupId>org.eclipse.tycho</groupId>
+  			<artifactId>target-platform-configuration</artifactId>
+  			<version>${tycho.version}</version>
+  			<configuration>
+  				<dependency-resolution>
+  					<extraRequirements>
+  						<requirement>
+  							<type>eclipse-plugin</type>
+  							<id>org.eclipse.equinox.cm</id>
+  							<versionRange>0.0.0</versionRange>
+  						</requirement>
+  					</extraRequirements>
+  				</dependency-resolution>
+  			</configuration>
+  		</plugin>
+  
+  	</plugins>
+  </build>
 </project>