Permalink
Browse files

Updated to Spring Android 1.0.0.M4

  • Loading branch information...
1 parent 4eaccc2 commit feff5a5d6db266da39c26c451be0a11e163c0bbc @royclarkson royclarkson committed Jul 25, 2011
Showing with 16 additions and 2 deletions.
  1. +16 −2 pom.xml
View
18 pom.xml
@@ -22,9 +22,10 @@
<maven-compiler-plugin-version>2.3.2</maven-compiler-plugin-version>
<android-version>2.1_r1</android-version>
<java-version>1.6</java-version>
- <spring-android-version>1.0.0.BUILD-SNAPSHOT</spring-android-version>
+ <spring-android-version>1.0.0.M4</spring-android-version>
<spring-social-version>1.0.0.RC1</spring-social-version>
- <jackson-version>1.8.2</jackson-version>
+ <spring-security-version>3.1.0.RC2.crypto</spring-security-version>
+ <jackson-version>1.8.3</jackson-version>
</properties>
<dependencies>
@@ -40,10 +41,23 @@
<version>${spring-android-version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-crypto</artifactId>
+ <version>${spring-security-version}</version>
+ <exclusions>
+ <!-- exclude in favor of spring-android-core -->
+ <exclusion>
+ <artifactId>spring-core</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.springframework.social</groupId>
<artifactId>spring-social-core</artifactId>
<version>${spring-social-version}</version>
<exclusions>
+ <!-- exclude in favor of spring-android-rest-template -->
<exclusion>
<artifactId>spring-web</artifactId>
<groupId>org.springframework</groupId>

0 comments on commit feff5a5

Please sign in to comment.