cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r699422 - in /cocoon/cocoon3/trunk: ./ cocoon-archetype-block/src/main/resources/archetype-resources/ cocoon-archetype-parent/src/main/resources/archetype-resources/ cocoon-archetype-sample/src/main/resources/archetype-resources/ parent/
Date Fri, 26 Sep 2008 17:24:37 GMT
Author: reinhard
Date: Fri Sep 26 10:24:36 2008
New Revision: 699422

URL: http://svn.apache.org/viewvc?rev=699422&view=rev
Log:
back in development mode:
 . rename pom.xml in root directory to release.pom.xml
 . set version numbers in archetypes to SNAPSHOTS
improve test instructions

Added:
    cocoon/cocoon3/trunk/release.pom.xml
      - copied unchanged from r699375, cocoon/cocoon3/trunk/pom.xml
Removed:
    cocoon/cocoon3/trunk/pom.xml
Modified:
    cocoon/cocoon3/trunk/RELEASE_HOWTO.txt
    cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml
    cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
    cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
    cocoon/cocoon3/trunk/parent/pom.xml

Modified: cocoon/cocoon3/trunk/RELEASE_HOWTO.txt
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/RELEASE_HOWTO.txt?rev=699422&r1=699421&r2=699422&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/RELEASE_HOWTO.txt (original)
+++ cocoon/cocoon3/trunk/RELEASE_HOWTO.txt Fri Sep 26 10:24:36 2008
@@ -18,17 +18,6 @@
 -----------------------------
 * use the new artifacts in projects that depend on previous or SNAPSHOT versions. Add the
Cocoon staging repository to your ~/.m2/settings.xml
 
-* run all archetypes:
-mvn archetype:create -DarchetypeGroupId=org.apache.cocoon.archetype-sample -DarchetypeArtifactId=cocoon-archetype-sample
-DarchetypeVersion=3.0.0 -DgroupId=com.mycompany -DartifactId=mysample
-
-mvn archetype:create -DarchetypeGroupId=org.apache.cocoon.archetype-block -DarchetypeArtifactId=cocoon-archetype-block
-DarchetypeVersion=3.0.0 -DgroupId=com.mycompany -DartifactId=mysite
-
-mvn archetype:create -DarchetypeGroupId=org.apache.cocoon.archetype-parent -DarchetypeArtifactId=cocoon-archetype-parent
-DarchetypeVersion=3.0.0 -DgroupId=com.mycompany -DartifactId=myparent
-
-mvn archetype:create -DarchetypeGroupId=org.apache.cocoon.archetype-webapp -DarchetypeArtifactId=cocoon-archetype-webapp
-DarchetypeVersion=3.0.0 -DgroupId=com.mycompany -DartifactId=mywebapp
-
-* check GPG, MD5 and SHA1 files
-
 <?xml version="1.0" encoding="UTF-8"?>
 <settings 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/xsd/settings-1.0.0.xsd">
   <profiles>
@@ -51,4 +40,15 @@
     </profile>
 </settings>
 
-and use it: e.g. mvn install -P cocoon-staging
\ No newline at end of file
+and use it: e.g. mvn install -P cocoon-staging
+
+* use all archetypes:
+mvn org.apache.maven.plugins:maven-archetype-plugin:1.0-alpha-7 -DarchetypeGroupId=org.apache.cocoon.archetype-sample
-DarchetypeArtifactId=cocoon-archetype-sample -DarchetypeVersion=3.0.0-alpha-1 -DgroupId=com.mycompany
-DartifactId=mysample -DremoteRepositories=http://people.apache.org/builds/cocoon/ 
+
+mvn org.apache.maven.plugins:maven-archetype-plugin:1.0-alpha-7 -DarchetypeGroupId=org.apache.cocoon.archetype-block
-DarchetypeArtifactId=cocoon-archetype-block -DarchetypeVersion=3.0.0-alpha-1 -DgroupId=com.mycompany
-DartifactId=mysite -DremoteRepositories=http://people.apache.org/builds/cocoon/ 
+
+mvn org.apache.maven.plugins:maven-archetype-plugin:1.0-alpha-7 -DarchetypeGroupId=org.apache.cocoon.archetype-parent
-DarchetypeArtifactId=cocoon-archetype-parent -DarchetypeVersion=3.0.0-alpha-1 -DgroupId=com.mycompany
-DartifactId=myparent -DremoteRepositories=http://people.apache.org/builds/cocoon/ 
+
+mvn org.apache.maven.plugins:maven-archetype-plugin:1.0-alpha-7 -DarchetypeGroupId=org.apache.cocoon.archetype-webapp
-DarchetypeArtifactId=cocoon-archetype-webapp -DarchetypeVersion=3.0.0-alpha-1 -DgroupId=com.mycompany
-DartifactId=mywebapp -DremoteRepositories=http://people.apache.org/builds/cocoon/ 
+
+* check GPG, MD5 and SHA1 files
\ No newline at end of file

