Hi all,
please remember to keep version numbers in parent/pom.xml only, and to
mark external dependencies as optional in cocoon-optional/pom.xml.
Regards.
On 29/08/2011 13:22, ilgro...@apache.org wrote:
Author: ilgrosso
Date: Mon Aug 29 11:22:28 2011
New Revision: 1162745
URL: http://svn.apache.org/viewvc?rev=1162745&view=rev
Log:
Updating Spring and JUnit to latest releases; fixing optional dependencies.
PLEASE KEEP VERSION NUMBERS IN parent/pom.xml
Modified:
cocoon/cocoon3/trunk/cocoon-optional/pom.xml
cocoon/cocoon3/trunk/cocoon-stax/pom.xml
cocoon/cocoon3/trunk/parent/pom.xml
Modified: cocoon/cocoon3/trunk/cocoon-optional/pom.xml
URL:
http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/pom.xml?rev=1162745&r1=1162744&r2=1162745&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/pom.xml Mon Aug 29 11:22:28 2011
@@ -119,27 +119,13 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
-<version>2.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
-<version>2.2</version>
<optional>true</optional>
</dependency>
-<!-- DirGenerator -->
-<dependency>
-<groupId>jakarta-regexp</groupId>
-<artifactId>jakarta-regexp</artifactId>
-<version>1.4</version>
-</dependency>
-<!-- NekoGenerator -->
-<dependency>
-<groupId>net.sourceforge.nekohtml</groupId>
-<artifactId>nekohtml</artifactId>
-<version>1.9.15</version>
-</dependency>
<!-- Test libraries -->
<dependency>
Modified: cocoon/cocoon3/trunk/cocoon-stax/pom.xml
URL:
http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/pom.xml?rev=1162745&r1=1162744&r2=1162745&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/pom.xml Mon Aug 29 11:22:28 2011
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
-<artifactId>wstx-asl</artifactId>
+<artifactId>woodstox-core-asl</artifactId>
<optional>true</optional>
</dependency>
<dependency>
@@ -52,6 +52,7 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1162745&r1=1162744&r2=1162745&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Mon Aug 29 11:22:28 2011
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
-<version>9</version>
+<version>10</version>
<relativePath/>
</parent>
@@ -232,32 +232,32 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
-<version>3.0.5.RELEASE</version>
+<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
-<version>3.0.5.RELEASE</version>
+<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
-<version>3.0.5.RELEASE</version>
+<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
-<version>3.0.5.RELEASE</version>
+<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
-<version>3.0.5.RELEASE</version>
+<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
-<version>3.0.5.RELEASE</version>
+<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -339,7 +339,7 @@
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
-<version>2.4.3</version>
+<version>2.4.4</version>
</dependency>
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
@@ -387,18 +387,18 @@
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
-<artifactId>wstx-asl</artifactId>
-<version>4.0.6</version>
+<artifactId>woodstox-core-asl</artifactId>
+<version>4.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
-<version>1.4.17</version>
+<version>1.4.18</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
-<version>1.4.17</version>
+<version>1.4.18</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -536,13 +536,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
-<version>4.8.2</version>
+<version>4.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
-<version>3.0.5.RELEASE</version>
+<version>3.0.6.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
--
Francesco Chicchiriccò
Apache Cocoon Committer and PMC Member
http://people.apache.org/~ilgrosso/
