cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r1133558 - in /cocoon/cocoon3/trunk: ./ cocoon-archetype-block/src/main/resources/archetype-resources/ cocoon-archetype-parent/src/main/resources/archetype-resources/ cocoon-archetype-sample/ cocoon-archetype-sample/src/main/resources/arche...
Date Wed, 08 Jun 2011 21:09:46 GMT
Author: reinhard
Date: Wed Jun  8 21:09:46 2011
New Revision: 1133558

URL: http://svn.apache.org/viewvc?rev=1133558&view=rev
Log:
improve release instructions; fix assemblies: use the latest gmaven plugin, do not filter
cocoon-archetype-sample resources, use latest dependency versions

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/archetype-template.xml
    cocoon/cocoon3/trunk/cocoon-archetype-sample/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=1133558&r1=1133557&r2=1133558&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/RELEASE_HOWTO.txt (original)
+++ cocoon/cocoon3/trunk/RELEASE_HOWTO.txt Wed Jun  8 21:09:46 2011
@@ -1,11 +1,22 @@
 HOWTO RELEASE COCOON 3: Preparations
 ------------------------------------
 
+Note: The Cocoon release process still uploads the artifacts to people.apache.org:/x1/www/people.apache.org/builds/cocoon/
This should be changed to use the Apache Nexus installation
+
 * check your workstation's settings as described at http://cocoon.apache.org/1199_1_1.html
(step 1)
 
 * update src/main/changes/changes.xml and src/main/site/apt/download.apt in the 'cocoon-docs'
module
 * go to the 'cocoon-docs' module and run 'mvn site'
 * set all versions in the generated pom.xml files of all archetypes
+  . cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
+    sync with cocoon-samples/pom.xml
+    update to the to-be-released version of Cocoon
+  . cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
+    sync with parent/pom.xml
+    update to the to-be-released version of Cocoon
+  . cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml
+    update dependency versions (see parent/pom.xml)
+    update to the to-be-released version of Cocoon
  
 * mvn release:prepare release:perform -P archetypes
   (to be invoked from the root directory of Cocoon 3 trunk)
@@ -30,6 +41,7 @@ HOWTO RELEASE COCOON 3: After a successf
 * upload the Javadocs
 
 * send an announcement mail to announce@apache.org, users@cocoon.apache.org, dev@cocoon.apache.org
+  . make sure to always refer to 'Apache Cocoon' ('Cocoon' is not sufficient).
  
 HOWTO TEST A COCOON 3 RELEASE
 -----------------------------

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=1133558&r1=1133557&r2=1133558&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
Wed Jun  8 21:09:46 2011
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>org.apache.cocoon.servlet</groupId>
       <artifactId>cocoon-servlet</artifactId>
-      <version>3.0.0-alpha-2</version>
+      <version>3.0.0-alpha-3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon.stringtemplate</groupId>
       <artifactId>cocoon-stringtemplate</artifactId>
-      <version>3.0.0-alpha-2</version>      
+      <version>3.0.0-alpha-3-SNAPSHOT</version>      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -63,37 +63,32 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>2.5.6</version>
+      <version>3.0.5.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>2.5.6</version>
+      <version>3.0.5.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>2.5.6</version>
+      <version>3.0.5.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>2.5.6</version>
+      <version>3.0.5.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>2.5.6</version>
+      <version>3.0.5.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>2.5.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>2.5.6</version>
+      <version>3.0.5.RELEASE</version>
     </dependency>
     <dependency>
     <groupId>org.springframework</groupId>
@@ -116,7 +111,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
-      <version>4.4</version>      
+      <version>4.8.1</version>      
     </dependency>
   </dependencies>
   
@@ -124,12 +119,12 @@
     <plugins>
       <plugin>
         <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.5</version>        
+        <version>2.8</version>        
       </plugin>
       <plugin>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-maven-plugin</artifactId>
-        <version>1.0.0-M3</version>        
+        <version>1.0.0</version>        
         <configuration>
           <webappProfile>ssf</webappProfile>
           <customWebappDirectory>rcl-config</customWebappDirectory>
@@ -170,7 +165,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+              <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
             </manifestEntries>
           </archive>
         </configuration>

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=1133558&r1=1133557&r2=1133558&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
Wed Jun  8 21:09:46 2011
@@ -34,6 +34,10 @@
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <javac.src.version>1.5</javac.src.version>
+    <javac.target.version>1.5</javac.target.version>
   </properties>  
   
   <dependencyManagement>
@@ -42,6 +46,7 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-servlet-service-impl</artifactId>
+        <!-- After upgrading to 1.2.1 fix the TODO in ServiceServletMonitor -->
         <version>1.2.0</version>
       </dependency>
       <dependency>
