Author: dkulp
Date: Tue Dec 4 20:55:33 2012
New Revision: 1417164
URL: http://svn.apache.org/viewvc?rev=1417164&view=rev
Log:
Merged revisions 1414383 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1414383 | dkulp | 2012-11-27 15:33:18 -0500 (Tue, 27 Nov 2012) | 2 lines
Unify the compiler plugin configs
........
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/aegis/pom.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/pom.xml
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/aegis/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/aegis/pom.xml?rev=1417164&r1=1417163&r2=1417164&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/aegis/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/aegis/pom.xml
Tue Dec 4 20:55:33 2012
@@ -37,14 +37,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.5</version>
<configuration>
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml?rev=1417164&r1=1417163&r2=1417164&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
Tue Dec 4 20:55:33 2012
@@ -42,14 +42,6 @@
<!-- I'm using the dependency plugin to build a dependency list
that would get placed in FileInstall's
load folder; I couldn't get maven-assembly-plugin's
dependencySet to work as I had desired -->
<plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/pom.xml?rev=1417164&r1=1417163&r2=1417164&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/pom.xml
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/pom.xml Tue
Dec 4 20:55:33 2012
@@ -131,7 +131,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.5.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
