This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new c7e624acbe3 Fix parent/pom.xml Git post-merge conflicts
c7e624acbe3 is described below
commit c7e624acbe3346156fd5471ea2e08c6f314cec62
Author: Andriy Redko <[email protected]>
AuthorDate: Sat Jan 10 14:39:11 2026 -0500
Fix parent/pom.xml Git post-merge conflicts
---
parent/pom.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 25f3433282c..a45ef2e1187 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2272,11 +2272,7 @@
</activation>
<properties>
<!-- JAXB: see please
https://github.com/javaee/jaxb-v2/issues/1184 -->
-<<<<<<< HEAD
- <cxf.surefire.fork.vmargs>-ea --add-opens
java.base/java.lang=ALL-UNNAMED --add-opens
java.xml/javax.xml.namespace=ALL-UNNAMED --add-opens
java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED --add-opens
java.base/java.net=ALL-UNNAMED --add-opens
java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-opens
java.base/java.io=ALL-UNNAMED</cxf.surefire.fork.vmargs>
-=======
- <cxf.surefire.fork.vmargs>-ea --add-opens
java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED
--add-opens
java.base/sun.net.www.protocol.https=ALL-UNNAMED</cxf.surefire.fork.vmargs>
->>>>>>> 0e444d3c39 (CXF-8407: Incorporate changes caused by JEP-396
integration into JDK-16+ (#2818))
+ <cxf.surefire.fork.vmargs>-ea --add-opens
java.base/java.lang=ALL-UNNAMED --add-opens
java.xml/javax.xml.namespace=ALL-UNNAMED --add-opens
java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED --add-opens
java.base/java.net=ALL-UNNAMED --add-opens
java.base/sun.net.www.protocol.https=ALL-UNNAMED</cxf.surefire.fork.vmargs>
</properties>
</profile>
</profiles>
