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/05b96b6e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/05b96b6e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/05b96b6e Branch: refs/heads/master Commit: 05b96b6e8d1c3f845ce4d9b8a77c638ed7e987b7 Parents: a95ec0b Author: Daniel Kulp <[email protected]> Authored: Wed May 20 13:36:18 2015 -0400 Committer: Daniel Kulp <[email protected]> Committed: Wed May 20 13:38:53 2015 -0400 ---------------------------------------------------------------------- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/05b96b6e/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index fa59f71..6c26b6c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -193,6 +193,7 @@ <cxf.htrace.version>3.1.0-incubating</cxf.htrace.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 /> @@ -400,7 +401,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> @@ -416,8 +417,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> @@ -1869,6 +1868,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>
