cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r895095 - 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/archetype...
Date Fri, 01 Jan 2010 23:59:43 GMT
Author: reinhard
Date: Fri Jan  1 23:59:43 2010
New Revision: 895095

URL: http://svn.apache.org/viewvc?rev=895095&view=rev
Log:
fix archetypes for the release

Modified:
    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/cocoon-archetype-sample/sync.groovy
    cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/pom.xml

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=895095&r1=895094&r2=895095&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 Jan  1 23:59:43 2010
@@ -58,6 +58,59 @@
       <scope>runtime</scope>
       <version>1.2.14</version>
     </dependency>
+    
+    <!-- Spring (+ AOP support)-->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>2.5.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>2.5.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>2.5.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>2.5.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>2.5.6</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>
+    </dependency>
+    <dependency>
+    <groupId>org.springframework</groupId>
+      <artifactId>spring-jmx</artifactId>
+      <version>2.0.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjweaver</artifactId>
+      <version>1.6.1</version>
+    </dependency>     
+    
     <!--  Test dependencies -->
     <dependency>
       <groupId>junit</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=895095&r1=895094&r2=895095&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 Jan  1 23:59:43 2010
@@ -32,97 +32,332 @@
     <module></module>
   </modules>  
   
-  <dependencyManagement>  
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>  
+  
+  <dependencyManagement>
     <dependencies>
+      <!-- Cocoon subprojects -->
       <dependency>
-        <groupId>org.apache.cocoon.pipeline</groupId>
-        <artifactId>cocoon-pipeline</artifactId>
-        <version>3.0.0-alpha-2-SNAPSHOT</version>
-      </dependency>  
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-servlet-service-impl</artifactId>
+        <version>1.2.0</version>
+      </dependency>
       <dependency>
-        <groupId>org.apache.cocoon.sitemap</groupId>
-        <artifactId>cocoon-sitemap</artifactId>
-        <version>3.0.0-alpha-2-SNAPSHOT</version>
-      </dependency>      
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-configuration-api</artifactId>
+        <version>1.0.2</version>
+      </dependency>
       <dependency>
-        <groupId>org.apache.cocoon.servlet</groupId>
-        <artifactId>cocoon-servlet</artifactId>
-        <version>3.0.0-alpha-2-SNAPSHOT</version>
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-spring-configurator</artifactId>
+        <version>2.1.0</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cocoon.stringtemplate</groupId>
-        <artifactId>cocoon-stringtemplate</artifactId>
-        <version>3.0.0-alpha-2-SNAPSHOT</version>      
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-block-deployment</artifactId>
+        <version>1.1.0</version>
+      </dependency>  
+      <dependency>
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-jnet</artifactId>
+        <version>1.1.0</version>
+      </dependency>     
+      <dependency>
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-xml</artifactId>
+        <version>2.0.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.apache.cocoon.rest</groupId>
-        <artifactId>cocoon-rest</artifactId>
-        <version>3.0.0-alpha-2-SNAPSHOT</version>
-      </dependency>    
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-serializers-charsets</artifactId>
+        <version>1.0.0</version>
+      </dependency>
+      
+      <!-- Spring (+ AOP support)-->
       <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <scope>provided</scope>
-        <version>2.4</version>
-      </dependency>   
-           <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context-support</artifactId>
+        <version>2.5.6</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-dao</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aop</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+        <version>2.5.6</version>
+      </dependency>
+      <dependency>
+      <groupId>org.springframework</groupId>
+        <artifactId>spring-jmx</artifactId>
+        <version>2.0.8</version>
       </dependency>
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjrt</artifactId>
-        <version>1.5.4</version>
+        <version>1.6.1</version>
       </dependency>
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjweaver</artifactId>
-        <version>1.5.4</version>
+        <version>1.6.1</version>
+      </dependency> 
+
+      <!-- Other libraries -->
+      <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-core</artifactId>
+        <version>1.0.3</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-server</artifactId>
+        <version>1.0.3</version>
+      </dependency>       
+      <dependency>
+        <groupId>commons-betwixt</groupId>
+        <artifactId>commons-betwixt</artifactId>
+        <version>0.8</version>
+        <scope>compile</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>1.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-jexl</groupId>
+        <artifactId>commons-jexl</artifactId>
+        <version>1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.4</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>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>2.4</version>
+      </dependency>          
+      <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <scope>runtime</scope>
         <version>1.2.14</version>
       </dependency>
