You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2008/01/31 00:16:25 UTC
svn commit: r616945 - in /maven/plugins/trunk/maven-war-plugin: ./
src/main/java/org/apache/maven/plugin/war/
src/main/java/org/apache/maven/plugin/war/util/
src/test/java/org/apache/maven/plugin/war/
src/test/java/org/apache/maven/plugin/war/util/
Author: olamy
Date: Wed Jan 30 15:16:23 2008
New Revision: 616945
URL: http://svn.apache.org/viewvc?rev=616945&view=rev
Log:
[MWAR-116] The outputFileNameMapping config creates bad dependency files in WEB-INF/lib
NOTE : the expression has been changed to @{ }@
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=616945&r1=616944&r2=616945&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Jan 30 15:16:23 2008
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.7</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
@@ -87,7 +87,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
@@ -101,7 +101,7 @@
<id>integration-tests</id>
<activation>
<property>
- <name>maven.test.skip</name>
+ <name>skipTests</name>
<value>!true</value>
</property>
</activation>
@@ -162,4 +162,17 @@
</build>
</profile>
</profiles>
+ <!-- TODO remove when plexus-utils is released -->
+ <repositories>
+ <repository>
+ <id>codehaus.snapshots</id>
+ <url>http://snapshots.repository.codehaus.org</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=616945&r1=616944&r2=616945&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Wed Jan 30 15:16:23 2008
@@ -186,9 +186,9 @@
private static final String META_INF = "META-INF";
public static final String DEFAULT_FILE_NAME_MAPPING_CLASSIFIER =
- "${artifactId}-${version}-${classifier}.${extension}";
+ "@{artifactId}@-@{version}@-@{classifier}@.@{extension}@";
- public static final String DEFAULT_FILE_NAME_MAPPING = "${artifactId}-${version}.${extension}";
+ public static final String DEFAULT_FILE_NAME_MAPPING = "@{artifactId}@-@{version}@.@{extension}@";
/**
* The comma separated list of tokens to include when copying content
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java?rev=616945&r1=616944&r2=616945&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java Wed Jan 30 15:16:23 2008
@@ -34,8 +34,8 @@
* The expression might use any fied of the {@link Artifact} interface. Some
* examples might be:
* <ul>
- * <li>${artifactId}-${version}.${extension}</li>
- * <li>${artifactId}.${extension}</li>
+ * <li>@{artifactId}@-@{version}@.@{extension}@</li>
+ * <li>@{artifactId}@.@{extension}@</li>
* </ul>
*
* @author Stephane Nicoll
@@ -58,8 +58,7 @@
// FIXME: This is BAD! Accessors SHOULD NOT change the behavior of the object.
artifact.isSnapshot();
- RegexBasedInterpolator interpolator = new RegexBasedInterpolator();
-
+ RegexBasedInterpolator interpolator = new RegexBasedInterpolator("\\@\\{(", ")?([^}]+)\\}@");
interpolator.addValueSource( new ObjectBasedValueSource( artifact ) );
interpolator.addValueSource( new ObjectBasedValueSource( artifact.getArtifactHandler() ) );
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java?rev=616945&r1=616944&r2=616945&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java Wed Jan 30 15:16:23 2008
@@ -1038,7 +1038,7 @@
// configure mojo
project.addArtifact( jarArtifact );
- mojo.setOutputFileNameMapping( "${artifactId}.${extension}" );
+ mojo.setOutputFileNameMapping( "@{artifactId}@.@{extension}@" );
this.configureMojo( mojo, new LinkedList(), classesDir, webAppSource, webAppDirectory, project );
mojo.execute();
@@ -1082,7 +1082,7 @@
ejbArtifactDup.setGroupId( "org.dup.ejb" );
project.addArtifact( ejbArtifact );
project.addArtifact( ejbArtifactDup );
- mojo.setOutputFileNameMapping( "${artifactId}.${extension}" );
+ mojo.setOutputFileNameMapping( "@{artifactId}@.@{extension}@" );
this.configureMojo( mojo, new LinkedList(), classesDir, webAppSource, webAppDirectory, project );
mojo.execute();
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java?rev=616945&r1=616944&r2=616945&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java Wed Jan 30 15:16:23 2008
@@ -40,7 +40,7 @@
jar.setArtifactId( "maven-test-lib" );
jar.setVersion( "1.0" );
assertEquals( "maven-test-lib-1.0.jar",
- MappingUtils.evaluateFileNameMapping( "${artifactId}-${version}.${extension}", jar ) );
+ MappingUtils.evaluateFileNameMapping( "@{artifactId}@-@{version}@.@{extension}@", jar ) );
}
@@ -51,7 +51,7 @@
jar.setGroupId( "org.apache.sample" );
jar.setArtifactId( "maven-test-lib" );
jar.setVersion( "1.0" );
- assertEquals( "maven-test-lib.jar", MappingUtils.evaluateFileNameMapping( "${artifactId}.${extension}", jar ) );
+ assertEquals( "maven-test-lib.jar", MappingUtils.evaluateFileNameMapping( "@{artifactId}@.@{extension}@", jar ) );
}
@@ -63,7 +63,7 @@
jar.setArtifactId( "maven-test-lib" );
jar.setVersion( "1.0" );
assertEquals( "org.apache.sample-maven-test-lib-1.0.jar",
- MappingUtils.evaluateFileNameMapping( "${groupId}-${artifactId}-${version}.${extension}", jar ) );
+ MappingUtils.evaluateFileNameMapping( "@{groupId}@-@{artifactId}@-@{version}@.@{extension}@", jar ) );
}