Author: gmazza
Date: Tue Aug 13 02:09:32 2013
New Revision: 1513320
URL: http://svn.apache.org/r1513320
Log:
Rearranged dependencies to reduce need for exclusion listings as verified by
'mvn dependency:tree', removed spring-dao dependency as it's already brought in
by spring-tx (transactions)
Modified:
roller/trunk/app/pom.xml
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1513320&r1=1513319&r2=1513320&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Tue Aug 13 02:09:32 2013
@@ -164,36 +164,6 @@
</dependency>
<dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-spring-plugin</artifactId>
- <version>2.3.15.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-tiles-plugin</artifactId>
- <version>2.3.15.1</version>
- </dependency>
-
- <dependency>
<groupId>net.java.dev.rome</groupId>
<artifactId>rome</artifactId>
<version>1.0.0</version>
@@ -261,12 +231,6 @@
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-dao</artifactId>
- <version>2.0.8</version>
- </dependency>
-
- <dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>${spring.security.version}</version>
@@ -314,6 +278,18 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-spring-plugin</artifactId>
+ <version>2.3.15.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-tiles-plugin</artifactId>
+ <version>2.3.15.1</version>
+ </dependency>
+
<!-- OpenID deps -->
<dependency>