-      <!--  Test dependencies -->
+      <dependency>
+        <groupId>net.sf.ehcache</groupId>
+        <artifactId>ehcache</artifactId>
+        <version>1.6.1</version>
+      </dependency>
+      <dependency>
+        <groupId>net.sourceforge.nekohtml</groupId>
+        <artifactId>nekohtml</artifactId>
+        <version>1.9.9</version>
+      </dependency>
+      <dependency>
+        <groupId>org.antlr</groupId>
+        <artifactId>stringtemplate</artifactId>
+        <version>3.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.solr</groupId>
+        <artifactId>solr-core</artifactId>
+        <version>1.3.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
+          </exclusion>
+        </exclusions>        
+      </dependency>
+      <dependency>
+        <groupId>org.apache.solr</groupId>
+        <artifactId>solr-solrj</artifactId>
+        <version>1.3.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
+          </exclusion>
+        </exclusions>        
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>wstx-asl</artifactId>
+        <version>3.2.9</version>
+      </dependency>      
+      <dependency>
+        <groupId>org.apache.wicket</groupId>
+        <artifactId>wicket</artifactId>
+        <version>1.4.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.wicket</groupId>
+        <artifactId>wicket-spring</artifactId>
+        <version>1.4.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>          
+      <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>fop</artifactId>
+        <version>0.95</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.4.2</version>
+      </dependency>      
+      <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>1.3.02</version>
+      </dependency>      
+
+      <!-- Cocoon internal dependencies -->
+      <dependency>
+        <groupId>org.apache.cocoon.controller</groupId>
+        <artifactId>cocoon-controller</artifactId>
+        <version>3.0.0-alpha-2-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cocoon.optional</groupId>
+        <artifactId>cocoon-optional</artifactId>
+        <version>3.0.0-alpha-2-SNAPSHOT</version>
+      </dependency>      
+      <dependency>
+        <groupId>org.apache.cocoon.monitoring</groupId>
+        <artifactId>cocoon-monitoring</artifactId>
+        <version>3.0.0-alpha-2-SNAPSHOT</version>
+      </dependency>      
+      <dependency>
+        <groupId>org.apache.cocoon.pipeline</groupId>
+        <artifactId>cocoon-pipeline</artifactId>
+        <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-2-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cocoon.sample</groupId>
+        <artifactId>cocoon-sample</artifactId>
+        <version>3.0.0-alpha-2-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cocoon.sax</groupId>
+        <artifactId>cocoon-sax</artifactId>
+        <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-2-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cocoon.sitemap</groupId>
+        <artifactId>cocoon-sitemap</artifactId>
+        <version>3.0.0-alpha-2-SNAPSHOT</version>
+      </dependency>      
+      <dependency>
+        <groupId>org.apache.cocoon.stax</groupId>
+        <artifactId>cocoon-stax</artifactId>
+        <version>3.0.0-alpha-2-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cocoon.profiling</groupId>
+        <artifactId>cocoon-profiling</artifactId>
+        <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-2-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cocoon.wicket</groupId>
+        <artifactId>cocoon-wicket</artifactId>
+        <version>3.0.0-alpha-2-SNAPSHOT</version>
+      </dependency>      
+
+      <!-- Test dependencies -->
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.4</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-it-fw</artifactId>
         <version>1.0.0-M1</version>
         <scope>test</scope>