Modified: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml?rev=699422&r1=699421&r2=699422&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml
Fri Sep 26 10:24:36 2008
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>org.apache.cocoon.servlet</groupId>
       <artifactId>cocoon-servlet</artifactId>
-      <version>3.0.0-alpha-1</version>
+      <version>3.0.0-alpha-2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon.stringtemplate</groupId>
       <artifactId>cocoon-stringtemplate</artifactId>
-      <version>3.0.0-alpha-1</version>      
+      <version>3.0.0-alpha-2-SNAPSHOT</version>      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml?rev=699422&r1=699421&r2=699422&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
Fri Sep 26 10:24:36 2008
@@ -37,27 +37,27 @@
       <dependency>
         <groupId>org.apache.cocoon.pipeline</groupId>
         <artifactId>cocoon-pipeline</artifactId>
-        <version>3.0.0-alpha-1</version>
+        <version>3.0.0-alpha-2-SNAPSHOT</version>
       </dependency>  
       <dependency>
         <groupId>org.apache.cocoon.sitemap</groupId>
         <artifactId>cocoon-sitemap</artifactId>
-        <version>3.0.0-alpha-1</version>
+        <version>3.0.0-alpha-2-SNAPSHOT</version>
       </dependency>      
       <dependency>
         <groupId>org.apache.cocoon.servlet</groupId>
         <artifactId>cocoon-servlet</artifactId>
-        <version>3.0.0-alpha-1</version>
+        <version>3.0.0-alpha-2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.stringtemplate</groupId>
         <artifactId>cocoon-stringtemplate</artifactId>
-        <version>3.0.0-alpha-1</version>      
+        <version>3.0.0-alpha-2-SNAPSHOT</version>      
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.rest</groupId>
         <artifactId>cocoon-rest</artifactId>
-        <version>3.0.0-alpha-1</version>
+        <version>3.0.0-alpha-2-SNAPSHOT</version>
       </dependency>    
       <dependency>
         <groupId>javax.servlet</groupId>

Modified: cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml?rev=699422&r1=699421&r2=699422&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
Fri Sep 26 10:24:36 2008
@@ -33,12 +33,12 @@
     <dependency>
       <groupId>org.apache.cocoon.rest</groupId>
       <artifactId>cocoon-rest</artifactId>
-      <version>3.0.0-alpha-1</version>
+      <version>3.0.0-alpha-2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon.stringtemplate</groupId>
       <artifactId>cocoon-stringtemplate</artifactId>
-      <version>3.0.0-alpha-1</version>      
+      <version>3.0.0-alpha-2-SNAPSHOT</version>      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=699422&r1=699421&r2=699422&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Fri Sep 26 10:24:36 2008
@@ -35,7 +35,7 @@
   <description>Cocoon 3 Parent POM module contains all basic configurations for the
Maven 2 based build system.</description>
   <inceptionYear>2008</inceptionYear>
 
-  <!-- modules>  
+  <modules>  
     <module>../cocoon-controller</module>        
     <module>../cocoon-pipeline</module>
     <module>../cocoon-rest</module>
@@ -43,7 +43,7 @@
     <module>../cocoon-servlet</module>    
     <module>../cocoon-sitemap</module>
     <module>../cocoon-stringtemplate</module>    
-  </modules-->  
+  </modules>  
 
   <developers>
     <developer>



Mime
View raw message