svn commit: r1225590 - /cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
[email protected] Thu, 29 Dec 2011 16:50:15 -0000
Newsgroups
gmane.text.xml.cocoon.cvs
Message-ID
<[email protected] >
Author: ilgrosso
Date: Thu Dec 29 16:50:14 2011
New Revision: 1225590
URL: http://svn.apache.org/viewvc?rev=1225590&view=rev
Log:
Aligning archetype's parent POM to parent POM
Modified:
cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/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=1225590&r1=1225589&r2=1225590&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 Dec 29 16:50:14 2011
@@ -34,11 +34,13 @@
<properties>
<cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
+ <spring.version>3.1.0.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.5</javac.src.version>
- <javac.target.version>1.5</javac.target.version>
+ <javac.src.version>1.6</javac.src.version>
+ <javac.target.version>1.6</javac.target.version>
</properties>
<dependencyManagement>
@@ -91,17 +93,17 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>3.0.5.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.0.5.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.0.5.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -111,17 +113,17 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-dao</artifactId>
- <version>3.0.5.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>3.0.5.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.0.5.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -131,29 +133,29 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.6.11</version>
+ <version>1.6.12</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.11</version>
+ <version>1.6.12</version>
</dependency>
<!-- Other libraries -->
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.8</version>
+ <version>1.11</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.8</version>
+ <version>1.11</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.2</version>
+ <version>2.2.4-1</version>
</dependency>
<dependency>
<groupId>commons-betwixt</groupId>
@@ -178,17 +180,17 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0.1</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>commons-jexl</groupId>
<artifactId>commons-jexl</artifactId>
- <version>1.1</version>
+ <version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.0.1</version>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -198,7 +200,7 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.1</version>
+ <version>2.2.6</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
@@ -208,17 +210,17 @@
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>1.9.14</version>
+ <version>1.9.15</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
- <artifactId>stringtemplate</artifactId>
- <version>3.2.1</version>
+ <artifactId>ST4</artifactId>
+ <version>4.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>3.3.0</version>
+ <version>3.5.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -233,7 +235,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
- <version>3.3.0</version>
+ <version>3.5.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -251,18 +253,18 @@
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.9</version>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>4.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>1.4.17</version>
+ <version>1.4.19</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>1.4.17</version>
+ <version>1.4.19</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -276,6 +278,11 @@
<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>
@@ -283,12 +290,40 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
+ <version>2.10.1</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>2.0.2</version>
+ <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.0</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.0.0</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 -->
@@ -358,11 +393,11 @@
<version>${cocoon.version}</version>
</dependency>
- <!-- Test dependencies -->
+ <!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>4.9</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -398,13 +433,6 @@
<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>