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 2026/01/10 18:43:55 UTC

(cxf) 01/02: CXF-8407: Incorporate changes caused by JEP-396 integration into JDK-16+ (#2818)

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

commit f79320a4608c027852569e872a72e5ca4b6e407d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Jan 9 12:16:58 2026 -0500

    CXF-8407: Incorporate changes caused by JEP-396 integration into JDK-16+ (#2818)
    
    (cherry picked from commit a82fd54ed3494bee6938607f57a7beedfffe61a2)
    (cherry picked from commit 52605a9bbeed06c8d265e67daca70e9cd8b7cce5)
    
    # Conflicts:
    #       parent/pom.xml
    (cherry picked from commit 0e444d3c3935b9128378fce7c63b65e8e2c30c9d)
    
    # Conflicts:
    #       parent/pom.xml
---
 parent/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/parent/pom.xml b/parent/pom.xml
index 13dcdb7e3a3..25f3433282c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2272,7 +2272,11 @@
             </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))
             </properties>
         </profile>
     </profiles>