You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/03/21 17:38:51 UTC
svn commit: r925820 - in /maven/plugins/trunk/maven-shade-plugin/src:
it/services-resource-transformer/ it/services-resource-transformer/repo/
it/services-resource-transformer/repo/org/
it/services-resource-transformer/repo/org/apache/ it/services-reso...
Author: bentmann
Date: Sun Mar 21 16:38:50 2010
New Revision: 925820
URL: http://svn.apache.org/viewvc?rev=925820&view=rev
Log:
[MSHADE-76] META-INF/services files not merged properly if some input files are missing a terminating newline
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/pom.xml (with props)
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/0.1/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/0.1/one-0.1.jar (with props)
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/0.1/one-0.1.pom
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/maven-metadata.xml (with props)
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/0.1/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/0.1/two-0.1.jar (with props)
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/0.1/two-0.1.pom
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/maven-metadata.xml (with props)
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/verify.bsh (with props)
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
Added: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/pom.xml?rev=925820&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/pom.xml (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/pom.xml Sun Mar 21 16:38:50 2010
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.srt</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>MSHADE-76</name>
+ <description>
+ Test the merging of META-INF/services/** entries.
+ </description>
+
+ <repositories>
+ <repository>
+ <id>shade-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.srt</groupId>
+ <artifactId>one</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.srt</groupId>
+ <artifactId>two</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>attach-shade</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <shadedArtifactAttached>false</shadedArtifactAttached>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/0.1/one-0.1.jar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/0.1/one-0.1.jar?rev=925820&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/0.1/one-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/0.1/one-0.1.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/0.1/one-0.1.pom?rev=925820&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/0.1/one-0.1.pom (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/0.1/one-0.1.pom Sun Mar 21 16:38:50 2010
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.srt</groupId>
+ <artifactId>one</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/maven-metadata.xml?rev=925820&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/maven-metadata.xml (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/maven-metadata.xml Sun Mar 21 16:38:50 2010
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.shade.srt</groupId>
+ <artifactId>one</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20100321160306</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/one/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/0.1/two-0.1.jar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/0.1/two-0.1.jar?rev=925820&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/0.1/two-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/0.1/two-0.1.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/0.1/two-0.1.pom?rev=925820&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/0.1/two-0.1.pom (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/0.1/two-0.1.pom Sun Mar 21 16:38:50 2010
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.srt</groupId>
+ <artifactId>two</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/maven-metadata.xml?rev=925820&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/maven-metadata.xml (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/maven-metadata.xml Sun Mar 21 16:38:50 2010
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.shade.srt</groupId>
+ <artifactId>two</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20100321160331</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/verify.bsh?rev=925820&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/verify.bsh (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/verify.bsh Sun Mar 21 16:38:50 2010
@@ -0,0 +1,14 @@
+import java.io.*;
+import java.util.jar.*;
+import org.codehaus.plexus.util.*;
+
+JarFile jarFile = new JarFile( new File( basedir, "target/test-1.0.jar" ) );
+JarEntry jarEntry = jarFile.getEntry( "META-INF/services/org.apache.maven.Shade" );
+String service = IOUtil.toString( jarFile.getInputStream( jarEntry ), "UTF-8" );
+jarFile.close();
+
+String[] providers = service.split( "(\r\n)|(\r)|(\n)" );
+if ( providers.length != 2 )
+{
+ throw new IllegalStateException( "Broken provider list: " + service );
+}
Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/verify.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java?rev=925820&r1=925819&r2=925820&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java Sun Mar 21 16:38:50 2010
@@ -44,9 +44,8 @@ import org.codehaus.plexus.util.IOUtil;
public class ServicesResourceTransformer
implements ResourceTransformer
{
- private static final String SERVICES_PATH = "META-INF/services";
- private ByteArrayOutputStream data;
+ private static final String SERVICES_PATH = "META-INF/services";
private Map serviceEntries = new HashMap();
@@ -54,14 +53,6 @@ public class ServicesResourceTransformer
{
if ( resource.startsWith( SERVICES_PATH ) )
{
- data = (ByteArrayOutputStream) serviceEntries.get( resource );
-
- if ( data == null )
- {
- data = new ByteArrayOutputStream();
- serviceEntries.put( resource, data );
- }
-
return true;
}
@@ -71,7 +62,14 @@ public class ServicesResourceTransformer
public void processResource( String resource, InputStream is, List relocators )
throws IOException
{
- IOUtil.copy( is, data );
+ ServiceStream out = (ServiceStream) serviceEntries.get( resource );
+ if ( out == null )
+ {
+ out = new ServiceStream();
+ serviceEntries.put( resource, out );
+ }
+
+ out.append( is );
is.close();
}
@@ -86,10 +84,38 @@ public class ServicesResourceTransformer
for ( Iterator i = serviceEntries.keySet().iterator(); i.hasNext(); )
{
String key = (String) i.next();
- ByteArrayOutputStream data = (ByteArrayOutputStream) serviceEntries.get( key );
+ ServiceStream data = (ServiceStream) serviceEntries.get( key );
jos.putNextEntry( new JarEntry( key ) );
- IOUtil.copy( new ByteArrayInputStream( data.toByteArray() ), jos );
+ IOUtil.copy( data.toInputStream(), jos );
data.reset();
}
}
+
+ static class ServiceStream
+ extends ByteArrayOutputStream
+ {
+
+ public ServiceStream()
+ {
+ super( 1024 );
+ }
+
+ public void append( InputStream is )
+ throws IOException
+ {
+ if ( count > 0 && buf[count - 1] != '\n' && buf[count - 1] != '\r' )
+ {
+ write( '\n' );
+ }
+
+ IOUtil.copy( is, this );
+ }
+
+ public InputStream toInputStream()
+ {
+ return new ByteArrayInputStream( buf, 0, count );
+ }
+
+ }
+
}