maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r390959 - in /maven/archetype/trunk: ./ maven-archetype-core/ maven-archetype-core/src/test/java/org/apache/maven/archetype/ maven-archetype-creator/ maven-archetype-model/ maven-archetype-plugin/ maven-archetypes/ maven-archetypes/maven-ar...
Date Mon, 03 Apr 2006 05:49:07 GMT
Author: brett
Date: Sun Apr  2 22:49:05 2006
New Revision: 390959

URL: http://svn.apache.org/viewcvs?rev=390959&view=rev
Log:
put versions back to 1.0-alpha-4-SNAPSHOT - can't go backwards to 0.7 as it will confuse the
dependency resolution

Modified:
    maven/archetype/trunk/maven-archetype-core/pom.xml
    maven/archetype/trunk/maven-archetype-core/src/test/java/org/apache/maven/archetype/ArchetypeTest.java
    maven/archetype/trunk/maven-archetype-creator/pom.xml
    maven/archetype/trunk/maven-archetype-model/pom.xml
    maven/archetype/trunk/maven-archetype-plugin/pom.xml
    maven/archetype/trunk/maven-archetypes/maven-archetype-archetype/pom.xml
    maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee/pom.xml
    maven/archetype/trunk/maven-archetypes/maven-archetype-mojo/pom.xml
    maven/archetype/trunk/maven-archetypes/maven-archetype-portlet/pom.xml
    maven/archetype/trunk/maven-archetypes/maven-archetype-profiles/pom.xml
    maven/archetype/trunk/maven-archetypes/maven-archetype-quickstart/pom.xml
    maven/archetype/trunk/maven-archetypes/maven-archetype-simple/   (props changed)
    maven/archetype/trunk/maven-archetypes/maven-archetype-simple/pom.xml
    maven/archetype/trunk/maven-archetypes/maven-archetype-site-simple/pom.xml
    maven/archetype/trunk/maven-archetypes/maven-archetype-site/pom.xml
    maven/archetype/trunk/maven-archetypes/maven-archetype-webapp/pom.xml
    maven/archetype/trunk/maven-archetypes/pom.xml
    maven/archetype/trunk/pom.xml

Modified: maven/archetype/trunk/maven-archetype-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetype-core/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-core/pom.xml (original)
+++ maven/archetype/trunk/maven-archetype-core/pom.xml Sun Apr  2 22:49:05 2006
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.apache.maven.archetype</groupId>
     <artifactId>maven-archetype</artifactId>
-    <version>0.7-SNAPSHOT</version>
+    <version>1.0-alpha-4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.archetype</groupId>