-      </dependency>    
+      </dependency>
       <dependency>
         <groupId>junit-addons</groupId>
         <artifactId>junit-addons</artifactId>
@@ -142,16 +377,10 @@
         <groupId>xmlunit</groupId>
         <artifactId>xmlunit</artifactId>
         <scope>test</scope>
-        <version>1.2</version>
+        <version>1.3</version>
       </dependency>      
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <scope>test</scope>
-        <version>4.4</version>      
-      </dependency>
     </dependencies>
-  </dependencyManagement>      
+  </dependencyManagement>
   
   <build>
     <plugins>
@@ -173,19 +402,7 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.0</version>
-      </plugin>
+      </plugin> 
     </plugins>
     <pluginManagement>
       <plugins>
@@ -193,25 +410,168 @@
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-maven-plugin</artifactId>
           <version>1.0.0-M3</version>
-        </plugin>
+        </plugin>    
         <plugin>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>2.0.2</version>
-        </plugin>        
+          <groupId>org.apache.maven.plugins</groupId>        
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.0</version>
+        </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>        
           <artifactId>maven-eclipse-plugin</artifactId>
           <version>2.5</version>        
-        </plugin>        
+        </plugin>    
         <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.1</version>
-        </plugin>     
+          <groupId>org.apache.maven.plugins</groupId>        
+          <artifactId>maven-war-plugin</artifactId>
+          <version>2.0.2</version>
+        </plugin>            
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>maven-jetty-plugin</artifactId>
           <version>6.1.7</version>
         </plugin>   
-      </plugins>      
+        <!-- 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>
+        </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>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-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>
+        </plugin>
+        <!-- END SNIPPET: release-plugin-configuration -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <version>1.1</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>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-scm-plugin</artifactId>
+          <version>1.2</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>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.4.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>clirr-maven-plugin</artifactId>
+          <version>2.2.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-maven-plugin</artifactId>
+          <version>1.3.8</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.modello</groupId>
+          <artifactId>modello-maven-plugin</artifactId>
+          <version>1.1</version>
+        </plugin>
+      </plugins>
     </pluginManagement>
   </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=895095&r1=895094&r2=895095&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 Jan  1 23:59:43 2010
@@ -30,6 +30,7 @@
   <description>Cocoon 3 samples.</description>
 
   <dependencies>
+    <!-- Cocoon libraries -->
     <dependency>
       <groupId>org.apache.cocoon.rest</groupId>
       <artifactId>cocoon-rest</artifactId>
@@ -41,25 +42,73 @@
       <version>3.0.0-alpha-2-SNAPSHOT</version>      
     </dependency>
     <dependency>
+      <groupId>org.apache.cocoon.wicket</groupId>
+      <artifactId>cocoon-wicket</artifactId>
+      <version>3.0.0-alpha-2-SNAPSHOT</version>      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon.profiling</groupId>
+      <artifactId>cocoon-profiling</artifactId>
+      <version>3.0.0-alpha-2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon.monitoring</groupId>
+      <artifactId>cocoon-monitoring</artifactId>
+      <version>3.0.0-alpha-2-SNAPSHOT</version>      
+    </dependency>
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>
       <scope>provided</scope>
     </dependency>    
 
-    <!-- Other dependencies -->
+    <!-- Optional libraries -->    
+    <dependency>
+      <groupId>org.apache.cocoon.optional</groupId>
+      <artifactId>cocoon-optional</artifactId>
+      <version>3.0.0-alpha-2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>fop</artifactId>
+      <version>0.95</version>      
+    </dependency>      
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-serializers-charsets</artifactId>
+      <version>1.0.0</version>
+    </dependency> 
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+      <version>1.0.3</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
+      <version>1.0.3</version>
+    </dependency>              
+  
+    <!--  Logging dependencies -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.4.2</version>
+      <scope>runtime</scope>
+    </dependency>    
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>      
+      <version>1.2.14</version>
       <scope>runtime</scope>
     </dependency>
