cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r941821 - in /cxf/build-utils/trunk/buildtools: pom.xml src/main/java/org/apache/cxf/maven/CXFAllTransformer.java src/main/java/org/apache/cxf/maven/PluginTransformer.java
Date Thu, 06 May 2010 17:27:59 GMT
Author: dkulp
Date: Thu May  6 17:27:58 2010
New Revision: 941821

URL: http://svn.apache.org/viewvc?rev=941821&view=rev
Log:
Make compatible with latest shade plugins

Modified:
    cxf/build-utils/trunk/buildtools/pom.xml
    cxf/build-utils/trunk/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java
    cxf/build-utils/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java

Modified: cxf/build-utils/trunk/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/cxf/build-utils/trunk/buildtools/pom.xml?rev=941821&r1=941820&r2=941821&view=diff
==============================================================================
--- cxf/build-utils/trunk/buildtools/pom.xml (original)
+++ cxf/build-utils/trunk/buildtools/pom.xml Thu May  6 17:27:58 2010
@@ -68,7 +68,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/build-utils/trunk/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java
URL: http://svn.apache.org/viewvc/cxf/build-utils/trunk/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java?rev=941821&r1=941820&r2=941821&view=diff
==============================================================================
--- cxf/build-utils/trunk/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java
(original)
+++ cxf/build-utils/trunk/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java
Thu May  6 17:27:58 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/build-utils/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
URL: http://svn.apache.org/viewvc/cxf/build-utils/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java?rev=941821&r1=941820&r2=941821&view=diff
==============================================================================
--- cxf/build-utils/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
(original)
+++ cxf/build-utils/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
Thu May  6 17:27:58 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;
     }
+
 }



Mime
View raw message