cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1347411 - in /cocoon/cocoon3/trunk: cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml parent/pom.xml
Date Thu, 07 Jun 2012 06:23:07 GMT
Author: ilgrosso
Date: Thu Jun  7 06:23:07 2012
New Revision: 1347411

URL: http://svn.apache.org/viewvc?rev=1347411&view=rev
Log:
SLF4J 1.6.5 and Logback 1.0.5 everywhere

Modified:
    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/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=1347411&r1=1347410&r2=1347411&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 Thu Jun  7 06:23:07 2012
@@ -19,590 +19,594 @@
 -->
 <!-- $Id$ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>pom</packaging>
+  
+  <artifactId>${artifactId}</artifactId>
+  <groupId>${groupId}</groupId>
+  <version>1-SNAPSHOT</version>
+  <name>${artifactId}</name>
+
+  <modules>
+  </modules>
+
+  <properties>
+    <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
+
+    <spring.version>3.1.1.RELEASE</spring.version>
+
+    <logback.version>1.0.5</logback.version>
+    <slf4j.version>1.6.5</slf4j.version>
+
+    <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.6</javac.src.version>
+    <javac.target.version>1.6</javac.target.version>
+  </properties>
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-
-    <artifactId>${artifactId}</artifactId>
-    <groupId>${groupId}</groupId>
-    <version>1-SNAPSHOT</version>
-    <name>${artifactId}</name>
-
-    <modules>
-    </modules>
-
-    <properties>
-        <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
-        <spring.version>3.1.1.RELEASE</spring.version>
-
-        <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.6</javac.src.version>
-        <javac.target.version>1.6</javac.target.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
+  <dependencyManagement>
+    <dependencies>
       <!-- Cocoon subprojects -->