Modified: maven/archetype/trunk/maven-archetype-core/src/test/java/org/apache/maven/archetype/ArchetypeTest.java
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetype-core/src/test/java/org/apache/maven/archetype/ArchetypeTest.java?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-core/src/test/java/org/apache/maven/archetype/ArchetypeTest.java
(original)
+++ maven/archetype/trunk/maven-archetype-core/src/test/java/org/apache/maven/archetype/ArchetypeTest.java
Sun Apr  2 22:49:05 2006
@@ -20,6 +20,7 @@
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -37,6 +38,8 @@
     public void testArchetype()
         throws Exception
     {
+        FileUtils.deleteDirectory( getTestFile( "target/quickstart" ) );
+
         Archetype archetype = (Archetype) lookup( Archetype.ROLE );
 
         Map parameters = new HashMap();

Modified: maven/archetype/trunk/maven-archetype-creator/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetype-creator/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-creator/pom.xml (original)
+++ maven/archetype/trunk/maven-archetype-creator/pom.xml Sun Apr  2 22:49:05 2006
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.apache.maven.archetype</groupId>
     <artifactId>maven-archetype</artifactId>    
-    <version>0.7-SNAPSHOT</version>
+    <version>1.0-alpha-4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-creator</artifactId>

Modified: maven/archetype/trunk/maven-archetype-model/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetype-model/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-model/pom.xml (original)
+++ maven/archetype/trunk/maven-archetype-model/pom.xml Sun Apr  2 22:49:05 2006
@@ -2,7 +2,7 @@
   <parent> 
     <groupId>org.apache.maven.archetype</groupId> 
     <artifactId>maven-archetype</artifactId>
-    <version>0.7-SNAPSHOT</version>
+    <version>1.0-alpha-4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-model</artifactId>

Modified: maven/archetype/trunk/maven-archetype-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetype-plugin/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-plugin/pom.xml (original)
+++ maven/archetype/trunk/maven-archetype-plugin/pom.xml Sun Apr  2 22:49:05 2006
@@ -1,15 +1,14 @@
 <project>
   <parent>
-    <artifactId>maven-plugins</artifactId>
-    <groupId>org.apache.maven.plugins</groupId>
-    <version>1</version>
+    <artifactId>maven-archetype</artifactId>
+    <groupId>org.apache.maven.archetype</groupId>
+    <version>1.0-alpha-4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins</groupId>
   <artifactId>maven-archetype-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Archetype Plugin</name>
-  <version>0.7-SNAPSHOT</version>
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/archetype/trunk/maven-archetype-plugin/</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/archetype/trunk/maven-archetype-plugin/</developerConnection>
@@ -34,12 +33,10 @@
     <dependency>
       <groupId>org.apache.maven.archetype</groupId>
       <artifactId>maven-archetype-core</artifactId>
-      <version>0.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.archetype</groupId>
       <artifactId>maven-archetype-creator</artifactId>
-      <version>0.7-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

Modified: maven/archetype/trunk/maven-archetypes/maven-archetype-archetype/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetypes/maven-archetype-archetype/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetypes/maven-archetype-archetype/pom.xml (original)
+++ maven/archetype/trunk/maven-archetypes/maven-archetype-archetype/pom.xml Sun Apr  2 22:49:05
2006
@@ -6,6 +6,5 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-archetype</artifactId>
-  <version>1.0-alpha-4-SNAPSHOT</version>
   <name>Maven Archetype Archetype</name>
 </project>

Modified: maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee/pom.xml (original)
+++ maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee/pom.xml Sun Apr  2 22:49:05
2006
@@ -6,6 +6,5 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-j2ee</artifactId>
-  <version>1.0-alpha-4-SNAPSHOT</version>
   <name>Maven Archetype J2EE</name>
 </project>

Modified: maven/archetype/trunk/maven-archetypes/maven-archetype-mojo/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetypes/maven-archetype-mojo/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetypes/maven-archetype-mojo/pom.xml (original)
+++ maven/archetype/trunk/maven-archetypes/maven-archetype-mojo/pom.xml Sun Apr  2 22:49:05
2006
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>maven-archetypes</artifactId>
     <groupId>org.apache.maven.archetypes</groupId>
-    <version>1.0-alpha-3</version>
+    <version>1.0-alpha-4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-mojo</artifactId>
   <version>1.0-alpha-5-SNAPSHOT</version>
   <name>Maven Archetype MOJO</name>
-</project>
\ No newline at end of file
+</project>

Modified: maven/archetype/trunk/maven-archetypes/maven-archetype-portlet/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetypes/maven-archetype-portlet/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetypes/maven-archetype-portlet/pom.xml (original)
+++ maven/archetype/trunk/maven-archetypes/maven-archetype-portlet/pom.xml Sun Apr  2 22:49:05
2006
@@ -6,6 +6,5 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-portlet</artifactId>
-  <version>1.0-SNAPSHOT</version>
   <name>Maven Archetype Portlet</name>
 </project>

Modified: maven/archetype/trunk/maven-archetypes/maven-archetype-profiles/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetypes/maven-archetype-profiles/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetypes/maven-archetype-profiles/pom.xml (original)
+++ maven/archetype/trunk/maven-archetypes/maven-archetype-profiles/pom.xml Sun Apr  2 22:49:05
2006
@@ -6,6 +6,5 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-profiles</artifactId>
-  <version>1.0-alpha-4-SNAPSHOT</version>
   <name>Maven Archetype Profiles</name>
 </project>

Modified: maven/archetype/trunk/maven-archetypes/maven-archetype-quickstart/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetypes/maven-archetype-quickstart/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetypes/maven-archetype-quickstart/pom.xml (original)
+++ maven/archetype/trunk/maven-archetypes/maven-archetype-quickstart/pom.xml Sun Apr  2 22:49:05
2006
@@ -6,6 +6,5 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-quickstart</artifactId>
-  <version>1.0-alpha-4-SNAPSHOT</version>
   <name>Maven Archetype Quickstart</name>
-</project>
\ No newline at end of file
+</project>

Propchange: maven/archetype/trunk/maven-archetypes/maven-archetype-simple/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Apr  2 22:49:05 2006
@@ -0,0 +1 @@
+target

Modified: maven/archetype/trunk/maven-archetypes/maven-archetype-simple/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetypes/maven-archetype-simple/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetypes/maven-archetype-simple/pom.xml (original)
+++ maven/archetype/trunk/maven-archetypes/maven-archetype-simple/pom.xml Sun Apr  2 22:49:05
2006
@@ -6,6 +6,12 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-simple</artifactId>
-  <version>1.0-alpha-4-SNAPSHOT</version>
   <name>Maven Archetype Simple</name>
-</project>
\ No newline at end of file
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+    </dependency>
+  </dependencies>
+</project>

Modified: maven/archetype/trunk/maven-archetypes/maven-archetype-site-simple/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetypes/maven-archetype-site-simple/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetypes/maven-archetype-site-simple/pom.xml (original)
+++ maven/archetype/trunk/maven-archetypes/maven-archetype-site-simple/pom.xml Sun Apr  2
22:49:05 2006
@@ -2,9 +2,10 @@
   <parent>
     <artifactId>maven-archetypes</artifactId>
     <groupId>org.apache.maven.archetypes</groupId>
-    <version>1.0-alpha-3</version>
+    <version>1.0-alpha-4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-site-simple</artifactId>
   <version>1.0-SNAPSHOT</version>
+  <name>Maven Archetype for Simple Site</name>
 </project>

Modified: maven/archetype/trunk/maven-archetypes/maven-archetype-site/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetypes/maven-archetype-site/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetypes/maven-archetype-site/pom.xml (original)
+++ maven/archetype/trunk/maven-archetypes/maven-archetype-site/pom.xml Sun Apr  2 22:49:05
2006
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>maven-archetypes</artifactId>
     <groupId>org.apache.maven.archetypes</groupId>
-    <version>1.0-alpha-3</version>
+    <version>1.0-alpha-4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-site</artifactId>
   <version>1.0-alpha-5-SNAPSHOT</version>
   <name>Maven Archetype Site</name>
-</project>
\ No newline at end of file
+</project>

Modified: maven/archetype/trunk/maven-archetypes/maven-archetype-webapp/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetypes/maven-archetype-webapp/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetypes/maven-archetype-webapp/pom.xml (original)
+++ maven/archetype/trunk/maven-archetypes/maven-archetype-webapp/pom.xml Sun Apr  2 22:49:05
2006
@@ -6,6 +6,5 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-webapp</artifactId>
-  <version>1.0-alpha-4-SNAPSHOT</version>
   <name>Maven Archetype Webapp</name>
-</project>
\ No newline at end of file
+</project>

Modified: maven/archetype/trunk/maven-archetypes/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetypes/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetypes/pom.xml (original)
+++ maven/archetype/trunk/maven-archetypes/pom.xml Sun Apr  2 22:49:05 2006
@@ -2,18 +2,24 @@
   <parent>
     <artifactId>maven-archetype</artifactId>
     <groupId>org.apache.maven.archetype</groupId>
-    <version>0.7-SNAPSHOT</version>
+    <version>1.0-alpha-4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.archetypes</groupId>
   <artifactId>maven-archetypes</artifactId>
   <packaging>pom</packaging>
-  <version>1.0-alpha-4-SNAPSHOT</version>
   <name>Maven Archetypes</name>
   <modules>
-    <module>maven-archetype-mojo</module>
+    <!-- Left out for 1.0-alpha-4 ONLY as they aren't being rereleased to allow versions
to sync
+    <module>maven-archetype-mojo</module> 
+    <module>maven-archetype-site</module> -->
     <module>maven-archetype-quickstart</module>
+    <module>maven-archetype-simple</module>
+    <module>maven-archetype-site-simple</module>
     <module>maven-archetype-webapp</module>
     <module>maven-archetype-archetype</module>
+    <module>maven-archetype-j2ee</module>
+    <module>maven-archetype-portlet</module>
+    <module>maven-archetype-profiles</module>
   </modules>
 </project>

Modified: maven/archetype/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/pom.xml?rev=390959&r1=390958&r2=390959&view=diff
==============================================================================
--- maven/archetype/trunk/pom.xml (original)
+++ maven/archetype/trunk/pom.xml Sun Apr  2 22:49:05 2006
@@ -9,7 +9,7 @@
   <groupId>org.apache.maven.archetype</groupId>
   <artifactId>maven-archetype</artifactId>
   <packaging>pom</packaging>
-  <version>0.7-SNAPSHOT</version>
+  <version>1.0-alpha-4-SNAPSHOT</version>
   <name>Maven Archetype</name>
   <dependencyManagement>
     <dependencies>
@@ -21,6 +21,11 @@
       <dependency>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>maven-archetype-core</artifactId>
+        <version>${project.version}</version>      
+      </dependency>      
+      <dependency>
+        <groupId>org.apache.maven.archetype</groupId>
+        <artifactId>maven-archetype-creator</artifactId>
         <version>${project.version}</version>      
       </dependency>      
     </dependencies>



Mime
View raw message