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 2007/12/15 04:51:56 UTC
svn commit: r604387 - in /incubator/cxf/trunk: buildtools/pom.xml
buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
distribution/bundle/pom.xml parent/pom.xml pom.xml
Author: dkulp
Date: Fri Dec 14 19:51:55 2007
New Revision: 604387
URL: http://svn.apache.org/viewvc?rev=604387&view=rev
Log:
Update to newer versions of remote-resources and shade
Make deployed bundle pom actually usable by promoting the dependencies, creating a sources jar, etc... (new shade is cool)
Modified:
incubator/cxf/trunk/buildtools/pom.xml
incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
incubator/cxf/trunk/distribution/bundle/pom.xml
incubator/cxf/trunk/parent/pom.xml
incubator/cxf/trunk/pom.xml
Modified: incubator/cxf/trunk/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/pom.xml?rev=604387&r1=604386&r2=604387&view=diff
==============================================================================
--- incubator/cxf/trunk/buildtools/pom.xml (original)
+++ incubator/cxf/trunk/buildtools/pom.xml Fri Dec 14 19:51:55 2007
@@ -75,9 +75,9 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>shade-maven-plugin</artifactId>
- <version>1.0-alpha-6</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.0-alpha-15</version>
<optional>true</optional>
</dependency>
</dependencies>
Modified: incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java?rev=604387&r1=604386&r2=604387&view=diff
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java (original)
+++ incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java Fri Dec 14 19:51:55 2007
@@ -24,7 +24,7 @@
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
-import org.codehaus.mojo.shade.resource.ResourceTransformer;
+import org.apache.maven.plugins.shade.resource.ResourceTransformer;
import org.jdom.Attribute;
import org.jdom.Content;
import org.jdom.Document;
@@ -88,5 +88,6 @@
jos.putNextEntry(new JarEntry(resource));
new XMLOutputter(Format.getPrettyFormat()).output(doc, jos);
+ doc = null;
}
}
Modified: incubator/cxf/trunk/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/bundle/pom.xml?rev=604387&r1=604386&r2=604387&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/bundle/pom.xml (original)
+++ incubator/cxf/trunk/distribution/bundle/pom.xml Fri Dec 14 19:51:55 2007
@@ -268,9 +268,9 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>shade-maven-plugin</artifactId>
- <version>1.0-alpha-10</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.0-alpha-15</version>
<executions>
<execution>
<phase>package</phase>
@@ -280,26 +280,30 @@
<configuration>
<shadedGroupFilter>org.apache.cxf</shadedGroupFilter>
<shadedArtifactAttached>false</shadedArtifactAttached>
+ <createSourcesJar>true</createSourcesJar>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+
<transformers>
- <transformer implementation="org.codehaus.mojo.shade.resource.ApacheNoticeResourceTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<projectName>Apache CXF</projectName>
</transformer>
- <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.handlers</resource>
</transformer>
- <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/com.sun.tools.xjc.Plugin</resource>
</transformer>
- <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource>
</transformer>
- <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/cxf/cxf.extension</resource>
</transformer>
- <transformer implementation="org.codehaus.mojo.shade.resource.XmlAppendingTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
<resource>META-INF/extensions.xml</resource>
</transformer>
- <transformer implementation="org.codehaus.mojo.shade.resource.XmlAppendingTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
<resource>META-INF/bus-extensions.xml</resource>
</transformer>
<transformer implementation="org.apache.cxf.maven.PluginTransformer">
Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?rev=604387&r1=604386&r2=604387&view=diff
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Fri Dec 14 19:51:55 2007
@@ -253,7 +253,7 @@
<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-6</version>
+ <version>1.0-beta-2</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?rev=604387&r1=604386&r2=604387&view=diff
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Fri Dec 14 19:51:55 2007
@@ -330,7 +330,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<executions>
<execution>
<id>attach-sources</id>