Author: snoopdave
Date: Sun Oct 16 14:34:10 2011
New Revision: 1184835
URL: http://svn.apache.org/viewvc?rev=1184835&view=rev
Log:
upgrading to Spring Context 2.5.6 to fix exception at startup time (reproduced
on on both Tomcat and Jetty), for real this time. Also, setting version number
to 5.1.0 instead of 5.1.0-mobile-dev.
Modified:
roller/trunk/planet-business/pom.xml
roller/trunk/planet-web/pom.xml
roller/trunk/pom.xml
roller/trunk/roller-core/pom.xml
roller/trunk/test-utils/pom.xml
roller/trunk/weblogger-assembly/pom.xml
roller/trunk/weblogger-business/pom.xml
roller/trunk/weblogger-war-assembly/pom.xml
roller/trunk/weblogger-web/pom.xml
roller/trunk/weblogger-webapp/pom.xml
Modified: roller/trunk/planet-business/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/planet-business/pom.xml?rev=1184835&r1=1184834&r2=1184835&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Sun Oct 16 14:34:10 2011
@@ -8,7 +8,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.1.0-mobile-dev</version>
+ <version>5.1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: roller/trunk/planet-web/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/planet-web/pom.xml?rev=1184835&r1=1184834&r2=1184835&view=diff
==============================================================================
--- roller/trunk/planet-web/pom.xml (original)
+++ roller/trunk/planet-web/pom.xml Sun Oct 16 14:34:10 2011
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.1.0-mobile-dev</version>
+ <version>5.1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: roller/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1184835&r1=1184834&r2=1184835&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Sun Oct 16 14:34:10 2011
@@ -8,7 +8,7 @@
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.1.0-mobile-dev</version>
+ <version>5.1.0</version>
<packaging>pom</packaging>
<name>Roller Project - Trunk</name>
Modified: roller/trunk/roller-core/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/roller-core/pom.xml?rev=1184835&r1=1184834&r2=1184835&view=diff
==============================================================================
--- roller/trunk/roller-core/pom.xml (original)
+++ roller/trunk/roller-core/pom.xml Sun Oct 16 14:34:10 2011
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.1.0-mobile-dev</version>
+ <version>5.1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: roller/trunk/test-utils/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/test-utils/pom.xml?rev=1184835&r1=1184834&r2=1184835&view=diff
==============================================================================
--- roller/trunk/test-utils/pom.xml (original)
+++ roller/trunk/test-utils/pom.xml Sun Oct 16 14:34:10 2011
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.1.0-mobile-dev</version>
+ <version>5.1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: roller/trunk/weblogger-assembly/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-assembly/pom.xml?rev=1184835&r1=1184834&r2=1184835&view=diff
==============================================================================
--- roller/trunk/weblogger-assembly/pom.xml (original)
+++ roller/trunk/weblogger-assembly/pom.xml Sun Oct 16 14:34:10 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.1.0-mobile-dev</version>
+ <version>5.1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: roller/trunk/weblogger-business/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=1184835&r1=1184834&r2=1184835&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Sun Oct 16 14:34:10 2011
@@ -11,13 +11,13 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <name>Apache Roller Weblogger Business Module</name>
+ <name>Roller Weblogger Business Module</name>
<description>
Business logic and persistence for Roller Weblogger.
</description>
<groupId>org.apache.roller</groupId>
<artifactId>roller-weblogger-business</artifactId>
- <version>5.1.0-mobile-dev</version>
+ <version>5.1.0</version>
<properties>
<testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
Modified: roller/trunk/weblogger-war-assembly/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-war-assembly/pom.xml?rev=1184835&r1=1184834&r2=1184835&view=diff
==============================================================================
--- roller/trunk/weblogger-war-assembly/pom.xml (original)
+++ roller/trunk/weblogger-war-assembly/pom.xml Sun Oct 16 14:34:10 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.1.0-mobile-dev</version>
+ <version>5.1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: roller/trunk/weblogger-web/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/pom.xml?rev=1184835&r1=1184834&r2=1184835&view=diff
==============================================================================
--- roller/trunk/weblogger-web/pom.xml (original)
+++ roller/trunk/weblogger-web/pom.xml Sun Oct 16 14:34:10 2011
@@ -12,10 +12,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <name>Apache Roller Weblogger Web Module</name>
+ <name>Roller Weblogger Web Module</name>
<groupId>org.apache.roller</groupId>
<artifactId>roller-weblogger-web</artifactId>
- <version>5.1.0-mobile-dev</version>
+ <version>5.1.0</version>
<packaging>jar</packaging>
<dependencies>
@@ -203,7 +203,13 @@
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.5.6</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: roller/trunk/weblogger-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/pom.xml?rev=1184835&r1=1184834&r2=1184835&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/pom.xml (original)
+++ roller/trunk/weblogger-webapp/pom.xml Sun Oct 16 14:34:10 2011
@@ -11,10 +11,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <name>Apache Roller Weblogger Web Application</name>
+ <name>Roller Weblogger Web Application</name>
<groupId>org.apache.roller</groupId>
<artifactId>roller-weblogger-webapp</artifactId>
- <version>5.1.0-mobile-dev</version>
+ <version>5.1.0</version>
<packaging>war</packaging>
<dependencies>