@@ -58,16 +63,16 @@
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-block-deployment</artifactId>
         <version>1.1.0</version>
-      </dependency>  
+      </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-jnet</artifactId>
-        <version>1.1.0</version>
-      </dependency>     
+        <version>1.2.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-xml</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
         <exclusions>
           <exclusion>
             <groupId>xml-apis</groupId>
@@ -80,47 +85,42 @@
         <artifactId>cocoon-serializers-charsets</artifactId>
         <version>1.0.0</version>
       </dependency>
-      
+
       <!-- Spring (+ AOP support)-->
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.5.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.5.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.5.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context-support</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.5.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-dao</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.5.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aop</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.5.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>2.5.6</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.5.RELEASE</version>
       </dependency>
       <dependency>
       <groupId>org.springframework</groupId>
@@ -136,7 +136,7 @@
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjweaver</artifactId>
         <version>1.6.1</version>
-      </dependency> 
+      </dependency>
 
       <!-- Other libraries -->
       <dependency>
@@ -148,7 +148,12 @@
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-server</artifactId>
         <version>1.0.3</version>
-      </dependency>       
+      </dependency>
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <version>2.2</version>
+      </dependency>
       <dependency>
         <groupId>commons-betwixt</groupId>
         <artifactId>commons-betwixt</artifactId>
@@ -172,7 +177,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>1.4</version>
+        <version>2.0.1</version>
       </dependency>
       <dependency>
         <groupId>commons-jexl</groupId>
@@ -182,23 +187,23 @@
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
-        <version>2.4</version>
+        <version>2.6</version>
       </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
         <version>1.1.1</version>
-      </dependency> 
-      <dependency>
-        <groupId>jakarta-regexp</groupId>
-        <artifactId>jakarta-regexp</artifactId>
-        <version>1.4</version>
-      </dependency>      
+      </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
         <version>2.4</version>
-      </dependency>          
+      </dependency>
+      <dependency>
+        <groupId>javax.xml</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <version>2.1</version>
+      </dependency>
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
@@ -212,40 +217,44 @@
       <dependency>
         <groupId>net.sourceforge.nekohtml</groupId>
         <artifactId>nekohtml</artifactId>
-        <version>1.9.9</version>
+        <version>1.9.14</version>
       </dependency>
       <dependency>
         <groupId>org.antlr</groupId>
         <artifactId>stringtemplate</artifactId>
-        <version>3.0</version>
+        <version>3.2.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.solr</groupId>
         <artifactId>solr-core</artifactId>
-        <version>1.3.0</version>
+        <version>1.4.1</version>
         <exclusions>
           <exclusion>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-io</artifactId>
           </exclusion>
-        </exclusions>        
+          <exclusion>
+            <groupId>woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.solr</groupId>
         <artifactId>solr-solrj</artifactId>
-        <version>1.3.0</version>
+        <version>1.4.1</version>
         <exclusions>
           <exclusion>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-io</artifactId>
           </exclusion>
-        </exclusions>        
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>wstx-asl</artifactId>
         <version>3.2.9</version>
-      </dependency>      
+      </dependency>
       <dependency>
         <groupId>org.apache.wicket</groupId>
         <artifactId>wicket</artifactId>
@@ -261,95 +270,105 @@
             <artifactId>spring</artifactId>
           </exclusion>
         </exclusions>
-      </dependency>          
+      </dependency>
       <dependency>
         <groupId>org.apache.xmlgraphics</groupId>
         <artifactId>fop</artifactId>
-        <version>0.95</version>
+        <version>1.0</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
         <version>1.4.2</version>
-      </dependency>      
+      </dependency>
+      <dependency>
+        <groupId>xalan</groupId>
+        <artifactId>xalan</artifactId>
+        <version>2.7.1</version>
+      </dependency>
+      <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>2.9.1</version>
+      </dependency>
       <dependency>
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
         <version>1.3.02</version>
-      </dependency>      
+      </dependency>
 
       <!-- Cocoon internal dependencies -->
       <dependency>
         <groupId>org.apache.cocoon.controller</groupId>
         <artifactId>cocoon-controller</artifactId>
-        <version>3.0.0-alpha-2</version>
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.optional</groupId>
         <artifactId>cocoon-optional</artifactId>
-        <version>3.0.0-alpha-2</version>
-      </dependency>      
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.cocoon.monitoring</groupId>
         <artifactId>cocoon-monitoring</artifactId>
-        <version>3.0.0-alpha-2</version>
-      </dependency>      
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.cocoon.pipeline</groupId>
         <artifactId>cocoon-pipeline</artifactId>
-        <version>3.0.0-alpha-2</version>
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.rest</groupId>
         <artifactId>cocoon-rest</artifactId>
