You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by il...@apache.org on 2011/12/26 17:40:44 UTC
svn commit: r1224754 - in /cocoon/cocoon3/trunk: cocoon-rest/pom.xml
cocoon-sample/pom.xml parent/pom.xml
Author: ilgrosso
Date: Mon Dec 26 16:40:43 2011
New Revision: 1224754
URL: http://svn.apache.org/viewvc?rev=1224754&view=rev
Log:
Updating to Spring 3.1 (+ other version updates)
Modified:
cocoon/cocoon3/trunk/cocoon-rest/pom.xml
cocoon/cocoon3/trunk/cocoon-sample/pom.xml
cocoon/cocoon3/trunk/parent/pom.xml
Modified: cocoon/cocoon3/trunk/cocoon-rest/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest/pom.xml?rev=1224754&r1=1224753&r2=1224754&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-rest/pom.xml Mon Dec 26 16:40:43 2011
@@ -62,7 +62,12 @@
<artifactId>jersey-server</artifactId>
<optional>true</optional>
</dependency>
-
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-bundle</artifactId>
+ <optional>true</optional>
+ </dependency>
+
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: cocoon/cocoon3/trunk/cocoon-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/pom.xml?rev=1224754&r1=1224753&r2=1224754&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/pom.xml Mon Dec 26 16:40:43 2011
@@ -66,11 +66,11 @@
</dependency>
<!-- Optional libraries -->
- <dependency>
+ <dependency>
<groupId>org.apache.cocoon.stax</groupId>
<artifactId>cocoon-stax</artifactId>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</dependency>
@@ -94,7 +94,11 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-bundle</artifactId>
+ </dependency>
+
<!-- Logging dependencies -->
<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=1224754&r1=1224753&r2=1224754&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Mon Dec 26 16:40:43 2011
@@ -49,7 +49,7 @@
<javac.target.version>1.6</javac.target.version>
<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.0.7.RELEASE</spring.version>
+ <spring.version>3.1.0.RELEASE</spring.version>
</properties>
<developers>
@@ -280,24 +280,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.jersey</groupId>
+ <artifactId>jersey-bundle</artifactId>
+ <version>1.11</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -327,17 +332,17 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0.1</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl</artifactId>
- <version>2.0.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>
@@ -347,12 +352,12 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.4</version>
+ <version>2.2.6</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
- <version>2.4.4</version>
+ <version>2.5.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
@@ -367,7 +372,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>
@@ -386,7 +391,7 @@
<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>
@@ -406,17 +411,17 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>1.4.18</version>
+ <version>1.4.19</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>1.4.18</version>
+ <version>1.4.19</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -459,12 +464,12 @@
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
- <version>1.17</version>
+ <version>1.20</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-digester3</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
</dependency>
<!-- Logging -->
@@ -750,7 +755,7 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -760,7 +765,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.5</version>
+ <version>2.3.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -795,17 +800,17 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
+ <version>2.11</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
@@ -1040,7 +1045,7 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1054,7 +1059,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<configuration>
<linkXref>true</linkXref>
<sourceEncoding>utf-8</sourceEncoding>
Re: c3 version update (was Re: svn commit: r1224754 )
Posted by Thorsten Scherler <sc...@gmail.com>.
> ...
>
> Hi Thorsten,
> I've just (manually) aligned archetype's parent POM with parent POM.
>
> I don't know too if there is an automatic way to keep these two in sync:
> I'll keep in mind to update both for the future.
Thank you very much!
The thing is that we even have more components that needs a sync (like
the block and war pom of the architypes). Old school Ant would use a xsl
transform of the underlying pom, remove all obsolete lines and copy it
to the architypes. I am sre we could do something similar with maven but
sadly I have no time to look into that right now.
salu2
--
Thorsten Scherler <thorsten.at.apache.org>
codeBusters S.L. - web based systems
<consulting, training and solutions>
http://www.codebusters.es/
Re: c3 version update (was Re: svn commit: r1224754 )
Posted by Francesco Chicchiriccò <il...@apache.org>.
On 29/12/2011 12:28, Thorsten Scherler wrote:
> On Mon, 2011-12-26 at 16:40 +0000, ilgrosso@apache.org wrote:
>> Author: ilgrosso
>> Date: Mon Dec 26 16:40:43 2011
>> New Revision: 1224754
>>
>> URL: http://svn.apache.org/viewvc?rev=1224754&view=rev
>> Log:
>> Updating to Spring 3.1 (+ other version updates)
>>
>> Modified:
>> cocoon/cocoon3/trunk/cocoon-rest/pom.xml
>> cocoon/cocoon3/trunk/cocoon-sample/pom.xml
>> cocoon/cocoon3/trunk/parent/pom.xml
> Hi Francesco, hi devs,
>
> thanks for updating the pom. One small observation since I just updated
> the parent pom of our client project.
>
> https://svn.apache.org/repos/asf/cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
>
> This pom is way outdated and maybe need to enter in the version update
> cycle. I am not sure whether we can actually generate that pom
> automatically based on the c3 parent one (which would save us the double
> version maintenance) but we cannot have it as outdated as now since it
> is the start for new developments around c3.
Hi Thorsten,
I've just (manually) aligned archetype's parent POM with parent POM.
I don't know too if there is an automatic way to keep these two in sync:
I'll keep in mind to update both for the future.
Regards.
--
Francesco Chicchiriccò
Apache Cocoon Committer and PMC Member
http://people.apache.org/~ilgrosso/
c3 version update (was Re: svn commit: r1224754 )
Posted by Thorsten Scherler <sc...@gmail.com>.
On Mon, 2011-12-26 at 16:40 +0000, ilgrosso@apache.org wrote:
> Author: ilgrosso
> Date: Mon Dec 26 16:40:43 2011
> New Revision: 1224754
>
> URL: http://svn.apache.org/viewvc?rev=1224754&view=rev
> Log:
> Updating to Spring 3.1 (+ other version updates)
>
> Modified:
> cocoon/cocoon3/trunk/cocoon-rest/pom.xml
> cocoon/cocoon3/trunk/cocoon-sample/pom.xml
> cocoon/cocoon3/trunk/parent/pom.xml
Hi Francesco, hi devs,
thanks for updating the pom. One small observation since I just updated
the parent pom of our client project.
https://svn.apache.org/repos/asf/cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
This pom is way outdated and maybe need to enter in the version update
cycle. I am not sure whether we can actually generate that pom
automatically based on the c3 parent one (which would save us the double
version maintenance) but we cannot have it as outdated as now since it
is the start for new developments around c3.
salu2
--
Thorsten Scherler <thorsten.at.apache.org>
codeBusters S.L. - web based systems
<consulting, training and solutions>
http://www.codebusters.es/