Author: chathuri
Date: Wed Dec 18 20:13:11 2013
New Revision: 1552078
URL: http://svn.apache.org/r1552078
Log:
removing duplicate mvn plugin
Modified:
airavata/trunk/modules/integration-tests/pom.xml
Modified: airavata/trunk/modules/integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/pom.xml?rev=1552078&r1=1552077&r2=1552078&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/pom.xml (original)
+++ airavata/trunk/modules/integration-tests/pom.xml Wed Dec 18 20:13:11 2013
@@ -26,10 +26,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.6</version>
+ <version>2.8</version>
<executions>
<execution>
- <id>unpack-artifacts</id>
+ <id>unpack-dependencies</id>
<phase>compile</phase>
<goals>
<goal>unpack</goal>
@@ -37,24 +37,16 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat</artifactId>
- <version>${tomcat.version}</version>
+ <groupId>org.apache.airavata</groupId>
+
<artifactId>apache-airavata-samples</artifactId>
<type>zip</type>
+
<outputDirectory>${project.build.directory}/samples</outputDirectory>
</artifactItem>
</artifactItems>
-
<outputDirectory>${tomcat.extract.dir}</outputDirectory>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- <executions>
<execution>
- <id>unpack-dependencies</id>
+ <id>unpack</id>
<phase>compile</phase>
<goals>
<goal>unpack</goal>
@@ -63,15 +55,18 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.airavata</groupId>
-
<artifactId>apache-airavata-samples</artifactId>
+
<artifactId>apache-airavata-server</artifactId>
+ <version>${project.version}</version>
<type>zip</type>
-
<outputDirectory>${project.build.directory}/samples</outputDirectory>
+ <classifier>war</classifier>
</artifactItem>
</artifactItems>
+ <includes>**/*.war</includes>
+
<outputDirectory>${tomcat.work.dir}/webapps/</outputDirectory>
</configuration>
</execution>
<execution>
- <id>unpack</id>
+ <id>unpack-artifacts</id>
<phase>compile</phase>
<goals>
<goal>unpack</goal>
@@ -79,15 +74,13 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.airavata</groupId>
-
<artifactId>apache-airavata-server</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
<type>zip</type>
- <classifier>war</classifier>
</artifactItem>
</artifactItems>
- <includes>**/*.war</includes>
-
<outputDirectory>${tomcat.work.dir}/webapps/</outputDirectory>
+
<outputDirectory>${tomcat.extract.dir}</outputDirectory>
</configuration>
</execution>
</executions>
