You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/05/12 20:01:24 UTC

[cxf] branch 3.5.x-fixes updated: CXF-8703: PAX Maven URL does not take local Maven repository into account (#948)

This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.5.x-fixes by this push:
     new 338e160fd7 CXF-8703: PAX Maven URL does not take local Maven repository into account (#948)
338e160fd7 is described below

commit 338e160fd78715c862838fb978556e0afc244c3d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu May 12 14:05:50 2022 -0400

    CXF-8703: PAX Maven URL does not take local Maven repository into account (#948)
    
    (cherry picked from commit 4678869b7f987fedd692be43c4d9b3ae6031db51)
---
 .../org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
index c11d0e0b42..79c8508bf7 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
@@ -59,8 +59,8 @@ public class BasicSTSIntegrationTest {
             systemProperty("BasicSTSIntegrationTest.PORT").value(port),
             editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
                                     "org.osgi.service.http.port", port),
-            when(!localRepository.isEmpty())
-                .useOptions(systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepository)),
+            when(!localRepository.isEmpty()).useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+                    "org.ops4j.pax.url.mvn.localRepository", localRepository)),
             //DO NOT COMMIT WITH THIS LINE ENABLED!!!
             //KarafDistributionOption.keepRuntimeFolder(),
             //KarafDistributionOption.debugConfiguration(), // nor this