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
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9899ab73
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9899ab73
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9899ab73
Branch: refs/heads/3.0.x-fixes
Commit: 9899ab73b13a0614dd366ae7c8d55482d700d2b6
Parents: 5954950
Author: Daniel Kulp <[email protected]>
Authored: Fri Sep 12 12:48:27 2014 -0400
Committer: Daniel Kulp <[email protected]>
Committed: Fri Sep 12 13:59:59 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
services/ws-discovery/ws-discovery-api/pom.xml | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9899ab73/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d343f8..6aa0db5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<properties>
<cxf.compiler.fork>false</cxf.compiler.fork>
<cxf.build-utils.version>3.0.0</cxf.build-utils.version>
- <cxf.xjc-utils.version>3.0.1</cxf.xjc-utils.version>
+ <cxf.xjc-utils.version>3.0.2-SNAPSHOT</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/9899ab73/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 d1cdf9e..0e47900 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -82,6 +82,13 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<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>
@@ -93,6 +100,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>
