Author: dkulp
Date: Fri Jan 13 19:23:47 2012
New Revision: 1231259
URL: http://svn.apache.org/viewvc?rev=1231259&view=rev
Log:
Merged revisions 1228850 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1228850 | dkulp | 2012-01-08 09:05:32 -0500 (Sun, 08 Jan 2012) | 2 lines
Fix it test with maven 2.2.1
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 13 19:23:47 2012
@@ -1 +1 @@
-/cxf/trunk:1-1227739,1227823,1228209,1228228,1228230-1228231,1228268,1228277,1228359,1228770,1229663,1229965,1230800
+/cxf/trunk:1-1227739,1227823,1228209,1228228,1228230-1228231,1228268,1228277,1228359,1228770,1228850,1229663,1229965,1230800
Modified:
cxf/branches/2.5.x-fixes/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml?rev=1231259&r1=1231258&r2=1231259&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
(original)
+++
cxf/branches/2.5.x-fixes/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
Fri Jan 13 19:23:47 2012
@@ -24,7 +24,7 @@
<version>1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <cxf.version>@project.version@</cxf.version>
+ <cxf.version>@project.version@</cxf.version>
</properties>
<build>
<pluginManagement>
@@ -34,6 +34,15 @@
<artifactId>cxf-codegen-plugin</artifactId>
<version>@project.version@</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
