HV-1879 Backport HV-1806 Make sure Karaf-based tests use the same local Maven repository as the Maven build

yrodiere · gsmet · commit ea83235d51eb · 2022-02-08T14:08:12.000+01:00
Otherwise, when the Maven local repository of the Maven build isn't the
default one, Pax-Exam ends up not finding OSGi artifacts we just built.
diff --git a/osgi/integrationtest/pom.xml b/osgi/integrationtest/pom.xml
@@ -169,6 +169,7 @@
                 <configuration>
                     <reuseForks>false</reuseForks>
                     <systemPropertyVariables>
+                        <maven.settings.localRepository>${settings.localRepository}</maven.settings.localRepository>
                         <maven.mavencentral.repo.url>${mavencentral.repo.url}</maven.mavencentral.repo.url>
                     </systemPropertyVariables>
                 </configuration>
diff --git a/osgi/integrationtest/src/test/java/org/hibernate/validator/osgi/integrationtest/KarafFeaturesAreInstallableTest.java b/osgi/integrationtest/src/test/java/org/hibernate/validator/osgi/integrationtest/KarafFeaturesAreInstallableTest.java
@@ -67,6 +67,7 @@ public Option[] config() {
 				.type( "xml" )
 				.versionAsInProject();
 
+		String mavenLocalRepository = System.getProperty( "maven.settings.localRepository" );
 		String mavenCentralRepository = System.getProperty( "maven.mavencentral.repo.url" );
 
 		return options(
@@ -94,6 +95,26 @@ public Option[] config() {
 						"featuresBoot",
 						"system"
 				),
+				/*
+				 * Use the same local Maven repository as the build job.
+				 * This allows to retrieve the just-installed artifacts in case
+				 * the local repo was overridden from the command line.
+				 *
+				 * See https://ops4j1.jira.com/wiki/spaces/paxurl/pages/3833866/Mvn+Protocol for more information
+				 * on the configuration below.
+				 */
+				editConfigurationFilePut(
+						"etc/org.ops4j.pax.url.mvn.cfg",
+						"org.ops4j.pax.url.mvn.defaultRepositories",
+						"file://" + mavenLocalRepository
+								+ "@snapshots"
+								+ "@id=local-repo-from-maven-settings"
+				),
+				editConfigurationFilePut(
+						"etc/org.ops4j.pax.url.mvn.cfg",
+						"org.ops4j.pax.url.mvn.localRepository",
+						mavenLocalRepository
+				),
 				editConfigurationFilePut( // Erase the defaults: Maven Central uses HTTP by default...
 						"etc/org.ops4j.pax.url.mvn.cfg",
 						"org.ops4j.pax.url.mvn.repositories",
diff --git a/osgi/integrationtest/src/test/java/org/hibernate/validator/osgi/integrationtest/OsgiIntegrationTest.java b/osgi/integrationtest/src/test/java/org/hibernate/validator/osgi/integrationtest/OsgiIntegrationTest.java
@@ -90,6 +90,7 @@ public Option[] config() {
 				.type( "xml" )
 				.versionAsInProject();
 
+		String mavenLocalRepository = System.getProperty( "maven.settings.localRepository" );
 		String mavenCentralRepository = System.getProperty( "maven.mavencentral.repo.url" );
 
 		return options(
@@ -117,6 +118,26 @@ public Option[] config() {
 						"featuresBoot",
 						"system"
 				),
+				/*
+				 * Use the same local Maven repository as the build job.
+				 * This allows to retrieve the just-installed artifacts in case
+				 * the local repo was overridden from the command line.
+				 *
+				 * See https://ops4j1.jira.com/wiki/spaces/paxurl/pages/3833866/Mvn+Protocol for more information
+				 * on the configuration below.
+				 */
+				editConfigurationFilePut(
+						"etc/org.ops4j.pax.url.mvn.cfg",
+						"org.ops4j.pax.url.mvn.defaultRepositories",
+						"file://" + mavenLocalRepository
+								+ "@snapshots"
+								+ "@id=local-repo-from-maven-settings"
+				),
+				editConfigurationFilePut(
+						"etc/org.ops4j.pax.url.mvn.cfg",
+						"org.ops4j.pax.url.mvn.localRepository",
+						mavenLocalRepository
+				),
 				editConfigurationFilePut( // Erase the defaults: Maven Central uses HTTP by default...
 						"etc/org.ops4j.pax.url.mvn.cfg",
 						"org.ops4j.pax.url.mvn.repositories",
