You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2010/10/29 01:05:49 UTC
svn commit: r1028530 - in /shiro/trunk: pom.xml
samples/spring-hibernate/pom.xml samples/spring/pom.xml
support/aspectj/pom.xml support/ehcache/pom.xml support/quartz/pom.xml
support/spring/pom.xml
Author: lhazlewood
Date: Thu Oct 28 23:05:48 2010
New Revision: 1028530
URL: http://svn.apache.org/viewvc?rev=1028530&view=rev
Log:
SHIRO-180: Updated libraries:
spring: 3.0.5.RELEASE
ehcache: 2.2.0
aspectj: 1.6.9
groovy: 1.7.5
quartz: 1.6.1
slf4j: 1.6.1
junit: 4.8.2
easymock: 3.0
Modified:
shiro/trunk/pom.xml
shiro/trunk/samples/spring-hibernate/pom.xml
shiro/trunk/samples/spring/pom.xml
shiro/trunk/support/aspectj/pom.xml
shiro/trunk/support/ehcache/pom.xml
shiro/trunk/support/quartz/pom.xml
shiro/trunk/support/spring/pom.xml
Modified: shiro/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/pom.xml?rev=1028530&r1=1028529&r2=1028530&view=diff
==============================================================================
--- shiro/trunk/pom.xml (original)
+++ shiro/trunk/pom.xml Thu Oct 28 23:05:48 2010
@@ -63,14 +63,25 @@
</distributionManagement>
<properties>
+ <!-- non-dependency-based properties: -->
<shiro.osgi.importRange>[1.1.0, 2.0.0)</shiro.osgi.importRange>
+
+ <!-- Compile 3rd party dependencies: -->
+ <aspectj.version>1.6.9</aspectj.version>
<crowd.version>1.5.2</crowd.version>
- <jdk.version>1.5</jdk.version>
- <slf4j.version>1.5.6</slf4j.version>
+ <ehcache.version>2.2.0</ehcache.version>
+ <groovy.version>1.7.5</groovy.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
+ <jdk.version>1.5</jdk.version>
<jetty.version>6.1.21</jetty.version>
- <spring.version>2.5.6</spring.version>
- <groovy.version>1.6.2</groovy.version>
+ <quartz.version>1.6.1</quartz.version>
+ <slf4j.version>1.6.1</slf4j.version>
+ <spring.version>3.0.5.RELEASE</spring.version>
+
+ <!-- Test 3rd-party dependencies: -->
+ <junit.version>4.8.2</junit.version>
+ <easymock.version>3.0</easymock.version>
+
</properties>
<mailingLists>
@@ -227,13 +238,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
+ <version>${easymock.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -293,6 +304,16 @@
<!-- 3rd party dependencies -->
<dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>${aspectj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>${aspectj.version}</version>
+ </dependency>
+ <dependency>
<!-- Used for Atlassian Crowd Realm - not required for the framework: -->
<groupId>com.atlassian.crowd</groupId>
<artifactId>crowd-integration-client</artifactId>
@@ -326,7 +347,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
+ <version>1.8.3</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -344,7 +365,7 @@
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -362,7 +383,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.15</version>
+ <version>1.2.16</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -390,8 +411,8 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.4.1</version>
+ <artifactId>ehcache-core</artifactId>
+ <version>${ehcache.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
@@ -472,7 +493,31 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${spring.version}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
<optional>true</optional>
<exclusions>
@@ -498,6 +543,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
+ <scope>test</scope>
<optional>true</optional>
<exclusions>
<exclusion>
@@ -507,9 +553,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>quartz</groupId>
+ <groupId>org.opensymphony.quartz</groupId>
<artifactId>quartz</artifactId>
- <version>1.5.2</version>
+ <version>${quartz.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
Modified: shiro/trunk/samples/spring-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/spring-hibernate/pom.xml?rev=1028530&r1=1028529&r2=1028530&view=diff
==============================================================================
--- shiro/trunk/samples/spring-hibernate/pom.xml (original)
+++ shiro/trunk/samples/spring-hibernate/pom.xml Thu Oct 28 23:05:48 2010
@@ -18,7 +18,8 @@
~ under the License.
-->
<!--suppress osmorcNonOsgiMavenDependency -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.shiro.samples</groupId>
@@ -130,12 +131,16 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
+ <artifactId>ehcache-core</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: shiro/trunk/samples/spring/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/spring/pom.xml?rev=1028530&r1=1028529&r2=1028530&view=diff
==============================================================================
--- shiro/trunk/samples/spring/pom.xml (original)
+++ shiro/trunk/samples/spring/pom.xml Thu Oct 28 23:05:48 2010
@@ -156,7 +156,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: shiro/trunk/support/aspectj/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/aspectj/pom.xml?rev=1028530&r1=1028529&r2=1028530&view=diff
==============================================================================
--- shiro/trunk/support/aspectj/pom.xml (original)
+++ shiro/trunk/support/aspectj/pom.xml Thu Oct 28 23:05:48 2010
@@ -38,12 +38,10 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.6.7</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.8</version>
</dependency>
<!-- Test dependencies -->
<dependency>
Modified: shiro/trunk/support/ehcache/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/ehcache/pom.xml?rev=1028530&r1=1028529&r2=1028530&view=diff
==============================================================================
--- shiro/trunk/support/ehcache/pom.xml (original)
+++ shiro/trunk/support/ehcache/pom.xml Thu Oct 28 23:05:48 2010
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
+ <artifactId>ehcache-core</artifactId>
</dependency>
<!-- Test dependencies -->
<dependency>
Modified: shiro/trunk/support/quartz/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/quartz/pom.xml?rev=1028530&r1=1028529&r2=1028530&view=diff
==============================================================================
--- shiro/trunk/support/quartz/pom.xml (original)
+++ shiro/trunk/support/quartz/pom.xml Thu Oct 28 23:05:48 2010
@@ -36,7 +36,7 @@
<artifactId>shiro-core</artifactId>
</dependency>
<dependency>
- <groupId>quartz</groupId>
+ <groupId>org.opensymphony.quartz</groupId>
<artifactId>quartz</artifactId>
</dependency>
<!-- Test dependencies -->
Modified: shiro/trunk/support/spring/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/spring/pom.xml?rev=1028530&r1=1028529&r2=1028530&view=diff
==============================================================================
--- shiro/trunk/support/spring/pom.xml (original)
+++ shiro/trunk/support/spring/pom.xml Thu Oct 28 23:05:48 2010
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
<scope>provided</scope>
</dependency>
<!-- Test dependencies -->