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:24:40 UTC
[cxf] branch 3.4.x-fixes updated (a05724b265 -> 4665cd7198)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from a05724b265 Update Spring to 5.2.22.RELEASE
new 8706dbd799 CXF-8703: PAX Maven URL does not take local Maven repository into account (#948)
new 4665cd7198 Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 2 ++
.../org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
[cxf] 01/02: CXF-8703: PAX Maven URL does not take local Maven repository into account (#948)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8706dbd79927f9870ba61ac928209ceaeba81af4
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)
(cherry picked from commit 338e160fd78715c862838fb978556e0afc244c3d)
---
.../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
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4665cd7198ade5a1cb3345d92bd1523e62ecac54
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu May 12 16:01:53 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ab0234f705..3b7a0daf07 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -165,6 +165,7 @@ M 1f7d72caf45c4351e27d3b04458cc523ccd3bfdf
M 20f71f151cebbb09d5c4bde0024e3f6502c4415c
M 218f0e61d2039a1c2bd0cff82618d3a7aad9dfce
M 25dbe8466e60e3d8df8d9aecb392fe5026875890
+M 2622106afd6e1b24f6140ef89a57fcb5865ec487
M 27f8e28b8415b370d34e46df0d83587d634560c2
M 2871e80043c2452cf9aca3925a07360b8775c508
M 287f3a8a5a4cacbdf6be86e72251ef0f20bcb251
@@ -370,6 +371,7 @@ M d8eb0627ec5e878ef58e16b387a36c4cf3d1457c
M dd5db1155870c2f5df684d1a0f77e7c0909ee7c5
M dd9e67bef536068ce3956b9b94e380e780e78ee8
M ddc96849ddf45bde462497aac9150eace164c7ef
+M dff229c0f97a9847310df16abefe8076ad8bfccd
M dff93aa931d7c4d671c458f63f450c0a4d5fea3f
M e071fd24c474d37e90b23a2da3561fa2f0525628
M e0dbc85b5b3383c48fecb97ac11608d7b8c82cc5