You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2011/08/22 00:23:54 UTC
svn commit: r1160074 - in /roller/trunk: pom.xml weblogger-web/pom.xml
Author: snoopdave
Date: Sun Aug 21 22:23:54 2011
New Revision: 1160074
URL: http://svn.apache.org/viewvc?rev=1160074&view=rev
Log:
Reverting some changes made in most recent commit. Only the weblogger-web module needs Spring, so we do not need to mention Spring at the parent project level
Modified:
roller/trunk/pom.xml
roller/trunk/weblogger-web/pom.xml
Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1160074&r1=1160073&r2=1160074&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Sun Aug 21 22:23:54 2011
@@ -30,7 +30,6 @@
<roller.version>5.0.0</roller.version>
<!-- avoid CLOB/BLOB error in all later versions of Derby -->
<derby.version>10.1.3.1</derby.version>
- <spring.version>2.0.6.RELEASE</spring.version>
</properties>
<modules>
@@ -226,74 +225,6 @@
<scope>compile</scope>
</dependency>
- <!-- spring deps -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-dao</artifactId>
- <version>2.0.6</version>
- <exclusions>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.5.6</version>
- <exclusions>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-openid</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-taglibs</artifactId>
- <version>${spring.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-acl</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- web deps -->
<dependency>
Modified: roller/trunk/weblogger-web/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/pom.xml?rev=1160074&r1=1160073&r2=1160074&view=diff
==============================================================================
--- roller/trunk/weblogger-web/pom.xml (original)
+++ roller/trunk/weblogger-web/pom.xml Sun Aug 21 22:23:54 2011
@@ -172,30 +172,49 @@
<artifactId>rome-propono</artifactId>
<scope>compile</scope>
<exclusions>
- <exclusion>
- <artifactId>xmlrpc-common</artifactId>
- <groupId>xmlrpc</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xmlrpc-client</artifactId>
- <groupId>xmlrpc</groupId>
- </exclusion>
- <exclusion>
- <artifactId>ws-commons-util</artifactId>
- <groupId>ws-commons-util</groupId>
- </exclusion>
- <exclusion>
- <artifactId>activation</artifactId>
- <groupId>javax.activation</groupId>
- </exclusion>
+ <exclusion>
+ <artifactId>xmlrpc-common</artifactId>
+ <groupId>xmlrpc</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xmlrpc-client</artifactId>
+ <groupId>xmlrpc</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>ws-commons-util</artifactId>
+ <groupId>ws-commons-util</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>activation</artifactId>
+ <groupId>javax.activation</groupId>
+ </exclusion>
</exclusions>
</dependency>
- <!-- Spring Security deps -->
+ <!-- spring deps -->
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-dao</artifactId>
+ <version>2.0.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
+ <version>2.5.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -203,30 +222,47 @@
<artifactId>spring-ldap</artifactId>
<version>1.2</version>
</dependency>
-
+
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
+ <version>2.0.6.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-support</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-openid</artifactId>
+ <version>2.0.6.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
+ <version>2.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-acl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-dao</artifactId>
+ <version>2.0.6.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- OpenID deps -->
@@ -301,10 +337,10 @@
<artifactId>mail</artifactId>
<scope>provided</scope>
<exclusions>
- <exclusion>
- <artifactId>activation</artifactId>
- <groupId>javax.activation</groupId>
- </exclusion>
+ <exclusion>
+ <artifactId>activation</artifactId>
+ <groupId>javax.activation</groupId>
+ </exclusion>
</exclusions>
</dependency>