-        <version>3.0.0-alpha-2</version>
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.sample</groupId>
         <artifactId>cocoon-sample</artifactId>
-        <version>3.0.0-alpha-2</version>
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.sax</groupId>
         <artifactId>cocoon-sax</artifactId>
-        <version>3.0.0-alpha-2</version>
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.servlet</groupId>
         <artifactId>cocoon-servlet</artifactId>
-        <version>3.0.0-alpha-2</version>
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.sitemap</groupId>
         <artifactId>cocoon-sitemap</artifactId>
-        <version>3.0.0-alpha-2</version>
-      </dependency>      
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.cocoon.stax</groupId>
         <artifactId>cocoon-stax</artifactId>
-        <version>3.0.0-alpha-2</version>
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.profiling</groupId>
         <artifactId>cocoon-profiling</artifactId>
-        <version>3.0.0-alpha-2</version>
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.stringtemplate</groupId>
         <artifactId>cocoon-stringtemplate</artifactId>
-        <version>3.0.0-alpha-2</version>
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.wicket</groupId>
         <artifactId>cocoon-wicket</artifactId>
-        <version>3.0.0-alpha-2</version>
-      </dependency>      
+        <version>3.0.0-alpha-3-SNAPSHOT</version>
+      </dependency>
 
       <!-- Test dependencies -->
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.4</version>
+        <version>4.8.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -378,20 +397,32 @@
         <artifactId>xmlunit</artifactId>
         <scope>test</scope>
         <version>1.3</version>
-      </dependency>      
+      </dependency>
+      <dependency>
+        <groupId>org.apache.bcel</groupId>
+        <artifactId>bcel</artifactId>
+        <version>5.2</version>
+        <scope>test</scope>
+      </dependency>
+      <!-- required by solr -->
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-nop</artifactId>
+        <version>1.5.5</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   
   <build>
-    <plugins>
+  <plugins>
       <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.0-alpha-3</version>
         <executions>
           <execution>
             <id>enforce-maven</id>
             <goals>
-              <goal>enforce-once</goal>
+              <goal>enforce</goal>
             </goals>
             <configuration>
               <rules>
@@ -402,174 +433,138 @@
             </configuration>
           </execution>
         </executions>