-
+    
     <!--  Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>      
+      <version>4.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -124,7 +173,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+              <Cocoon-Block-Name>cocoon-sample</Cocoon-Block-Name>
             </manifestEntries>
           </archive>
         </configuration>

Modified: cocoon/cocoon3/trunk/cocoon-archetype-sample/sync.groovy
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-sample/sync.groovy?rev=895095&r1=895094&r2=895095&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-sample/sync.groovy (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-sample/sync.groovy Fri Jan  1 23:59:43 2010
@@ -21,8 +21,9 @@
 fileNames = []
 File dir = new File(project.basedir, project.properties.getProperty('cocoon.sample.dir'))
 def excludedDirs = [".svn", ".settings", "target"]
-def excludedFiles = ["MockHttpServletRequest.java", "MockHttpServletResponse.java", 
-  "SitemapBuilderTest.java", ".classpath", ".project", "pom.xml", "NOTICE.txt", "LICENSE.txt"]
+def excludedFiles = ["MockHttpServletRequest.java", "MockHttpServletResponse.java", "MockServletContext.java",
+  "SitemapBuilderTest.java", ".classpath", ".project", "pom.xml", "NOTICE.txt", "LICENSE.txt",
+  "ProfilingIntegrationTest.java", "MockXMLSitemapServlet.java", "SitemapServlet.java"]
 
 def xClos
 xClos = {

Modified: cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/pom.xml?rev=895095&r1=895094&r2=895095&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/pom.xml
Fri Jan  1 23:59:43 2010
@@ -40,80 +40,37 @@
       <artifactId>[the artifact id of the block to be mounted]</artifactId>
       <version>${version}</version>
     </dependency-->
-  </dependencies>  
-
+  </dependencies>
+  
   <build>
     <plugins>
       <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.0.2</version>
+      </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <version>6.1.7</version>
+        <configuration>
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>8890</port>
+              <maxIdleTime>30000</maxIdleTime>
+            </connector>
+          </connectors>
+          <webAppSourceDirectory>${project.build.directory}/${pom.artifactId}-${pom.version}</webAppSourceDirectory>
+          <contextPath>/</contextPath>
+        </configuration>
+      </plugin>
+      <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <excludes>
-            <exclude>**</exclude>
+            <exclude>**/cocoon/**</exclude>
           </excludes>
         </configuration>
-      </plugin>         
+      </plugin>      
     </plugins>
-  </build>
-  
-  <profiles>
-    <profile>
-      <id>it</id>
-      <build>
-        <plugins>
-          <!-- Integration tests -->
-          <plugin>
-            <groupId>org.apache.cocoon</groupId>
-            <artifactId>cocoon-it-fw</artifactId>
-            <version>1.0.0-M1</version>
-            <configuration>
-              <webAppDirectory>${project.build.directory}/${pom.artifactId}-${pom.version}</webAppDirectory>
-            </configuration>
-            <executions>
-              <execution>
-                <id>jetty-start</id>
-                <goals>
-                  <goal>jetty-start</goal>
-                </goals>
-                <phase>pre-integration-test</phase>
-              </execution>
-              <execution>
-                <id>jetty-stop</id>
-                <goals>
-                  <goal>jetty-stop</goal>
-                </goals>
-                <phase>post-integration-test</phase>
-              </execution>
-            </executions>
-            <dependencies>
-              <dependency>
-                <groupId>net.sourceforge.cobertura</groupId>
-                <artifactId>cobertura</artifactId>
-                <version>1.9</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>integration-test</id>
-                <goals>
-                  <goal>test</goal>
-                </goals>
-                <phase>integration-test</phase>
-                <configuration>
-                  <excludes>
-                    <exclude>none</exclude>
-                  </excludes>
-                  <includes>
-                    <include>**</include>
-                  </includes>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>    
+  </build>  
 </project>



Mime
View raw message