svn commit: r1382781 - in /cocoon/cocoon3/trunk: cocoon-archetype-block/pom.xml cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml parent/pom.xml
[email protected] Mon, 10 Sep 2012 12:02:24 -0000
Newsgroups
gmane.text.xml.cocoon.cvs
Message-ID
<[email protected] >
Author: ilgrosso
Date: Mon Sep 10 12:02:24 2012
New Revision: 1382781
URL: http://svn.apache.org/viewvc?rev=1382781&view=rev
Log:
Upgrading some deps (including Apache parent POM to 11)
Modified:
cocoon/cocoon3/trunk/cocoon-archetype-block/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/parent/pom.xml
Modified: cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml?rev=1382781&r1=1382780&r2=1382781&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml Mon Sep 10 12:02:24 2012
@@ -29,10 +29,10 @@
<!-- FIXME this props should come from the parent! -->
<properties>
<cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
- <spring.version>3.1.1.RELEASE</spring.version>
+ <spring.version>3.1.2.RELEASE</spring.version>
- <logback.version>1.0.5</logback.version>
- <slf4j.version>1.6.5</slf4j.version>
+ <logback.version>1.0.7</logback.version>
+ <slf4j.version>1.7.0</slf4j.version>
</properties>
<build>
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=1382781&r1=1382780&r2=1382781&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 Mon Sep 10 12:02:24 2012
@@ -34,10 +34,10 @@
<properties>
<cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
- <spring.version>3.1.1.RELEASE</spring.version>
+ <spring.version>3.1.2.RELEASE</spring.version>
- <logback.version>1.0.6</logback.version>
- <slf4j.version>1.6.6</slf4j.version>
+ <logback.version>1.0.7</logback.version>
+ <slf4j.version>1.7.0</slf4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
@@ -135,34 +135,34 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.6.12</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.12</version>
+ <version>1.7.0</version>
</dependency>
<!-- Other libraries -->
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.12</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.12</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>1.12</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.2.4-1</version>
+ <version>2.2.6</version>
</dependency>
<dependency>
<groupId>commons-betwixt</groupId>
@@ -207,17 +207,17 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.6</version>
+ <version>2.2.7</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.6.1</version>
+ <artifactId>ehcache-core</artifactId>
+ <version>2.6.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>1.9.15</version>
+ <version>1.9.16</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
@@ -227,7 +227,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -242,7 +242,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -261,18 +261,18 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
- <version>4.1.2</version>
+ <version>4.1.4</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>1.5.4</version>
+ <version>1.5.8</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>1.5.4</version>
+ <version>1.5.8</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -467,7 +467,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.5.1</version>
<configuration>
<source>${javac.src.version}</source>
<target>${javac.target.version}</target>
@@ -548,7 +548,7 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -558,13 +558,13 @@
<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>
+ <version>2.3.7</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.8</version>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
@@ -573,7 +573,7 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -593,7 +593,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2.1</version>
</plugin>
</plugins>
</pluginManagement>
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=1382781&r1=1382780&r2=1382781&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 Mon Sep 10 12:02:24 2012
@@ -36,8 +36,8 @@
<cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
- <logback.version>1.0.6</logback.version>
- <slf4j.version>1.6.6</slf4j.version>
+ <logback.version>1.0.7</logback.version>
+ <slf4j.version>1.7.0</slf4j.version>
</properties>
<dependencies>
@@ -103,17 +103,17 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.12</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.12</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>1.12</version>
+ <version>1.13</version>
</dependency>
<!-- Logging dependencies -->
@@ -164,10 +164,10 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.5.1</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1382781&r1=1382780&r2=1382781&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Mon Sep 10 12:02:24 2012
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath/>
</parent>
@@ -59,10 +59,10 @@
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
<implementation.build>${scmBranch}@r${buildNumber}; ${maven.build.timestamp}</implementation.build>
- <spring.version>3.1.1.RELEASE</spring.version>
+ <spring.version>3.1.2.RELEASE</spring.version>
- <logback.version>1.0.6</logback.version>
- <slf4j.version>1.6.6</slf4j.version>
+ <logback.version>1.0.7</logback.version>
+ <slf4j.version>1.7.0</slf4j.version>
<!-- docs properties -->
<docs.name>Cocoon 3</docs.name>
@@ -295,34 +295,34 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.6.12</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.12</version>
+ <version>1.7.0</version>
</dependency>
<!-- Other libraries -->
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.12</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.12</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>1.12</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.2.5</version>
+ <version>2.2.6</version>
</dependency>
<dependency>
<groupId>commons-betwixt</groupId>
@@ -367,17 +367,17 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.6</version>
+ <version>2.2.7</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
- <version>2.5.1</version>
+ <version>2.6.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>1.9.15</version>
+ <version>1.9.16</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
@@ -387,7 +387,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -406,7 +406,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -421,23 +421,23 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
- <version>4.1.2</version>
+ <version>4.1.4</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>1.5.7</version>
+ <version>1.5.8</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>1.5.7</version>
+ <version>1.5.8</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -695,7 +695,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5</version>
+ <version>2.5.1</version>
<configuration>
<source>${javac.src.version}</source>
<target>${javac.target.version}</target>
@@ -763,7 +763,7 @@
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
- <version>2.0.7</version>
+ <version>2.0.14</version>
<executions>
<execution>
<id>single-page</id>
@@ -865,14 +865,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<locales>en</locales>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7.1</version>
<reportSets>
<reportSet>
<reports>
@@ -928,12 +928,12 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -978,7 +978,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
+ <version>2.12.2</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
@@ -1240,7 +1240,7 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>