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 2017/06/07 17:54:10 UTC
[4/9] cxf git commit: Update maven-compiler-plugin
Update maven-compiler-plugin
# Conflicts:
# distribution/src/main/release/samples/pom.xml
# pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/82ac9402
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/82ac9402
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/82ac9402
Branch: refs/heads/3.1.x-fixes
Commit: 82ac9402b836ff58a131ed1c86226072ea267b42
Parents: a8a8570
Author: Dennis Kieselhorst <de...@apache.org>
Authored: Fri May 26 10:25:29 2017 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 7 12:41:45 2017 -0400
----------------------------------------------------------------------
distribution/src/main/release/samples/pom.xml | 4 ++--
pom.xml | 6 +++++-
systests/wsdl_maven/codegen/src/it/it-parent/pom.xml | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/82ac9402/distribution/src/main/release/samples/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 4b3785c..98d6426 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -127,7 +127,7 @@
<dependencyManagement>
<dependencies>
<!--
- Pull in the cxf-parents as import scope to re-use the dependenecyManagement
+ Pull in the cxf-parents as import scope to re-use the dependencyManagement
sections of those poms. Those sections define the versions of various third
party deps that CXF used to build with and test with and we would like
to make sure the same versions are used for the samples
@@ -155,7 +155,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.6.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
http://git-wip-us.apache.org/repos/asf/cxf/blob/82ac9402/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dd9471b..81f5693 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,7 +214,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.6.1</version>
<configuration>
<source>${cxf.jdk.version}</source>
<target>${cxf.jdk.version}</target>
@@ -483,7 +483,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+<<<<<<< HEAD
<version>3.3</version>
+=======
+ <version>3.6.1</version>
+>>>>>>> 18418ec342... Update maven-compiler-plugin
<configuration>
<source>1.7</source>
<target>1.7</target>
http://git-wip-us.apache.org/repos/asf/cxf/blob/82ac9402/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
----------------------------------------------------------------------
diff --git a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
index 5429578..7a49413 100644
--- a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
+++ b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
@@ -37,7 +37,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.6.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>