Updating XJC
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/28dfd582
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/28dfd582
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/28dfd582
Branch: refs/heads/3.0.x-fixes
Commit: 28dfd5823c055913a5ef36657eb2b5e14aaca83e
Parents: 936c255
Author: Colm O hEigeartaigh <cohei...@apache.org>
Authored: Fri Sep 4 17:28:09 2015 +0100
Committer: Colm O hEigeartaigh <cohei...@apache.org>
Committed: Fri Sep 4 17:29:42 2015 +0100
----------------------------------------------------------------------
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/28dfd582/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5c64ef2..eed1558 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,9 +42,15 @@
</prerequisites>
<properties>
<cxf.compiler.fork>false</cxf.compiler.fork>
+<<<<<<< HEAD
<cxf.build-utils.version>3.0.0</cxf.build-utils.version>
<cxf.xjc-utils.version>3.0.4</cxf.xjc-utils.version>
<cxf.jdk.version>1.6</cxf.jdk.version>
+=======
+ <cxf.build-utils.version>3.1.0</cxf.build-utils.version>
+ <cxf.xjc-utils.version>3.0.5</cxf.xjc-utils.version>
+ <cxf.jdk.version>1.7</cxf.jdk.version>
+>>>>>>> 2fc62cf... Updating XJC
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
</properties>
