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 2010/05/06 20:42:38 UTC
svn commit: r941851 - in /cxf/branches/2.2.x-fixes: ./ api/ buildtools/
buildtools/src/main/java/org/apache/cxf/maven/
buildtools/src/main/resources/ distribution/bundle/all/
distribution/bundle/jaxrs/ distribution/bundle/minimal/ parent/
Author: dkulp
Date: Thu May 6 18:42:37 2010
New Revision: 941851
URL: http://svn.apache.org/viewvc?rev=941851&view=rev
Log:
Merged revisions 941842 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r941842 | dkulp | 2010-05-06 14:25:30 -0400 (Thu, 06 May 2010) | 1 line
Update to latest versions of various plugins
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/api/pom.xml
cxf/branches/2.2.x-fixes/buildtools/pom.xml
cxf/branches/2.2.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java
cxf/branches/2.2.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml
cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml
cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
cxf/branches/2.2.x-fixes/parent/pom.xml
cxf/branches/2.2.x-fixes/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/pom.xml?rev=941851&r1=941850&r2=941851&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/api/pom.xml Thu May 6 18:42:37 2010
@@ -217,25 +217,26 @@
</plugins>
<pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <header>Apache CXF API</header>
- <footer>Apache CXF API</footer>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <detectOfflineLinks>false</detectOfflineLinks>
+ <header>Apache CXF API</header>
+ <footer>Apache CXF API</footer>
+ </configuration>
+ </plugin>
+ </plugins>
</pluginManagement>
</build>
Modified: cxf/branches/2.2.x-fixes/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/buildtools/pom.xml?rev=941851&r1=941850&r2=941851&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/buildtools/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/buildtools/pom.xml Thu May 6 18:42:37 2010
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.1</version>
+ <version>1.3.2</version>
<optional>true</optional>
</dependency>
<dependency>
Modified: cxf/branches/2.2.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java?rev=941851&r1=941850&r2=941851&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java (original)
+++ cxf/branches/2.2.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java Thu May 6 18:42:37 2010
@@ -62,6 +62,9 @@ public class CXFAllTransformer implement
return !extensions.isEmpty();
}
+ public void processResource(String resource, InputStream is, List relocators) throws IOException {
+ processResource(is);
+ }
public void processResource(InputStream is) throws IOException {
ByteArrayOutputStream bout = new ByteArrayOutputStream(1024);
int i = is.read(buffer);
Modified: cxf/branches/2.2.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java?rev=941851&r1=941850&r2=941851&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java (original)
+++ cxf/branches/2.2.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java Thu May 6 18:42:37 2010
@@ -21,6 +21,7 @@ package org.apache.cxf.maven;
import java.io.IOException;
import java.io.InputStream;
import java.util.Iterator;
+import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
@@ -53,6 +54,9 @@ public class PluginTransformer implement
return false;
}
+ public void processResource(String resource, InputStream is, List relocators) throws IOException {
+ processResource(is);
+ }
public void processResource(InputStream is) throws IOException {
Document r;
try {
@@ -89,4 +93,5 @@ public class PluginTransformer implement
new XMLOutputter(Format.getPrettyFormat()).output(doc, jos);
doc = null;
}
+
}
Modified: cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml?rev=941851&r1=941850&r2=941851&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml (original)
+++ cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml Thu May 6 18:42:37 2010
@@ -86,7 +86,7 @@
<module name="UnusedImports" />
<module name="ImportOrder">
<property name="groups"
- value="java,javax,org.w3c,org.xml,junit,antlr,com,net,org,org.junit" />
+ value="java,javax,org.w3c,org.xml,junit,antlr,com,net,org,org.junit,*" />
<property name="ordered" value="true" />
</module>
<!--
Modified: cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml?rev=941851&r1=941850&r2=941851&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml (original)
+++ cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml Thu May 6 18:42:37 2010
@@ -81,7 +81,7 @@
<module name="UnusedImports" />
<module name="ImportOrder">
<property name="groups"
- value="java,javax,org.w3c,org.xml,junit,antlr,com,net,org,org.junit" />
+ value="java,javax,org.w3c,org.xml,junit,antlr,com.,net,org,org.junit,*" />
<property name="ordered" value="true" />
</module>
<!--
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml?rev=941851&r1=941850&r2=941851&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml Thu May 6 18:42:37 2010
@@ -379,13 +379,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-buildtools</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=941851&r1=941850&r2=941851&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml Thu May 6 18:42:37 2010
@@ -220,13 +220,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-buildtools</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml?rev=941851&r1=941850&r2=941851&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml Thu May 6 18:42:37 2010
@@ -275,13 +275,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-buildtools</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
Modified: cxf/branches/2.2.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=941851&r1=941850&r2=941851&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/parent/pom.xml Thu May 6 18:42:37 2010
@@ -161,7 +161,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -194,7 +194,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -286,7 +286,7 @@
</plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -1090,7 +1090,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1100,7 +1100,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: cxf/branches/2.2.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/pom.xml?rev=941851&r1=941850&r2=941851&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/pom.xml Thu May 6 18:42:37 2010
@@ -297,7 +297,7 @@
<plugin>
<inherited>true</inherited>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<configuration>
<altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
<updateReleaseInfo>true</updateReleaseInfo>
@@ -306,7 +306,7 @@
<!-- We want to sign the artifact, the POM, and all attached artifacts -->
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-4</version>
+ <version>1.0</version>
<executions>
<execution>
<goals>
@@ -329,7 +329,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1</version>
+ <version>2.1.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -365,22 +365,22 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
+ <version>2.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -390,7 +390,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
+ <version>2.0</version>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/cxf/tags</tagBase>
<useReleaseProfile>false</useReleaseProfile>
@@ -403,7 +403,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7</version>
<configuration>
<attach>true</attach>
<source>1.5</source>
@@ -422,12 +422,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<maxmem>256M</maxmem>
<fork>${compiler.fork}</fork>
+ <encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
@@ -438,7 +439,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<configuration>
<archive>
<manifestEntries>
@@ -456,7 +457,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.2</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
@@ -464,7 +465,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
+ <version>2.2-beta-5</version>
</plugin>
<plugin>
@@ -475,17 +476,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.3.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf.build-utils</groupId>
+ <artifactId>cxf-buildtools</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -495,17 +503,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>