Repository: cxf Updated Branches: refs/heads/master 8cf45d15d -> 14949c37f
Update to latest JAXB, this might have to be reverted, but wanted folks to see what is involved. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/14949c37 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/14949c37 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/14949c37 Branch: refs/heads/master Commit: 14949c37fc9ac90a410137721c5ab46ff71367c1 Parents: 8cf45d1 Author: Daniel Kulp <[email protected]> Authored: Wed May 28 12:32:46 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Wed May 28 12:33:35 2014 -0400 ---------------------------------------------------------------------- core/pom.xml | 5 ++++ distribution/javadoc/pom.xml | 4 +++ distribution/manifest/pom.xml | 2 +- distribution/pom.xml | 3 ++- distribution/src/main/release/lib/WHICH_JARS | 1 + parent/pom.xml | 30 +++++++++++++++++++---- rt/databinding/jaxb/pom.xml | 4 +++ services/wsn/wsn-core/pom.xml | 9 +++++++ tools/common/pom.xml | 4 +++ tools/javato/ws/pom.xml | 4 +++ tools/validator/pom.xml | 4 +++ tools/wsdlto/core/pom.xml | 4 +++ tools/wsdlto/databinding/jaxb/pom.xml | 4 +++ tools/wsdlto/misc/pom.xml | 4 +++ tools/wsdlto/test/pom.xml | 5 ++++ 15 files changed, 80 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 81772a2..7401edd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -101,6 +101,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <optional>true</optional> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/distribution/javadoc/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml index ce992bc..0962614 100644 --- a/distribution/javadoc/pom.xml +++ b/distribution/javadoc/pom.xml @@ -121,6 +121,10 @@ </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/distribution/manifest/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml index 45d8e7b..cdbfd05 100644 --- a/distribution/manifest/pom.xml +++ b/distribution/manifest/pom.xml @@ -381,7 +381,7 @@ <!-- Add entries for the stuff that needs to be endorsed on Java6, but not on java5 --> <!-- Stick both versions of jaxb xjc/impl on classpath to make it easier to flip back and forth --> <Class-Path> - cxf-${project.version}.jar endorsed/jaxb-api-${cxf.jaxb22.version}.jar endorsed/geronimo-jaxws_2.2_spec-${cxf.specs.jaxws.api.version}.jar jaxb-impl-${cxf.jaxb22.impl.version}.jar jaxb-impl-${cxf.jaxb21.impl.version}.jar jaxb-xjc-${cxf.jaxb22.xjc.version}.jar jaxb-xjc-${cxf.jaxb21.xjc.version}.jar + cxf-${project.version}.jar endorsed/jaxb-api-${cxf.jaxb22.version}.jar endorsed/geronimo-jaxws_2.2_spec-${cxf.specs.jaxws.api.version}.jar jaxb-impl-${cxf.jaxb22.impl.version}.jar jaxb-core-${cxf.jaxb22.core.version}.jar jaxb-impl-${cxf.jaxb21.impl.version}.jar jaxb-core-${cxf.jaxb21.core.version}.jar jaxb-xjc-${cxf.jaxb22.xjc.version}.jar jaxb-xjc-${cxf.jaxb21.xjc.version}.jar </Class-Path> </manifestEntries> </archive> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index a467fc3..8edbb1f 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -36,7 +36,8 @@ <cxf.checkstyle.extension>-corba</cxf.checkstyle.extension> <cxf.jaxb.version>${cxf.jaxb22.version}</cxf.jaxb.version> <cxf.jaxb.impl.version>${cxf.jaxb22.impl.version}</cxf.jaxb.impl.version> - <cxf.jaxb.xjc.version>${cxf.jaxb22.impl.version}</cxf.jaxb.xjc.version> + <cxf.jaxb.core.version>${cxf.jaxb22.core.version}</cxf.jaxb.core.version> + <cxf.jaxb.xjc.version>${cxf.jaxb22.xjc.version}</cxf.jaxb.xjc.version> </properties> <modules> <module>manifest</module> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/distribution/src/main/release/lib/WHICH_JARS ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/lib/WHICH_JARS b/distribution/src/main/release/lib/WHICH_JARS index 6c79673..9209a7a 100755 --- a/distribution/src/main/release/lib/WHICH_JARS +++ b/distribution/src/main/release/lib/WHICH_JARS @@ -18,6 +18,7 @@ The following jars are required for all CXF usage: - geronimo-javamail.jar (Or the Sun equivalent) [6] (MAY be able to remove javamail if you don't use any MIME/MTOM/SAAJ type things) - jaxb-api.jar [6] +- jaxb-core.jar [6] - jaxb-impl.jar (this is a [6] for normal runtime, but is required for tooling and the dynamic clients) - xmlschema-core.jar http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 36ca7e0..f6ad0e4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -107,14 +107,17 @@ <cxf.jasypt.bundle.version>1.9.0_1</cxf.jasypt.bundle.version> <cxf.javax.ws.rs.version>2.0</cxf.javax.ws.rs.version> <cxf.jaxb21.version>2.1</cxf.jaxb21.version> - <cxf.jaxb21.impl.version>2.1.13</cxf.jaxb21.impl.version> - <cxf.jaxb21.xjc.version>2.1.13</cxf.jaxb21.xjc.version> - <cxf.jaxb22.version>2.2.7</cxf.jaxb22.version> - <cxf.jaxb22.impl.version>2.2.7</cxf.jaxb22.impl.version> - <cxf.jaxb22.xjc.version>2.2.7</cxf.jaxb22.xjc.version> + <cxf.jaxb21.impl.version>2.1.14</cxf.jaxb21.impl.version> + <cxf.jaxb21.core.version>2.1.14</cxf.jaxb21.core.version> + <cxf.jaxb21.xjc.version>2.1.14</cxf.jaxb21.xjc.version> + <cxf.jaxb22.version>2.2.11</cxf.jaxb22.version> + <cxf.jaxb22.impl.version>2.2.10-b140310.1920</cxf.jaxb22.impl.version> + <cxf.jaxb22.core.version>2.2.10-b140310.1920</cxf.jaxb22.core.version> + <cxf.jaxb22.xjc.version>2.2.10-b140310.1920</cxf.jaxb22.xjc.version> <!-- by default, we use jaxb 2.1, but java5 profile will override to 2.2 --> <cxf.jaxb.version>${cxf.jaxb21.version}</cxf.jaxb.version> <cxf.jaxb.impl.version>${cxf.jaxb21.impl.version}</cxf.jaxb.impl.version> + <cxf.jaxb.core.version>${cxf.jaxb21.core.version}</cxf.jaxb.core.version> <cxf.jaxb.xjc.version>${cxf.jaxb21.xjc.version}</cxf.jaxb.xjc.version> <cxf.joda.time.version>2.2</cxf.joda.time.version> <cxf.jdom.version>1.0</cxf.jdom.version> @@ -1340,6 +1343,21 @@ </exclusions> </dependency> <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>${cxf.jaxb.core.version}</version> + <exclusions> + <exclusion> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>txw2</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>jaxme</groupId> <artifactId>jaxme2</artifactId> <version>0.5.1</version> @@ -1704,6 +1722,7 @@ <cxf.jaxb.version>${cxf.jaxb22.version}</cxf.jaxb.version> <cxf.jaxb.impl.version>${cxf.jaxb22.impl.version}</cxf.jaxb.impl.version> <cxf.jaxb.xjc.version>${cxf.jaxb22.impl.version}</cxf.jaxb.xjc.version> + <cxf.jaxb.core.version>${cxf.jaxb22.core.version}</cxf.jaxb.core.version> </properties> <build> <plugins> @@ -1736,6 +1755,7 @@ <cxf.jaxb.version>${cxf.jaxb22.version}</cxf.jaxb.version> <cxf.jaxb.impl.version>${cxf.jaxb22.impl.version}</cxf.jaxb.impl.version> <cxf.jaxb.xjc.version>${cxf.jaxb22.impl.version}</cxf.jaxb.xjc.version> + <cxf.jaxb.core.version>${cxf.jaxb22.core.version}</cxf.jaxb.core.version> <cxf.codegen.jvmArgs>-Djavax.xml.accessExternalSchema=file</cxf.codegen.jvmArgs> </properties> <build> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/rt/databinding/jaxb/pom.xml ---------------------------------------------------------------------- diff --git a/rt/databinding/jaxb/pom.xml b/rt/databinding/jaxb/pom.xml index 5b5c913..b36975b 100644 --- a/rt/databinding/jaxb/pom.xml +++ b/rt/databinding/jaxb/pom.xml @@ -101,6 +101,10 @@ <artifactId>jaxb-impl</artifactId> </dependency> <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> <groupId>${cxf.asm.groupId}</groupId> <artifactId>${cxf.asm.artifactId}</artifactId> <optional>true</optional> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/services/wsn/wsn-core/pom.xml ---------------------------------------------------------------------- diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml index 4c35b5e..3000935 100644 --- a/services/wsn/wsn-core/pom.xml +++ b/services/wsn/wsn-core/pom.xml @@ -77,6 +77,10 @@ <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -101,6 +105,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-rt</artifactId> <version>2.1.7</version> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/tools/common/pom.xml ---------------------------------------------------------------------- diff --git a/tools/common/pom.xml b/tools/common/pom.xml index ac7f67b..8c0d61c 100644 --- a/tools/common/pom.xml +++ b/tools/common/pom.xml @@ -56,6 +56,10 @@ </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/tools/javato/ws/pom.xml ---------------------------------------------------------------------- diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml index a457c20..96ec8b6 100644 --- a/tools/javato/ws/pom.xml +++ b/tools/javato/ws/pom.xml @@ -123,6 +123,10 @@ </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/tools/validator/pom.xml ---------------------------------------------------------------------- diff --git a/tools/validator/pom.xml b/tools/validator/pom.xml index 3f78289..bdc733d 100644 --- a/tools/validator/pom.xml +++ b/tools/validator/pom.xml @@ -60,6 +60,10 @@ </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/tools/wsdlto/core/pom.xml ---------------------------------------------------------------------- diff --git a/tools/wsdlto/core/pom.xml b/tools/wsdlto/core/pom.xml index e06122f..fb1e68f 100644 --- a/tools/wsdlto/core/pom.xml +++ b/tools/wsdlto/core/pom.xml @@ -75,6 +75,10 @@ </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/tools/wsdlto/databinding/jaxb/pom.xml ---------------------------------------------------------------------- diff --git a/tools/wsdlto/databinding/jaxb/pom.xml b/tools/wsdlto/databinding/jaxb/pom.xml index 63fa5b3..cb0f9ba 100644 --- a/tools/wsdlto/databinding/jaxb/pom.xml +++ b/tools/wsdlto/databinding/jaxb/pom.xml @@ -37,6 +37,10 @@ </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/tools/wsdlto/misc/pom.xml ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/pom.xml b/tools/wsdlto/misc/pom.xml index e63cfb2..5df352a 100644 --- a/tools/wsdlto/misc/pom.xml +++ b/tools/wsdlto/misc/pom.xml @@ -58,6 +58,10 @@ <artifactId>jaxb-impl</artifactId> </dependency> <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-tools-common</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/cxf/blob/14949c37/tools/wsdlto/test/pom.xml ---------------------------------------------------------------------- diff --git a/tools/wsdlto/test/pom.xml b/tools/wsdlto/test/pom.xml index ce2262e..efd1d43 100644 --- a/tools/wsdlto/test/pom.xml +++ b/tools/wsdlto/test/pom.xml @@ -106,5 +106,10 @@ <artifactId>jaxb-impl</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project>
