Author: brianf
Date: Mon Jan 28 13:23:38 2008
New Revision: 616046
URL: http://svn.apache.org/viewvc?rev=616046&view=rev
Log:
converted dependency:copy to dependency:copy-dependencies
Modified:
maven/archetype/trunk/archetype-common/pom.xml
maven/archetype/trunk/archetype-testing/pom.xml
Modified: maven/archetype/trunk/archetype-common/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=616046&r1=616045&r2=616046&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/pom.xml (original)
+++ maven/archetype/trunk/archetype-common/pom.xml Mon Jan 28 13:23:38 2008
@@ -140,6 +140,20 @@
<version>1.0-beta-2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>archetype-repository</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>archetype-proxy</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -230,30 +244,14 @@
<id>copy</id>
<phase>process-test-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>archetype-repository</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <overWrite>true</overWrite>
- <destFileName>archetype-repository.war</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>archetype-proxy</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <overWrite>true</overWrite>
- <destFileName>archetype-proxy.war</destFileName>
- </artifactItem>
- </artifactItems>
<outputDirectory>${project.build.directory}/wars</outputDirectory>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
+ <includeTypes>war</includeTypes>
+ <stripVersion>true</stripVersion>
</configuration>
</execution>
</executions>
Modified: maven/archetype/trunk/archetype-testing/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-testing/pom.xml?rev=616046&r1=616045&r2=616046&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-testing/pom.xml (original)
+++ maven/archetype/trunk/archetype-testing/pom.xml Mon Jan 28 13:23:38 2008
@@ -30,9 +30,8 @@
<version>2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-testing</artifactId>
- <version>2.0-SNAPSHOT</version>
+
<name>Maven Archetype Testing</name>
<packaging>pom</packaging>
