cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [03/10] git commit: Use the new xjc plugin to fix the generated HelloType (and others) so they can actually be marshalled when using Java7/8.
Date Tue, 07 Oct 2014 18:46:15 GMT
Use the new xjc plugin to fix the generated HelloType (and others) so they can actually be
marshalled when using Java7/8.

Conflicts:
	pom.xml

Conflicts:
	pom.xml
	services/ws-discovery/ws-discovery-api/pom.xml


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

Branch: refs/heads/2.7.x-fixes
Commit: faa2ea551f697f70f4d9f60f0d24d8ac00870e49
Parents: 93008c9
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Sep 12 12:48:27 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Tue Oct 7 14:03:19 2014 -0400

----------------------------------------------------------------------
 pom.xml                                        |  4 ++--
 services/ws-discovery/ws-discovery-api/pom.xml | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/faa2ea55/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2887887..5e76648 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,8 +46,8 @@
 
     <properties>
         <cxf.compiler.fork>false</cxf.compiler.fork>
-        <cxf.build-utils.version>2.6.0</cxf.build-utils.version>
-        <cxf.xjc-utils.version>2.6.2</cxf.xjc-utils.version>
+        <cxf.build-utils.version>3.0.0</cxf.build-utils.version>
+        <cxf.xjc-utils.version>3.0.2</cxf.xjc-utils.version>
         <cxf.jdk.version>1.6</cxf.jdk.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>

http://git-wip-us.apache.org/repos/asf/cxf/blob/faa2ea55/services/ws-discovery/ws-discovery-api/pom.xml
----------------------------------------------------------------------
diff --git a/services/ws-discovery/ws-discovery-api/pom.xml b/services/ws-discovery/ws-discovery-api/pom.xml
index d198075..c1523f1 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -80,7 +80,14 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-	            <version>${project.version}</version>
+                <version>${project.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.cxf.xjcplugins</groupId>
+                        <artifactId>cxf-xjc-bug986</artifactId>
+                        <version>${cxf.xjc-utils.version}</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -91,6 +98,9 @@
                             </defaultOptions>
                             <wsdlOptions>
                                 <wsdlOption>
+                                    <xjcargs>
+                                        <xjcarg>-Xbug986</xjcarg>
+                                    </xjcargs>
                                     <wsdl>${basedir}/src/main/resources/org/apache/cxf/ws/discovery/wsdl/wsdd-discovery-1.1-wsdl-os.wsdl</wsdl>
                                     <extraargs>
                                         <extraArg>-p</extraArg>


Mime
View raw message