cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [04/20] cxf git commit: Change how the jaxbcontext is set to work with surefire 2.18.1
Date Fri, 22 May 2015 19:19:32 GMT
Change how the jaxbcontext is set to work with surefire 2.18.1


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9b9bc691
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9b9bc691
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9b9bc691

Branch: refs/heads/3.0.x-fixes
Commit: 9b9bc69112b9fdc98655dbce4b1950547523ff46
Parents: d398d1e
Author: Daniel Kulp <dkulp@apache.org>
Authored: Wed May 20 13:36:18 2015 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri May 22 14:36:24 2015 -0400

----------------------------------------------------------------------
 parent/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/9b9bc691/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 568ef8c..0836a68 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -206,6 +206,7 @@
         <cxf.jexl.version>2.1.1</cxf.jexl.version>
         <cxf.checkstyle.extension />
         <cxf.jaxb.context.class />
+        <cxf.jaxb.context.class.property>none</cxf.jaxb.context.class.property>
         <cxf.spring.validation.mode>VALIDATION_AUTO</cxf.spring.validation.mode>
         <cxf.downloadSources>true</cxf.downloadSources>
         <cxf.pmd.eclipse.ruleset.ext />
@@ -403,7 +404,7 @@
                         <useFile>${cxf.surefire.usefile}</useFile>
                         <forkMode>${cxf.surefire.fork.mode}</forkMode>
                         <childDelegation>false</childDelegation>
-                        <argLine>${cxf.surefire.fork.vmargs}</argLine>
+                        <argLine>${cxf.surefire.fork.vmargs} -D${cxf.jaxb.context.class.property}=${cxf.jaxb.context.class}</argLine>
                         <enableAssertions>${cxf.surefire.enable.assertions}</enableAssertions>
                         <parallel>${cxf.surefire.parallel.mode}</parallel>
                         <systemPropertyVariables>
@@ -419,8 +420,6 @@
                             <spring.validation.mode>${cxf.spring.validation.mode}</spring.validation.mode>
                             <server.launcher.vmargs>${cxf.server.launcher.vmargs}</server.launcher.vmargs>
                             <org.apache.cxf.transport.http.async.usePolicy>ASYNC_ONLY</org.apache.cxf.transport.http.async.usePolicy>
-                            <javax.xml.bind.JAXBContext>${cxf.jaxb.context.class}</javax.xml.bind.JAXBContext>
-                            <!--javax.xml.bind.JAXBContext>org.eclipse.persistence.jaxb.JAXBContextFactory</javax.xml.bind.JAXBContext-->
                         </systemPropertyVariables>
                     </configuration>
                 </plugin>
@@ -1924,6 +1923,7 @@
             <id>eclipse.moxy</id>
             <properties>
                 <cxf.jaxb.context.class>org.eclipse.persistence.jaxb.JAXBContextFactory</cxf.jaxb.context.class>
+                <cxf.jaxb.context.class.property>javax.xml.bind.JAXBContext</cxf.jaxb.context.class.property>
             </properties>
             <dependencies>
                 <dependency>


Mime
View raw message