Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cc2bb2de Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cc2bb2de Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cc2bb2de Branch: refs/heads/3.0.x-fixes Commit: cc2bb2de00d5ca985781ca00052d63cf743c22c7 Parents: 5ad28ff Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Fri Sep 4 17:30:00 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Fri Sep 4 17:30:00 2015 +0100 ---------------------------------------------------------------------- pom.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/cc2bb2de/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index eed1558..1ae3700 100644 --- a/pom.xml +++ b/pom.xml @@ -42,15 +42,9 @@ </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 + <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> </properties>
