archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aherit...@apache.org
Subject svn commit: r685944 - in /archiva: sandbox/archiva-artifact-downloader-cli/ sandbox/archiva-build-resources/ sandbox/archiva-consumer-plugin-archetype/ sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/ sandbox/archiva-co...
Date Thu, 14 Aug 2008 15:35:38 GMT
Author: aheritier
Date: Thu Aug 14 08:35:35 2008
New Revision: 685944

URL: http://svn.apache.org/viewvc?rev=685944&view=rev
Log:
use everywhere a groupId with maven and a version 1.2-SNAPSHOT. Fix webapp ui tests build
(but tests weren't maintained :-( )

Modified:
    archiva/sandbox/archiva-artifact-downloader-cli/pom.xml
    archiva/sandbox/archiva-build-resources/pom.xml
    archiva/sandbox/archiva-consumer-plugin-archetype/pom.xml
    archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/pom.xml
    archiva/sandbox/archiva-consumer-plugin/pom.xml
    archiva/sandbox/archiva-jarinfo/archiva-jarinfo-bundles/pom.xml
    archiva/sandbox/archiva-jarinfo/archiva-jarinfo-cli/pom.xml
    archiva/sandbox/archiva-jarinfo/archiva-jarinfo-lib/pom.xml
    archiva/sandbox/archiva-jarinfo/pom.xml
    archiva/sandbox/archiva-repository-assembler/pom.xml
    archiva/sandbox/commons-transfer/commons-transfer-api/pom.xml
    archiva/sandbox/commons-transfer/commons-transfer-file/pom.xml
    archiva/sandbox/commons-transfer/commons-transfer-http/pom.xml
    archiva/sandbox/commons-transfer/commons-transfer-interactive/pom.xml
    archiva/sandbox/commons-transfer/pom.xml
    archiva/tools/trunk/maven-archivadev-plugin/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/   (props changed)
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/dependency-in-proxied/pom.xml

Modified: archiva/sandbox/archiva-artifact-downloader-cli/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/archiva-artifact-downloader-cli/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/archiva-artifact-downloader-cli/pom.xml (original)
+++ archiva/sandbox/archiva-artifact-downloader-cli/pom.xml Thu Aug 14 08:35:35 2008
@@ -25,7 +25,7 @@
 
   <groupId>org.apache.archiva</groupId>
   <artifactId>archiva-artifact-downloader-cli</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.2-SNAPSHOT</version>
   <name>Archiva Artifact Downloader Client</name>
   <packaging>jar</packaging>
 
@@ -87,12 +87,12 @@
     <dependency>
       <groupId>org.apache.archiva.commons.transfer</groupId>
       <artifactId>commons-transfer-http</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva.commons.transfer</groupId>
       <artifactId>commons-transfer-file</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: archiva/sandbox/archiva-build-resources/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/archiva-build-resources/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/archiva-build-resources/pom.xml (original)
+++ archiva/sandbox/archiva-build-resources/pom.xml Thu Aug 14 08:35:35 2008
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-parent</artifactId>
-    <version>3-SNAPSHOT</version>
+    <version>4-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.archiva</groupId>

Modified: archiva/sandbox/archiva-consumer-plugin-archetype/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/archiva-consumer-plugin-archetype/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/archiva-consumer-plugin-archetype/pom.xml (original)
+++ archiva/sandbox/archiva-consumer-plugin-archetype/pom.xml Thu Aug 14 08:35:35 2008
@@ -1,9 +1,9 @@
 <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>org.apache.maven.archiva</groupId>
+  <groupId>org.apache.archiva</groupId>
   <artifactId>archiva-consumer-plugin-archetype</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.2-SNAPSHOT</version>
   <name>Archiva Consumers :: Consumers Plugin Archetype</name>
   <description>Simple archetype to create archiva consumers</description>
 </project>

Modified: archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++ archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/pom.xml
Thu Aug 14 08:35:35 2008
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Simple Archiva Consumer</name>
   <url>http://maven.apache.org</url>
@@ -14,24 +14,24 @@
   </description>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-consumer-api</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-indexer</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>

Modified: archiva/sandbox/archiva-consumer-plugin/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/archiva-consumer-plugin/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/archiva-consumer-plugin/pom.xml (original)
+++ archiva/sandbox/archiva-consumer-plugin/pom.xml Thu Aug 14 08:35:35 2008
@@ -1,9 +1,9 @@
 <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>org.apache.maven.archiva</groupId>
+  <groupId>org.apache.archiva</groupId>
   <artifactId>archiva-consumer-plugin</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>archiva-consumer-plugin</name>
   <url>http://maven.apache.org</url>
@@ -12,24 +12,24 @@
   </description>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-consumer-api</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-indexer</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
   </dependencies>     
   <build>

Modified: archiva/sandbox/archiva-jarinfo/archiva-jarinfo-bundles/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/archiva-jarinfo/archiva-jarinfo-bundles/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/archiva-jarinfo/archiva-jarinfo-bundles/pom.xml (original)
+++ archiva/sandbox/archiva-jarinfo/archiva-jarinfo-bundles/pom.xml Thu Aug 14 08:35:35 2008
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>archiva-jarinfo-parent</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-jarinfo-bundles</artifactId>
@@ -11,7 +11,7 @@
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-jarinfo-lib</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: archiva/sandbox/archiva-jarinfo/archiva-jarinfo-cli/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/archiva-jarinfo/archiva-jarinfo-cli/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/archiva-jarinfo/archiva-jarinfo-cli/pom.xml (original)
+++ archiva/sandbox/archiva-jarinfo/archiva-jarinfo-cli/pom.xml Thu Aug 14 08:35:35 2008
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>archiva-jarinfo-parent</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-jarinfo-cli</artifactId>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-jarinfo-lib</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>

Modified: archiva/sandbox/archiva-jarinfo/archiva-jarinfo-lib/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/archiva-jarinfo/archiva-jarinfo-lib/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/archiva-jarinfo/archiva-jarinfo-lib/pom.xml (original)
+++ archiva/sandbox/archiva-jarinfo/archiva-jarinfo-lib/pom.xml Thu Aug 14 08:35:35 2008
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-jarinfo-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-jarinfo-lib</artifactId>

Modified: archiva/sandbox/archiva-jarinfo/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/archiva-jarinfo/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/archiva-jarinfo/pom.xml (original)
+++ archiva/sandbox/archiva-jarinfo/pom.xml Thu Aug 14 08:35:35 2008
@@ -19,7 +19,7 @@
   <groupId>org.apache.archiva</groupId>
   <artifactId>archiva-jarinfo-parent</artifactId>
   <name>Archiva Jar Info :: Parent</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.2-SNAPSHOT</version>
 
   <packaging>pom</packaging>
 

Modified: archiva/sandbox/archiva-repository-assembler/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/archiva-repository-assembler/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/archiva-repository-assembler/pom.xml (original)
+++ archiva/sandbox/archiva-repository-assembler/pom.xml Thu Aug 14 08:35:35 2008
@@ -18,9 +18,9 @@
 
 <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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-repository-assembler</artifactId>
@@ -51,14 +51,16 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact-manager</artifactId>
     </dependency>
+    <!--
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
+    -->
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>

Modified: archiva/sandbox/commons-transfer/commons-transfer-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/commons-transfer/commons-transfer-api/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/commons-transfer/commons-transfer-api/pom.xml (original)
+++ archiva/sandbox/commons-transfer/commons-transfer-api/pom.xml Thu Aug 14 08:35:35 2008
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>commons-transfer-parent</artifactId>
     <groupId>org.apache.archiva.commons.transfer</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>commons-transfer-api</artifactId>

Modified: archiva/sandbox/commons-transfer/commons-transfer-file/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/commons-transfer/commons-transfer-file/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/commons-transfer/commons-transfer-file/pom.xml (original)
+++ archiva/sandbox/commons-transfer/commons-transfer-file/pom.xml Thu Aug 14 08:35:35 2008
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>commons-transfer-parent</artifactId>
     <groupId>org.apache.archiva.commons.transfer</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>commons-transfer-file</artifactId>
@@ -12,7 +12,7 @@
     <dependency>
       <groupId>org.apache.archiva.commons.transfer</groupId>
       <artifactId>commons-transfer-api</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

Modified: archiva/sandbox/commons-transfer/commons-transfer-http/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/commons-transfer/commons-transfer-http/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/commons-transfer/commons-transfer-http/pom.xml (original)
+++ archiva/sandbox/commons-transfer/commons-transfer-http/pom.xml Thu Aug 14 08:35:35 2008
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>commons-transfer-parent</artifactId>
     <groupId>org.apache.archiva.commons.transfer</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>commons-transfer-http</artifactId>
@@ -12,7 +12,7 @@
     <dependency>
       <groupId>org.apache.archiva.commons.transfer</groupId>
       <artifactId>commons-transfer-api</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.apache.archiva.commons.transfer</groupId>
       <artifactId>commons-transfer-interactive</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: archiva/sandbox/commons-transfer/commons-transfer-interactive/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/commons-transfer/commons-transfer-interactive/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/commons-transfer/commons-transfer-interactive/pom.xml (original)
+++ archiva/sandbox/commons-transfer/commons-transfer-interactive/pom.xml Thu Aug 14 08:35:35
2008
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>commons-transfer-parent</artifactId>
     <groupId>org.apache.archiva.commons.transfer</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>commons-transfer-interactive</artifactId>
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.apache.archiva.commons.transfer</groupId>
       <artifactId>commons-transfer-api</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

Modified: archiva/sandbox/commons-transfer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/commons-transfer/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/sandbox/commons-transfer/pom.xml (original)
+++ archiva/sandbox/commons-transfer/pom.xml Thu Aug 14 08:35:35 2008
@@ -3,7 +3,7 @@
   <groupId>org.apache.archiva.commons.transfer</groupId>
   <artifactId>commons-transfer-parent</artifactId>
   <name>Commons Transfer :: Parent</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <build>
     <plugins>

Modified: archiva/tools/trunk/maven-archivadev-plugin/pom.xml
URL: http://svn.apache.org/viewvc/archiva/tools/trunk/maven-archivadev-plugin/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/tools/trunk/maven-archivadev-plugin/pom.xml (original)
+++ archiva/tools/trunk/maven-archivadev-plugin/pom.xml Thu Aug 14 08:35:35 2008
@@ -15,7 +15,7 @@
 
   <artifactId>maven-archivadev-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.2-SNAPSHOT</version>
 
   <name>Archiva Dev Maven Plugin</name>
 
@@ -36,9 +36,9 @@
   <dependencies>
     <!-- maven plugin deps -->
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-common</artifactId>
-      <version>1.0-beta-2</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 14 08:35:35 2008
@@ -7,3 +7,4 @@
 bin
 .classpath
 .project
+database

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml Thu Aug 14 08:35:35
2008
@@ -17,14 +17,13 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-
 <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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.0-alpha-3-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp-test</artifactId>
   <packaging>pom</packaging>
@@ -33,6 +32,13 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-command-line</artifactId>
+      <version>1.0-alpha-2</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>plexus-container-default</artifactId>
+          <groupId>org.codehaus.plexus</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
@@ -49,6 +55,10 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-slf4j-logging</artifactId>
+    </dependency>
     
     <!-- Dependency for MavenConnectionTest -->
     <dependency>
@@ -74,7 +84,6 @@
       <artifactId>activation</artifactId>
     </dependency>
   </dependencies>
-
   <build>
     <testSourceDirectory>src/test/it</testSourceDirectory>
     <plugins>
@@ -107,6 +116,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
+              <includeGroupIds>org.apache.derby,javax.mail,javax.activation</includeGroupIds>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
               <excludeTransitive>false</excludeTransitive>
@@ -152,12 +162,12 @@
             <configuration>
               <tasks>
                 <copy todir="${project.build.directory}/${container.name}conf">
-                  <fileset dir="src/test/${container.name}"/>
+                  <fileset dir="src/test/${container.name}" />
                 </copy>
                 <copy
-                    todir="${project.build.directory}/installs/${container.name}/apache-tomcat-5.5.20/apache-tomcat-5.5.20/common/lib">
+                  todir="${project.build.directory}/installs/${container.name}/apache-tomcat-5.5.26/apache-tomcat-5.5.26/common/lib">
                   <fileset dir="${project.build.directory}/providedDependencies">
-                    <include name="**/*.jar"/>
+                    <include name="**/*.jar" />
                   </fileset>
                 </copy>
               </tasks>
@@ -171,8 +181,8 @@
             <phase>integration-test</phase>
             <configuration>
               <tasks>
-                <get src="http://localhost:9696/archiva/" dest="${project.build.directory}/index.html"/>
-                <delete file="${project.build.directory}/index.html"/>
+                <get src="http://localhost:9696/archiva/" dest="${project.build.directory}/index.html"
/>
+                <delete file="${project.build.directory}/index.html" />
               </tasks>
             </configuration>
             <goals>
@@ -241,6 +251,7 @@
             <timeout>600000</timeout>
             <systemProperties>
               <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+              <appserver.home>${project.build.directory}/appserver-base</appserver.home>
             </systemProperties>
           </container>
           <configuration>
@@ -274,7 +285,6 @@
       </plugin>
     </plugins>
   </build>
-
   <profiles>
     <profile>
       <id>tomcat5x</id>
@@ -283,10 +293,9 @@
       </activation>
       <properties>
         <container.name>tomcat5x</container.name>
-        <container.url>http://apache.multidist.com/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.zip</container.url>
+        <container.url>http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.26/bin/apache-tomcat-5.5.26.zip</container.url>
       </properties>
     </profile>
-
     <profile>
       <id>firefox</id>
       <activation>
@@ -309,5 +318,4 @@
       </properties>
     </profile>
   </profiles>
-
-</project>
+</project>
\ No newline at end of file

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml
Thu Aug 14 08:35:35 2008
@@ -21,21 +21,21 @@
 <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>org.apache.maven.archiva</groupId>
+  <groupId>org.apache.archiva</groupId>
   <artifactId>bad-dependency</artifactId>
   <version>1.0</version>
   <packaging>jar</packaging>
   <name>Bad Dependency</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva.web.test</groupId>
+      <groupId>org.apache.archiva.web.test</groupId>
       <artifactId>bad-dependency</artifactId>
       <version>1.0</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva.web.test</groupId>
+      <groupId>org.apache.archiva.web.test</groupId>
       <artifactId>foo-bar</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/dependency-in-proxied/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/dependency-in-proxied/pom.xml?rev=685944&r1=685943&r2=685944&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/dependency-in-proxied/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/dependency-in-proxied/pom.xml
Thu Aug 14 08:35:35 2008
@@ -21,7 +21,7 @@
 <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>org.apache.maven.archiva</groupId>
+  <groupId>org.apache.archiva</groupId>
   <artifactId>dependency-in-proxied</artifactId>
   <version>1.0</version>
   <packaging>jar</packaging>



Mime
View raw message