You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2015/07/09 18:43:58 UTC
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 00b97475e -> e063e8c17
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e063e8c1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e063e8c1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e063e8c1
Branch: refs/heads/3.0.x-fixes
Commit: e063e8c17d0ac9b3b267d07ade4e4ccd84b74e15
Parents: d2f9625
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jul 9 12:43:49 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jul 9 12:43:49 2015 -0400
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e063e8c1/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 146f51e..c46b8b1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -194,6 +194,7 @@ B 7e8d0b4b1cd868272380ca5779e67a15e46cf799
B 7e95279dd1170f5878687d7eea27f7d7f03a434b
B 80014cf0e6fb1ba62ffdb3766acffd2130eef9d6
B 80d7128a3ba1944a603c73e5e908d86c9bf27648
+B 81bc682a409806567fc3485157e184e72feaf086
B 842fade62621490a407729fa1357f043216f25e6
B 857b55796dc7fc2b302e26d99f84df1712ff9c58
B 85c06fc4d6a642627434785a2d228d3c08d68768
[2/2] cxf git commit: Also fix netty
Posted by dk...@apache.org.
Also fix netty
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d2f96250
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d2f96250
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d2f96250
Branch: refs/heads/3.0.x-fixes
Commit: d2f9625030f8df1485b0a93a57e5c5bde7fddb35
Parents: 00b9747
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jul 9 12:42:56 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jul 9 12:43:49 2015 -0400
----------------------------------------------------------------------
rt/transports/http-netty/netty-server/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f96250/rt/transports/http-netty/netty-server/pom.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml
index 3f08604..03cea80 100644
--- a/rt/transports/http-netty/netty-server/pom.xml
+++ b/rt/transports/http-netty/netty-server/pom.xml
@@ -145,9 +145,15 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
+ <extensions>
+ <extension>org.apache.cxf.xjcplugins:cxf-xjc-bug986:${cxf.xjc-utils.version}</extension>
+ </extensions>
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
<xsdOptions>
<xsdOption>
+ <extensionArgs>
+ <arg>-Xbug986</arg>
+ </extensionArgs>
<xsd>${basedir}/src/main/resources/schemas/configuration/http-netty-server.xsd</xsd>
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<deleteDirs>