-            <dependency>
-                <groupId>org.apache.cocoon</groupId>
-                <artifactId>cocoon-servlet-service-impl</artifactId>
+      <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>
-                <groupId>org.apache.cocoon</groupId>
-                <artifactId>cocoon-configuration-api</artifactId>
-                <version>1.0.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon</groupId>
-                <artifactId>cocoon-spring-configurator</artifactId>
-                <version>2.1.0</version>
-            </dependency>
-            <dependency>
-                <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.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon</groupId>
-                <artifactId>cocoon-xml</artifactId>
-                <version>2.0.2</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>xml-apis</groupId>
-                        <artifactId>xml-apis</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon</groupId>
-                <artifactId>cocoon-serializers-charsets</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-
-            <!-- Spring (+ AOP support)-->
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-beans</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context-support</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-dao</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-aop</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-web</artifactId>
-                <version>${spring.version}</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.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.aspectj</groupId>
-                <artifactId>aspectjweaver</artifactId>
-                <version>1.6.12</version>
-            </dependency>
-
-            <!-- Other libraries -->
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-core</artifactId>
-                <version>1.12</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-server</artifactId>
-                <version>1.12</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-bundle</artifactId>
-                <version>1.12</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>2.2.4-1</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>2.1</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-jexl</groupId>
-                <artifactId>commons-jexl</artifactId>
-                <version>2.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.5</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>2.2.6</version>
-            </dependency>
-            <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.15</version>
-            </dependency>
-            <dependency>
-                <groupId>org.antlr</groupId>
-                <artifactId>ST4</artifactId>
-                <version>4.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.solr</groupId>
-                <artifactId>solr-solrj</artifactId>
-                <version>3.6.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>commons-io</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.solr</groupId>
-                <artifactId>solr-core</artifactId>
-                <version>3.6.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>commons-io</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>woodstox</groupId>
-                        <artifactId>wstx-asl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.woodstox</groupId>
-                <artifactId>woodstox-core-asl</artifactId>
-                <version>4.1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.wicket</groupId>
-                <artifactId>wicket</artifactId>
-                <version>1.5.4</version>
-		<type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.wicket</groupId>
-                <artifactId>wicket-spring</artifactId>
-                <version>1.5.4</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xmlgraphics</groupId>
-                <artifactId>fop</artifactId>
-                <version>1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xmlgraphics</groupId>
-                <artifactId>xmlgraphics-commons</artifactId>
-                <version>1.4</version>
-            </dependency>
-            <dependency>
-                <groupId>xalan</groupId>
-                <artifactId>xalan</artifactId>
-                <version>2.7.1</version>
-            </dependency>
-            <dependency>
-                <groupId>xerces</groupId>
-                <artifactId>xercesImpl</artifactId>
-                <version>2.10.0</version>
-            </dependency>
-            <dependency>
-                <groupId>xml-apis</groupId>
-                <artifactId>xml-apis</artifactId>
-                <version>1.4.01</version>
-            </dependency>
+	<version>1.2.0</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon</groupId>
+	<artifactId>cocoon-configuration-api</artifactId>
+	<version>1.0.2</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon</groupId>
+	<artifactId>cocoon-spring-configurator</artifactId>
+	<version>2.1.0</version>
+      </dependency>
+      <dependency>
+	<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.2.0</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon</groupId>
+	<artifactId>cocoon-xml</artifactId>
+	<version>2.0.2</version>
+	<exclusions>
+	  <exclusion>
+	    <groupId>xml-apis</groupId>
+	    <artifactId>xml-apis</artifactId>
+	  </exclusion>
+	</exclusions>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon</groupId>
+	<artifactId>cocoon-serializers-charsets</artifactId>
+	<version>1.0.0</version>
+      </dependency>
+
+      <!-- Spring (+ AOP support)-->
+      <dependency>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-beans</artifactId>
+	<version>${spring.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-core</artifactId>
+	<version>${spring.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-context</artifactId>
+	<version>${spring.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-context-support</artifactId>
+	<version>${spring.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-dao</artifactId>
+	<version>${spring.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-aop</artifactId>
+	<version>${spring.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-web</artifactId>
+	<version>${spring.version}</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.12</version>
+      </dependency>
+      <dependency>
+	<groupId>org.aspectj</groupId>
+	<artifactId>aspectjweaver</artifactId>
+	<version>1.6.12</version>
+      </dependency>
+
+      <!-- Other libraries -->
+      <dependency>
+	<groupId>com.sun.jersey</groupId>
+	<artifactId>jersey-core</artifactId>
+	<version>1.12</version>
+      </dependency>
+      <dependency>
+	<groupId>com.sun.jersey</groupId>
+	<artifactId>jersey-server</artifactId>
+	<version>1.12</version>
+      </dependency>
+      <dependency>
+	<groupId>com.sun.jersey</groupId>
+	<artifactId>jersey-bundle</artifactId>
+	<version>1.12</version>
+      </dependency>
+      <dependency>
+	<groupId>com.sun.xml.bind</groupId>
+	<artifactId>jaxb-impl</artifactId>
+	<version>2.2.4-1</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>2.1</version>
+      </dependency>
+      <dependency>
+	<groupId>commons-jexl</groupId>
+	<artifactId>commons-jexl</artifactId>
+	<version>2.1.1</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.commons</groupId>
+	<artifactId>commons-lang3</artifactId>
+	<version>3.1</version>
+      </dependency>
+      <dependency>
+	<groupId>javax.servlet</groupId>
+	<artifactId>servlet-api</artifactId>
+	<version>2.5</version>
+      </dependency>
+      <dependency>
+	<groupId>javax.xml.bind</groupId>
+	<artifactId>jaxb-api</artifactId>
+	<version>2.2.6</version>
+      </dependency>
+      <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.15</version>
+      </dependency>
+      <dependency>
+	<groupId>org.antlr</groupId>
+	<artifactId>ST4</artifactId>
+	<version>4.0.4</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.solr</groupId>
+	<artifactId>solr-solrj</artifactId>
+	<version>3.6.0</version>
+	<exclusions>
+	  <exclusion>
+	    <groupId>org.apache.commons</groupId>
+	    <artifactId>commons-io</artifactId>
+	  </exclusion>
+	  <exclusion>
+	    <groupId>log4j</groupId>
+	    <artifactId>log4j</artifactId>
+	  </exclusion>
+	</exclusions>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.solr</groupId>
+	<artifactId>solr-core</artifactId>
+	<version>3.6.0</version>
+	<exclusions>
+	  <exclusion>
+	    <groupId>org.apache.commons</groupId>
+	    <artifactId>commons-io</artifactId>
+	  </exclusion>
+	  <exclusion>
+	    <groupId>woodstox</groupId>
+	    <artifactId>wstx-asl</artifactId>
+	  </exclusion>
+	  <exclusion>
+	    <groupId>log4j</groupId>
+	    <artifactId>log4j</artifactId>
+	  </exclusion>
+	</exclusions>
+      </dependency>
+      <dependency>
+	<groupId>org.codehaus.woodstox</groupId>
+	<artifactId>woodstox-core-asl</artifactId>
+	<version>4.1.2</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.wicket</groupId>
+	<artifactId>wicket</artifactId>
+	<version>1.5.4</version>
+	<type>pom</type>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.wicket</groupId>
+	<artifactId>wicket-spring</artifactId>
+	<version>1.5.4</version>
+	<exclusions>
+	  <exclusion>
+	    <groupId>org.springframework</groupId>
+	    <artifactId>spring</artifactId>
+	  </exclusion>
+	</exclusions>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.xmlgraphics</groupId>
+	<artifactId>fop</artifactId>
+	<version>1.0</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.xmlgraphics</groupId>
+	<artifactId>xmlgraphics-commons</artifactId>
+	<version>1.4</version>
+      </dependency>
+      <dependency>
+	<groupId>xalan</groupId>
+	<artifactId>xalan</artifactId>
+	<version>2.7.1</version>
+      </dependency>
+      <dependency>
+	<groupId>xerces</groupId>
+	<artifactId>xercesImpl</artifactId>
+	<version>2.10.0</version>
+      </dependency>
+      <dependency>
+	<groupId>xml-apis</groupId>
+	<artifactId>xml-apis</artifactId>
+	<version>1.4.01</version>
+      </dependency>
 
       <!-- Logging -->
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.6.4</version>
-            </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-core</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.1.1</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>jcl-over-slf4j</artifactId>
-                <version>1.6.4</version>
-            </dependency>
-
-            <!-- Cocoon internal dependencies -->
-            <dependency>
-                <groupId>org.apache.cocoon.controller</groupId>
-                <artifactId>cocoon-controller</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon.optional</groupId>
-                <artifactId>cocoon-optional</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon.monitoring</groupId>
-                <artifactId>cocoon-monitoring</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon.pipeline</groupId>
-                <artifactId>cocoon-pipeline</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon.rest</groupId>
-                <artifactId>cocoon-rest</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon.sample</groupId>
-                <artifactId>cocoon-sample</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon.sax</groupId>
-                <artifactId>cocoon-sax</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon.servlet</groupId>
-                <artifactId>cocoon-servlet</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon.sitemap</groupId>
-                <artifactId>cocoon-sitemap</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon.stax</groupId>
-                <artifactId>cocoon-stax</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon.profiling</groupId>
-                <artifactId>cocoon-profiling</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon.stringtemplate</groupId>
-                <artifactId>cocoon-stringtemplate</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cocoon.wicket</groupId>
-                <artifactId>cocoon-wicket</artifactId>
-                <version>${cocoon.version}</version>
-            </dependency>
-
-            <!-- Test dependencies -->
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.10</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>
-                <groupId>junit-addons</groupId>
-                <artifactId>junit-addons</artifactId>
-                <version>1.4</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xercesImpl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xmlParserAPIs</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>xmlunit</groupId>
-                <artifactId>xmlunit</artifactId>
-                <scope>test</scope>
-                <version>1.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.bcel</groupId>
-                <artifactId>bcel</artifactId>
-                <version>5.2</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+        <version>${logback.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>${logback.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.1.1</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
+      <!-- Cocoon internal dependencies -->
+      <dependency>
+	<groupId>org.apache.cocoon.controller</groupId>
+	<artifactId>cocoon-controller</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon.optional</groupId>
+	<artifactId>cocoon-optional</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon.monitoring</groupId>
+	<artifactId>cocoon-monitoring</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon.pipeline</groupId>
+	<artifactId>cocoon-pipeline</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon.rest</groupId>
+	<artifactId>cocoon-rest</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon.sample</groupId>
+	<artifactId>cocoon-sample</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon.sax</groupId>
+	<artifactId>cocoon-sax</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon.servlet</groupId>
+	<artifactId>cocoon-servlet</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon.sitemap</groupId>
+	<artifactId>cocoon-sitemap</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon.stax</groupId>
+	<artifactId>cocoon-stax</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon.profiling</groupId>
+	<artifactId>cocoon-profiling</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon.stringtemplate</groupId>
+	<artifactId>cocoon-stringtemplate</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.cocoon.wicket</groupId>
+	<artifactId>cocoon-wicket</artifactId>
+	<version>${cocoon.version}</version>
+      </dependency>
+
+      <!-- Test dependencies -->
+      <dependency>
+	<groupId>junit</groupId>
+	<artifactId>junit</artifactId>
+	<version>4.10</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>
+	<groupId>junit-addons</groupId>
+	<artifactId>junit-addons</artifactId>
+	<version>1.4</version>
+	<exclusions>
+	  <exclusion>
+	    <groupId>xerces</groupId>
+	    <artifactId>xercesImpl</artifactId>
+	  </exclusion>
+	  <exclusion>
+	    <groupId>xerces</groupId>
+	    <artifactId>xmlParserAPIs</artifactId>
+	  </exclusion>
+	</exclusions>
+      </dependency>
+      <dependency>
+	<groupId>xmlunit</groupId>
+	<artifactId>xmlunit</artifactId>
+	<scope>test</scope>
+	<version>1.3</version>
+      </dependency>
+      <dependency>
+	<groupId>org.apache.bcel</groupId>
+	<artifactId>bcel</artifactId>
+	<version>5.2</version>
+	<scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-		<version>1.0.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>[2.0.9,)</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-		<version>2.3.2</version>
-                <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>
-		<version>2.1.2</version>
-                <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>
-		<version>2.4</version>
-                <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-it-fw</artifactId>
-                    <version>1.0.0-M1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.cocoon</groupId>
-                    <artifactId>cocoon-maven-plugin</artifactId>
-                    <version>1.0.2-SNAPSHOT</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>maven-jetty-plugin</artifactId>
-                    <version>6.1.26</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>buildnumber-maven-plugin</artifactId>
-                    <version>1.0-beta-1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>1.4.3</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>rat-maven-plugin</artifactId>
-                    <version>1.0-alpha-3</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>versions-maven-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
-                <plugin>
-                    <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-beta-5</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>javacc-maven-plugin</artifactId>
-                    <version>2.6</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.3</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>  
-
-    <repositories>
-        <repository>
-            <id>maven2-repository.java.net</id>
-            <name>Java.net Repository for Maven</name>
-            <url>http://download.java.net/maven/2/</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
+  <build>
+    <plugins>
+      <plugin>
+	<artifactId>maven-enforcer-plugin</artifactId>
+	<version>1.0.1</version>
+	<executions>
+	  <execution>
+	    <id>enforce-maven</id>
+	    <goals>
+	      <goal>enforce</goal>
+	    </goals>
+	    <configuration>
+	      <rules>
+		<requireMavenVersion>
+		  <version>[2.0.9,)</version>
+		</requireMavenVersion>
+	      </rules>
+	    </configuration>
+	  </execution>
+	</executions>
+      </plugin>
+      <plugin>
+	<artifactId>maven-compiler-plugin</artifactId>
+	<version>2.3.2</version>
+	<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>
+	<version>2.1.2</version>
+	<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>
+	<version>2.4</version>
+	<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-it-fw</artifactId>
+	  <version>1.0.0-M1</version>
+	</plugin>
+	<plugin>
+	  <groupId>org.apache.cocoon</groupId>
+	  <artifactId>cocoon-maven-plugin</artifactId>
+	  <version>1.0.2-SNAPSHOT</version>
+	</plugin>
+	<plugin>
+	  <artifactId>maven-war-plugin</artifactId>
+	  <version>2.2</version>
+	</plugin>
+	<plugin>
+	  <groupId>org.mortbay.jetty</groupId>
+	  <artifactId>maven-jetty-plugin</artifactId>
+	  <version>6.1.26</version>
+	</plugin>
+	<plugin>
+	  <artifactId>maven-dependency-plugin</artifactId>
+	  <version>2.0</version>
+	</plugin>
+	<plugin>
+	  <groupId>org.codehaus.mojo</groupId>
+	  <artifactId>buildnumber-maven-plugin</artifactId>
+	  <version>1.0-beta-1</version>
+	</plugin>
+	<plugin>
+	  <groupId>org.apache.felix</groupId>
+	  <artifactId>maven-bundle-plugin</artifactId>
+	  <version>1.4.3</version>
+	</plugin>
+	<plugin>
+	  <groupId>org.codehaus.mojo</groupId>
+	  <artifactId>rat-maven-plugin</artifactId>
+	  <version>1.0-alpha-3</version>
+	</plugin>
+	<plugin>
+	  <groupId>org.codehaus.mojo</groupId>
+	  <artifactId>versions-maven-plugin</artifactId>
+	  <version>1.0</version>
+	</plugin>
+	<plugin>
+	  <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-beta-5</version>
+	</plugin>
+	<plugin>
+	  <groupId>org.codehaus.mojo</groupId>
+	  <artifactId>javacc-maven-plugin</artifactId>
+	  <version>2.6</version>
+	</plugin>
+	<plugin>
+	  <groupId>org.codehaus.mojo</groupId>
+	  <artifactId>build-helper-maven-plugin</artifactId>
+	  <version>1.3</version>
+	</plugin>
+	<plugin>
+	  <groupId>org.codehaus.mojo</groupId>
+	  <artifactId>exec-maven-plugin</artifactId>
+	  <version>1.1</version>
+	</plugin>
+      </plugins>
+    </pluginManagement>
+  </build>  
+
+  <repositories>
+    <repository>
+      <id>maven2-repository.java.net</id>
+      <name>Java.net Repository for Maven</name>
+      <url>http://download.java.net/maven/2/</url>
+      <layout>default</layout>
+    </repository>
+  </repositories>
 
 </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=1347411&r1=1347410&r2=1347411&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 Thu Jun  7 06:23:07 2012
@@ -35,6 +35,9 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
     <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
+
+    <logback.version>1.0.5</logback.version>
+    <slf4j.version>1.6.5</slf4j.version>
   </properties>
 
   <dependencies>
@@ -115,37 +118,37 @@
 
     <!--  Logging dependencies -->
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>1.6.4</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-core</artifactId>
-        <version>1.0.4</version>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${logback.version}</version>
     </dependency>
     <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>1.0.4</version>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback.version}</version>
     </dependency>
     <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.1.1</version>
-        <scope>provided</scope>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.1</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <version>1.6.4</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>${slf4j.version}</version>
     </dependency>
 
     <!--  Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.2</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1347411&r1=1347410&r2=1347411&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Thu Jun  7 06:23:07 2012
@@ -61,6 +61,9 @@
     
     <spring.version>3.1.1.RELEASE</spring.version>
     
+    <logback.version>1.0.5</logback.version>
+    <slf4j.version>1.6.5</slf4j.version>
+
     <!-- docs properties -->
     <docs.name>Cocoon 3</docs.name>
     <docs.urlRelativizer>../</docs.urlRelativizer>
@@ -489,17 +492,17 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.6.4</version>
+        <version>${slf4j.version}</version>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
-        <version>1.0.4</version>
+        <version>${logback.version}</version>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.0.4</version>
+        <version>${logback.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
@@ -510,7 +513,7 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>jcl-over-slf4j</artifactId>
-        <version>1.6.4</version>
+        <version>${slf4j.version}</version>
       </dependency>
 
       <!-- Cocoon internal dependencies -->



Mime
View raw message