You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2006/08/11 17:29:19 UTC
svn commit: r430807 - in /maven/plugins/trunk/maven-assembly-plugin/src:
it/basic-features/outputFileNameMapping-withArtifactBaseVersion/
it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/
it/basic-features/outputFileNameMappin...
Author: jdcasey
Date: Fri Aug 11 08:29:18 2006
New Revision: 430807
URL: http://svn.apache.org/viewvc?rev=430807&view=rev
Log:
[MASSEMBLY-91][MASSEMBLY-67] Fixed by calling artifact.isSnapshot() during the output-filename-mapping formatter util, which is a bottleneck for all artifact handling in the assembly system. This accessor actually resets artifact.baseVersion (\!) which is a really bad practice that needs to be addressed.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.md5
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.sha1
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar.md5
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar.sha1
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom.md5
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom.sha1
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.md5
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.sha1
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/goals.txt?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/goals.txt Fri Aug 11 08:29:18 2006
@@ -0,0 +1 @@
+assembly:directory
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml Fri Aug 11 08:29:18 2006
@@ -0,0 +1,39 @@
+<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>test</groupId>
+ <artifactId>outputFileNameMapping-withArtifactBaseVersion</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <repositories>
+ <repository>
+ <id>test-snapshots</id>
+ <url>file://${basedir}/repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml Fri Aug 11 08:29:18 2006
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ <versioning>
+ <snapshot>
+ <timestamp>20060811.151624</timestamp>
+ <buildNumber>1</buildNumber>
+ </snapshot>
+ <lastUpdated>20060811151624</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.md5
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.md5?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.md5 (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.md5 Fri Aug 11 08:29:18 2006
@@ -0,0 +1 @@
+41c86c6138662f89b8f9020699fdf5b9
\ No newline at end of file
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.sha1
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.sha1?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.sha1 (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.sha1 Fri Aug 11 08:29:18 2006
@@ -0,0 +1 @@
+2175f9cd18cb2e36a20818279a148eba5ad6ccfd
\ No newline at end of file
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar?rev=430807&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar.md5
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar.md5?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar.md5 (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar.md5 Fri Aug 11 08:29:18 2006
@@ -0,0 +1 @@
+2f8c0492422c56246088a9bafa0d3b9d
\ No newline at end of file
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar.sha1
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar.sha1?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar.sha1 (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar.sha1 Fri Aug 11 08:29:18 2006
@@ -0,0 +1 @@
+7f159f90f4d04b235e75b08c64210047320ad6ac
\ No newline at end of file
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom Fri Aug 11 08:29:18 2006
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <parent>
+ <artifactId>plexus</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <version>1.0.8-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>plexus-utils</artifactId>
+ <name>Plexus Common Utilities</name>
+ <version>1.3-20060811.151624-1</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>true</childDelegation>
+ <excludes>
+ <exclude>org/codehaus/plexus/util/FileBasedTestCase.java</exclude>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>local-for-tests</id>
+ <url>file:///tmp/repository</url>
+ </snapshotRepository>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom.md5
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom.md5?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom.md5 (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom.md5 Fri Aug 11 08:29:18 2006
@@ -0,0 +1 @@
+8e1dcad95c72985495850994e458616e
\ No newline at end of file
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom.sha1
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom.sha1?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom.sha1 (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom.sha1 Fri Aug 11 08:29:18 2006
@@ -0,0 +1 @@
+fcf88e65a4ee99f978b2e7b419597afb2cf1cefd
\ No newline at end of file
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml Fri Aug 11 08:29:18 2006
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ <versioning>
+ <versions>
+ <version>1.3-SNAPSHOT</version>
+ </versions>
+ <lastUpdated>20060811151624</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.md5
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.md5?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.md5 (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.md5 Fri Aug 11 08:29:18 2006
@@ -0,0 +1 @@
+b6789e2ec12187a1b036652cf2f81511
\ No newline at end of file
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.sha1
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.sha1?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.sha1 (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.sha1 Fri Aug 11 08:29:18 2006
@@ -0,0 +1 @@
+d38f4bcd1f71a4a67d3dab0632905266cea942ab
\ No newline at end of file
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml Fri Aug 11 08:29:18 2006
@@ -0,0 +1,14 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <unpack>false</unpack>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifactId}-${baseVersion}.${extension}</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java Fri Aug 11 08:29:18 2006
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh?rev=430807&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh Fri Aug 11 08:29:18 2006
@@ -0,0 +1,17 @@
+import java.io.*;
+import java.net.*;
+import java.util.jar.*;
+
+boolean result = true;
+
+try
+{
+ result = new File( basedir, "target/outputFileNameMapping-withArtifactBaseVersion-1.0-SNAPSHOT-bin.dir/lib/plexus-utils-1.3-SNAPSHOT.jar" ).exists();
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java?rev=430807&r1=430806&r2=430807&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java Fri Aug 11 08:29:18 2006
@@ -112,6 +112,9 @@
throws AssemblyFormattingException
{
String value = expression;
+
+ // FIXME: This is BAD! Accessors SHOULD NOT change the behavior of the object.
+ artifact.isSnapshot();
// TODO: [jdcasey] What if they *want* to suppress the classifier?! This should be part of the expression, IMO
// insert the classifier if exist
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java?rev=430807&r1=430806&r2=430807&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java Fri Aug 11 08:29:18 2006
@@ -53,6 +53,7 @@
macTask.expectArtifactGetFile();
macTask.expectArtifactGetScope( Artifact.SCOPE_COMPILE );
macTask.expectGetClassifier( null );
+ macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
macTask.expectAddFile( "out/artifact", 8 );
@@ -146,6 +147,7 @@
macTask.expectArtifactGetFile();
macTask.expectArtifactGetScope( Artifact.SCOPE_COMPILE );
macTask.expectGetClassifier( null );
+ macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
if ( unpack )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=430807&r1=430806&r2=430807&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java Fri Aug 11 08:29:18 2006
@@ -78,6 +78,7 @@
macTask.expectGetProject( project );
macTask.expectGetReactorProjects( projects );
macTask.expectGetFinalName( "final-name" );
+ macTask.expectIsSnapshot( false );
macTask.expectGetClassifier( null );
macTask.expectGetArtifactHandler();
macTask.expectArtifactGetDependencyConflictId( "group:module:jar" );
@@ -160,6 +161,7 @@
macTask.expectArtifactGetFile( true );
macTask.expectGetFinalName( "final-name" );
+ macTask.expectIsSnapshot( false );
macTask.expectGetClassifier( null );
macTask.expectGetArtifactHandler();
macTask.expectAddFile( "out/artifact", Integer.parseInt( "777", 8 ) );
@@ -203,6 +205,7 @@
macTask.expectArtifactGetFile( true );
macTask.expectGetFinalName( "final-name" );
macTask.expectGetClassifier( null );
+ macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
macTask.expectAddFile( "out/artifact", Integer.parseInt( "777", 8 ) );
@@ -232,6 +235,7 @@
MockAndControlForArtifact macDepArtifact = new MockAndControlForArtifact( mm );
macDepArtifact.expectGetClassifier();
+ macDepArtifact.expectIsSnapshot( false );
macDepArtifact.expectGetArtifactHandler();
macDepArtifact.expectGetDependencyConflictId( "group", "dep", "jar" );
macDepArtifact.expectGetFile();
@@ -407,6 +411,7 @@
macTask.expectArtifactGetFile();
macTask.expectGetFinalName( "final-name" );
macTask.expectGetClassifier( null );
+ macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
macTask.expectAddFile( "out/artifact", Integer.parseInt( "777", 8 ) );
@@ -778,6 +783,12 @@
mm.add( control );
artifact = ( Artifact ) control.getMock();
+ }
+
+ public void expectIsSnapshot( boolean isSnapshot )
+ {
+ artifact.isSnapshot();
+ control.setReturnValue( isSnapshot, MockControl.ONE_OR_MORE );
}
void expectGetClassifier()
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java?rev=430807&r1=430806&r2=430807&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java Fri Aug 11 08:29:18 2006
@@ -38,6 +38,7 @@
String outputLocation = "artifact";
mac.expectAddFile( outputLocation );
+ mac.expectIsSnapshot( false );
mockManager.replayAll();
AddArtifactTask task = createTask( mac.artifact );
@@ -60,6 +61,7 @@
throws ArchiveCreationException, AssemblyFormattingException
{
mac.expectModeChange( -1, -1, -1, -1, 1 );
+ mac.expectIsSnapshot( false );
String outputLocation = "artifact/";
@@ -90,6 +92,7 @@
int fileMode = Integer.parseInt( "777", 8 );
mac.expectModeChange( -1, -1, directoryMode, fileMode, 2 );
+ mac.expectIsSnapshot( false );
String outputLocation = "artifact/";
@@ -119,6 +122,7 @@
throws ArchiveCreationException, AssemblyFormattingException
{
mac.expectModeChange( -1, -1, -1, -1, 1 );
+ mac.expectIsSnapshot( false );
String outputLocation = "artifact/";
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java?rev=430807&r1=430806&r2=430807&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java Fri Aug 11 08:29:18 2006
@@ -200,4 +200,10 @@
artifactCtl.setReturnValue( dependencyConflictId, MockControl.ONE_OR_MORE );
}
+ public void expectIsSnapshot( boolean isSnapshot )
+ {
+ artifact.isSnapshot();
+ artifactCtl.setReturnValue( isSnapshot, MockControl.ONE_OR_MORE );
+ }
+
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java?rev=430807&r1=430806&r2=430807&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java Fri Aug 11 08:29:18 2006
@@ -278,6 +278,9 @@
handlerControl.setReturnValue( extension, MockControl.ONE_OR_MORE );
}
+ artifact.isSnapshot();
+ artifactControl.setReturnValue( true, MockControl.ONE_OR_MORE );
+
// this one is always called.
artifact.getClassifier();
artifactControl.setReturnValue( classifier, MockControl.ONE_OR_MORE );