Author: dkulp Date: Tue May 29 17:01:59 2012 New Revision: 1343849 URL: http://svn.apache.org/viewvc?rev=1343849&view=rev Log: Merged revisions 1343844 via svn merge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........ r1343844 | dkulp | 2012-05-29 12:55:52 -0400 (Tue, 29 May 2012) | 17 lines Merged revisions 1343833 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1343833 | dkulp | 2012-05-29 12:39:20 -0400 (Tue, 29 May 2012) | 9 lines Merged revisions 1343775 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1343775 | dkulp | 2012-05-29 11:31:55 -0400 (Tue, 29 May 2012) | 1 line Upgrade compiler plugin to fix -T issues with java6 ........ ........ ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/pom.xml Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/pom.xml?rev=1343849&r1=1343848&r2=1343849&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/pom.xml (original) +++ cxf/branches/2.3.x-fixes/pom.xml Tue May 29 17:01:59 2012 @@ -225,7 +225,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.4</version> + <version>2.5</version> <configuration> <source>${cxf.jdk.version}</source> <target>${cxf.jdk.version}</target> @@ -520,7 +520,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.4</version> + <version>2.5</version> <configuration> <source>1.5</source> <target>1.5</target>