-      </plugin> 
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>${javac.src.version}</source>
+          <target>${javac.target.version}</target>
+          <encoding>${project.build.sourceEncoding}</encoding>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rat-maven-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>bin/**</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>buildnumber-maven-plugin</artifactId>
+        <configuration>
+          <doCheck>false</doCheck>
+          <doUpdate>false</doUpdate>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+            <manifestEntries>
+              <Implementation-Build>na</Implementation-Build>
+              <X-Compile-Source-JDK>${javac.src.version}</X-Compile-Source-JDK>
+              <X-Compile-Target-JDK>${javac.target.version}</X-Compile-Target-JDK>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>versions-maven-plugin</artifactId>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
         <plugin>
           <groupId>org.apache.cocoon</groupId>
-          <artifactId>cocoon-maven-plugin</artifactId>
-          <version>1.0.0-M3</version>
-        </plugin>    
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>        
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.0</version>
+          <artifactId>cocoon-it-fw</artifactId>
+          <version>1.0.0-M1</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>        
-          <artifactId>maven-eclipse-plugin</artifactId>
-          <version>2.5</version>        
-        </plugin>    
+          <groupId>org.apache.cocoon</groupId>
+          <artifactId>cocoon-maven-plugin</artifactId>
+          <version>1.0.0</version>
+        </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>        
           <artifactId>maven-war-plugin</artifactId>
-          <version>2.0.2</version>
-        </plugin>            
+          <version>2.1-alpha-2</version>
+        </plugin>
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>maven-jetty-plugin</artifactId>
-          <version>6.1.7</version>
-        </plugin>   
-        <!-- set versions of common plugins for reproducibility, ordered alphabetically
-->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-5</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.0.2</version>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-            <encoding>${project.build.sourceEncoding}</encoding>
-          </configuration>
+          <version>6.1.26</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.5</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-docck-plugin</artifactId>
-          <version>1.0</version>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.0</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>buildnumber-maven-plugin</artifactId>
           <version>1.0-beta-1</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-gpg-plugin</artifactId>
-          <version>1.0-alpha-4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-invoker-plugin</artifactId>
-          <version>1.5</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.3</version>
-          <configuration>
-            <archive>
-              <manifest>
-                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              </manifest>
-            </archive>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <!-- NOTE: 2.6.x is generally unusuable due to MJAVADOC-275 -->
-          <version>2.5</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-plugin-plugin</artifactId>
-          <version>2.5.1</version>
-        </plugin>
-        <!-- START SNIPPET: release-plugin-configuration -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.0-beta-9</version>
-          <configuration>
-            <useReleaseProfile>false</useReleaseProfile>
-            <goals>deploy</goals>
-            <arguments>-Papache-release</arguments>
-          </configuration>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>1.4.3</version>
         </plugin>
-        <!-- END SNIPPET: release-plugin-configuration -->
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-remote-resources-plugin</artifactId>
-          <version>1.1</version>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>rat-maven-plugin</artifactId>
+          <version>1.0-alpha-3</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.4</version>
-          <configuration>
-            <encoding>${project.build.sourceEncoding}</encoding>
-          </configuration>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>versions-maven-plugin</artifactId>
+          <version>1.0</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-scm-plugin</artifactId>
-          <version>1.2</version>
+          <groupId>org.codehaus.gmaven</groupId>
+          <artifactId>gmaven-plugin</artifactId>
+          <version>1.3</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>2.0.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.1.1</version>
+          <version>2.0-beta-5</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.4.3</version>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>javacc-maven-plugin</artifactId>
+          <version>2.6</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
-          <artifactId>clirr-maven-plugin</artifactId>
-          <version>2.2.2</version>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.3</version>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-maven-plugin</artifactId>
-          <version>1.3.8</version>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.1</version>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.modello</groupId>
-          <artifactId>modello-maven-plugin</artifactId>
-          <version>1.1</version>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>javacc-maven-plugin</artifactId>
+          <version>2.6</version>
         </plugin>
       </plugins>
     </pluginManagement>

Modified: cocoon/cocoon3/trunk/cocoon-archetype-sample/archetype-template.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-sample/archetype-template.xml?rev=1133558&r1=1133557&r2=1133558&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-sample/archetype-template.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-sample/archetype-template.xml Wed Jun  8 21:09:46
2011
@@ -20,6 +20,6 @@
 <archetype>
   <id>cocoon-sample</id>
   <resources><% resources.each { %>
-    <resource>$it</resource><% } %>
+    <resource filtered="false">$it</resource><% } %>
   </resources>
-</archetype>
\ No newline at end of file
+</archetype>

Modified: cocoon/cocoon3/trunk/cocoon-archetype-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-sample/pom.xml?rev=1133558&r1=1133557&r2=1133558&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-sample/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-sample/pom.xml Wed Jun  8 21:09:46 2011
@@ -38,4 +38,24 @@
   <properties>
     <cocoon.sample.dir>../cocoon-sample</cocoon.sample.dir>
   </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.gmaven</groupId>
+        <artifactId>gmaven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <source>${pom.basedir}/sync.groovy</source>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>          
+    </plugins>
+  </build>
 </project>

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=1133558&r1=1133557&r2=1133558&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
Wed Jun  8 21:09:46 2011
@@ -34,27 +34,27 @@
     <dependency>
       <groupId>org.apache.cocoon.rest</groupId>
       <artifactId>cocoon-rest</artifactId>
-      <version>3.0.0-alpha-2</version>
+      <version>3.0.0-alpha-3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon.stringtemplate</groupId>
       <artifactId>cocoon-stringtemplate</artifactId>
-      <version>3.0.0-alpha-2</version>      
+      <version>3.0.0-alpha-3-SNAPSHOT</version>      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon.wicket</groupId>
       <artifactId>cocoon-wicket</artifactId>
-      <version>3.0.0-alpha-2</version>      
+      <version>3.0.0-alpha-3-SNAPSHOT</version>      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon.profiling</groupId>
       <artifactId>cocoon-profiling</artifactId>
-      <version>3.0.0-alpha-2</version>
+      <version>3.0.0-alpha-3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon.monitoring</groupId>
       <artifactId>cocoon-monitoring</artifactId>
-      <version>3.0.0-alpha-2</version>      
+      <version>3.0.0-alpha-3-SNAPSHOT</version>      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -65,14 +65,19 @@
 
     <!-- Optional libraries -->    
     <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.1</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.cocoon.optional</groupId>
       <artifactId>cocoon-optional</artifactId>
-      <version>3.0.0-alpha-2</version>
+      <version>3.0.0-alpha-3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>fop</artifactId>
-      <version>0.95</version>      
+      <version>1.0</version>      
     </dependency>      
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -108,7 +113,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>4.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -117,7 +122,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.5</version>
+        <version>2.8</version>
         <configuration>
           <useProjectReferences>false</useProjectReferences>
         </configuration>

Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1133558&r1=1133557&r2=1133558&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Wed Jun  8 21:09:46 2011
@@ -688,9 +688,9 @@
           <version>1.0</version>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.groovy.maven</groupId>
+          <groupId>org.codehaus.gmaven</groupId>
           <artifactId>gmaven-plugin</artifactId>
-          <version>1.0-rc-3</version>
+          <version>1.3</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>



Mime
View raw message