Remove Cargo config from the webapp, see archiva-webapp-test.

Introduce a profile for the webapp tests, and fix version numbers.

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@544022 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-web/archiva-webapp-test/pom.xml b/archiva-web/archiva-webapp-test/pom.xml
index 3fe98209d2d843a3c5fdb4ea8b0cdce8f16172ad..0a4d9cd1fe59a886f3224622f6a1a0eaf0fadba6 100644 (file)
--- a/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-web/archiva-webapp-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.0-alpha-1-SNAPSHOT</version>
+    <version>1.0-alpha-2-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp-test</artifactId>
   <packaging>pom</packaging>
@@ -42,6 +42,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-web-ui-tests</artifactId>
+      <version>1.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/archiva-web/archiva-webapp/pom.xml b/archiva-web/archiva-webapp/pom.xml
index 8dd6b7c6c33f064d9e1d26dbdb048b0f798165f1..e13fd8d5996cac7e43600ba82e76b2335a960486 100644 (file)
--- a/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-web/archiva-webapp/pom.xml
@@ -397,26 +397,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-          <!-- TODO:  configure data sources -->
-          <groupId>org.codehaus.cargo</groupId>
-          <artifactId>cargo-maven2-plugin</artifactId>
-          <version>0.3.1</version>
-          <configuration>
-              <container>
-                  <containerId>tomcat5x</containerId>
-                  <home>${cargo.tomcat5x.home}</home>
-                  <log>${project.build.directory}/tomcat5x.log</log>
-                  <output>${project.build.directory}/tomcat5x.out</output>
-              </container>
-              <configuration>
-                  <home>${project.build.directory}/tomcat5x</home>
-                  <properties>
-                      <cargo.jvmargs> -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n </cargo.jvmargs>
-                  </properties>
-              </configuration>
-          </configuration>
-      </plugin>
     </plugins>
   </build>
   <profiles>

diff --git a/archiva-web/pom.xml b/archiva-web/pom.xml
index 8a3df30520b6adb315d7ce24dd9d7dacd0d3ef19..75286d18447953817a69f3402b49ccbc61478413 100644 (file)
--- a/archiva-web/pom.xml
+++ b/archiva-web/pom.xml
@@ -34,4 +34,13 @@
     <module>archiva-webapp</module>
     <module>archiva-standalone</module>
   </modules>
+
+  <profiles>
+    <profile>
+      <id>webapp-test</id>
+      <modules>
+        <module>archiva-webapp-test</module>        
+      </modules>
+    </profile>
+  </profiles>
 </project>