Author: dkulp Date: Mon Feb 6 22:14:24 2012 New Revision: 1241214 URL: http://svn.apache.org/viewvc?rev=1241214&view=rev Log: Merged revisions 1241196 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1241196 | dkulp | 2012-02-06 16:43:02 -0500 (Mon, 06 Feb 2012) | 9 lines Merged revisions 1241055 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1241055 | dkulp | 2012-02-06 11:03:24 -0500 (Mon, 06 Feb 2012) | 1 line Update to newer versions of various maven plugins ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/distribution/pom.xml cxf/branches/2.4.x-fixes/distribution/src/main/assembly/bin.xml cxf/branches/2.4.x-fixes/parent/pom.xml cxf/branches/2.4.x-fixes/pom.xml Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/distribution/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/pom.xml?rev=1241214&r1=1241213&r2=1241214&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/pom.xml (original) +++ cxf/branches/2.4.x-fixes/distribution/pom.xml Mon Feb 6 22:14:24 2012 @@ -418,7 +418,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>distribution-package</id> + <id>distribution-package-bin</id> <phase>package</phase> <goals> <goal>single</goal> @@ -426,6 +426,19 @@ <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </execution> + <execution> + <id>distribution-package-src</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> Modified: cxf/branches/2.4.x-fixes/distribution/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/assembly/bin.xml?rev=1241214&r1=1241213&r2=1241214&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/assembly/bin.xml (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/assembly/bin.xml Mon Feb 6 22:14:24 2012 @@ -19,7 +19,7 @@ --> <assembly> <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> - <id></id> + <id>bin</id> <includeBaseDirectory>false</includeBaseDirectory> <formats> <format>dir</format> Modified: cxf/branches/2.4.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1241214&r1=1241213&r2=1241214&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.4.x-fixes/parent/pom.xml Mon Feb 6 22:14:24 2012 @@ -276,7 +276,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>2.6</version> + <version>2.7</version> <dependencies> <dependency> <groupId>org.apache.cxf.build-utils</groupId> @@ -1682,7 +1682,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>2.6</version> + <version>2.7</version> <dependencies> <dependency> <groupId>org.apache.cxf.build-utils</groupId> Modified: cxf/branches/2.4.x-fixes/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/pom.xml?rev=1241214&r1=1241213&r2=1241214&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/pom.xml (original) +++ cxf/branches/2.4.x-fixes/pom.xml Mon Feb 6 22:14:24 2012 @@ -384,7 +384,7 @@ <!-- We want to sign the artifact, the POM, and all attached artifacts --> <plugin> <artifactId>maven-gpg-plugin</artifactId> - <version>1.3</version> + <version>1.4</version> <executions> <execution> <goals> @@ -510,7 +510,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.9</version> + <version>2.12</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -560,7 +560,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.3.1</version> + <version>2.4</version> <configuration> <archive> <manifestEntries> @@ -586,18 +586,18 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> + <version>2.3</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.3</version> + <version>2.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>1.4</version> + <version>1.5</version> <dependencies> <dependency> <groupId>org.apache.cxf.build-utils</groupId> @@ -614,7 +614,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.9</version> + <version>2.12</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
