Author: bentmann
Date: Thu Jan 8 14:21:26 2009
New Revision: 732849
URL: http://svn.apache.org/viewvc?rev=732849&view=rev
Log:
[MSHADE-30] duplicate entry error
o Added ITs to prove this fixed in the various scenarios
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/pom.xml
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/0.1/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/0.1/a-0.1.jar
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/0.1/a-0.1.pom
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/maven-metadata.xml
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/b-0.1.jar
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/b-0.1.pom
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/maven-metadata.xml
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/pom.xml
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/0.1/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/0.1/a-0.1.jar
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/0.1/a-0.1.pom
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/maven-metadata.xml
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/0.1/
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/0.1/b-0.1.jar
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/0.1/b-0.1.pom
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/maven-metadata.xml
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/invoker.properties
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/pom.xml
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/java/
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/java/org/
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/java/org/MyInterface.java
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/resources/
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/resources/some-ordinary-resource.txt
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/invoker.properties
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/pom.xml
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/java/
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/java/org/
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/java/org/MyInterface.java
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/resources/
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/resources/some-ordinary-resource.txt
(with props)
Modified:
maven/plugins/trunk/maven-shade-plugin/pom.xml
Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=732849&r1=732848&r2=732849&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Thu Jan 8 14:21:26 2009
@@ -148,6 +148,7 @@
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
<goals>
+ <goal>clean</goal>
<goal>install</goal>
</goals>
</configuration>
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/pom.xml?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/pom.xml
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/pom.xml
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,113 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.dcwr</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>MSHADE-30</name>
+ <description>
+ Test that duplicate classes/resources on the class path are gracefully
handled.
+ </description>
+
+ <!--
+ These dependencies contain the same class/resource. In reality, this might
happen for API JARs that have been
+ packaged by different providers and hence have different group identifiers.
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.dcwr</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.dcwr</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>shade-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>shade</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <!-- NOTE: This test checks the code path using class relocation
-->
+ <relocations>
+ <relocation>
+ <pattern>org.apache</pattern>
+ <shadedPattern>hidden</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/0.1/a-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/0.1/a-0.1.jar?rev=732849&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/0.1/a-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/0.1/a-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/0.1/a-0.1.pom?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/0.1/a-0.1.pom
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/0.1/a-0.1.pom
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,29 @@
+<?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.dcwr</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+</project>
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/maven-metadata.xml?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/maven-metadata.xml
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/maven-metadata.xml
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.shade.dcwr</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090108191842</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/b-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/b-0.1.jar?rev=732849&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/b-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/b-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/b-0.1.pom?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/b-0.1.pom
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/0.1/b-0.1.pom
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,29 @@
+<?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.dcwr</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+</project>
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/maven-metadata.xml?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/maven-metadata.xml
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/maven-metadata.xml
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.shade.dcwr</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090108191825</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/pom.xml?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/pom.xml
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/pom.xml
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,107 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.dcwor</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>MSHADE-30</name>
+ <description>
+ Test that duplicate classes/resources on the class path are gracefully
handled.
+ </description>
+
+ <!--
+ These dependencies contain the same class/resource. In reality, this might
happen for API JARs that have been
+ packaged by different providers and hence have different group identifiers.
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.dcwor</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.dcwor</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>shade-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>shade</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <!-- NOTE: This test checks the code path not using class
relocation -->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/0.1/a-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/0.1/a-0.1.jar?rev=732849&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/0.1/a-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/0.1/a-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/0.1/a-0.1.pom?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/0.1/a-0.1.pom
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/0.1/a-0.1.pom
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,29 @@
+<?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.dcwor</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+</project>
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/maven-metadata.xml?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/maven-metadata.xml
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/maven-metadata.xml
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.shade.dcwor</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090108191842</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/0.1/b-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/0.1/b-0.1.jar?rev=732849&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/0.1/b-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/0.1/b-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/0.1/b-0.1.pom?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/0.1/b-0.1.pom
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/0.1/b-0.1.pom
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,29 @@
+<?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.dcwor</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+</project>
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/maven-metadata.xml?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/maven-metadata.xml
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/maven-metadata.xml
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.shade.dcwor</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090108191825</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/invoker.properties?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/invoker.properties
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/invoker.properties
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,2 @@
+# NOTE: It's the essential part of the test to re-run the package phase
+invoker.goals = clean package package
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/pom.xml?rev=732849&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/pom.xml
(added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/pom.xml Thu
Jan 8 14:21:26 2009
@@ -0,0 +1,109 @@
+<?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.rrwr</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>MSHADE-30</name>
+ <description>
+ Test that re-running the package phase without any code changes in between
doesn't cause shading to crash. The
+ potential issue was that the first run produced the shaded artifact and
that this artifact survived unchanged
+ until shading got executed the second time, thereby re-shading all classes
that were included during the first
+ run.
+ </description>
+
+ <!-- NOTE: The test requires a dependency to include during shading, doesn't
matter what classes though -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <staleMillis>5000</staleMillis>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <!-- NOTE: This test requires MJAR-7 which in turn requires this
config to actually work. -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>shade</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <!-- NOTE: This test checks the code path using relocation -->
+ <relocations>
+ <relocation>
+ <pattern>org.apache</pattern>
+ <shadedPattern>hidden</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/java/org/MyInterface.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/java/org/MyInterface.java?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/java/org/MyInterface.java
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/java/org/MyInterface.java
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,8 @@
+package org;
+
+/*
+ * NOTE: The project's main artifact must not be empty!
+ */
+public interface MyInterface
+{
+}
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/java/org/MyInterface.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/java/org/MyInterface.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/resources/some-ordinary-resource.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/resources/some-ordinary-resource.txt?rev=732849&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/resources/some-ordinary-resource.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-with-reloc/src/main/resources/some-ordinary-resource.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/invoker.properties?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/invoker.properties
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/invoker.properties
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,2 @@
+# NOTE: It's the essential part of the test to re-run the package phase
+invoker.goals = clean package package
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/pom.xml?rev=732849&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/pom.xml
(added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/pom.xml
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,103 @@
+<?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.rrwor</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>MSHADE-30</name>
+ <description>
+ Test that re-running the package phase without any code changes in between
doesn't cause shading to crash. The
+ potential issue was that the first run produced the shaded artifact and
that this artifact survived unchanged
+ until shading got executed the second time, thereby re-shading all classes
that were included during the first
+ run.
+ </description>
+
+ <!-- NOTE: The test requires a dependency to include during shading, doesn't
matter what classes though -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <staleMillis>5000</staleMillis>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <!-- NOTE: This test requires MJAR-7 which in turn requires this
config to actually work. -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>shade</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <!-- NOTE: This test checks the code path not using relocation
-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/java/org/MyInterface.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/java/org/MyInterface.java?rev=732849&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/java/org/MyInterface.java
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/java/org/MyInterface.java
Thu Jan 8 14:21:26 2009
@@ -0,0 +1,8 @@
+package org;
+
+/*
+ * NOTE: The project's main artifact must not be empty!
+ */
+public interface MyInterface
+{
+}
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/java/org/MyInterface.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/java/org/MyInterface.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/resources/some-ordinary-resource.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/resources/some-ordinary-resource.txt?rev=732849&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/resources/some-ordinary-resource.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/rerun-without-reloc/src/main/resources/some-ordinary-resource.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
