From 1e480831e90f48da5fd12d9a0cc52039e52f51f2 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Fri, 21 Mar 2014 15:49:36 +0100
Subject: [PATCH] Fixed compilation-issues agains spring-security-oauth2

---
 pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index a78c5d5..b05afaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,10 +41,12 @@
 
     <!-- used versions -->
     <commons-codec.version>1.7</commons-codec.version>
+    <jackson.version>2.3.2</jackson.version>
     <servlet-api.version>3.0.1</servlet-api.version>
     <slf4j.version>1.5.8</slf4j.version>
-    <springframework.version>3.2.4.RELEASE</springframework.version>
-    <spring-security-oauth.version>1.0.5.RELEASE</spring-security-oauth.version>
+    <spring.version>3.2.4.RELEASE</spring.version>
+    <spring-security.version>3.1.3.RELEASE</spring-security.version>
+    <spring-security-oauth2.version>1.0.5.RELEASE</spring-security-oauth2.version>
 
   </properties>
 
@@ -55,7 +57,7 @@
     <dependency>
       <groupId>org.springframework.security.oauth</groupId>
       <artifactId>spring-security-oauth2</artifactId>
-      <version>${spring-security-oauth.version}</version>
+      <version>${spring-security-oauth2.version}</version>
       <exclusions>
         <exclusion>
           <groupId>commons-codec</groupId>
@@ -110,7 +112,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>${springframework.version}</version>
+      <version>${spring.version}</version>
       <exclusions>
         <exclusion>
             <groupId>commons-logging</groupId>
@@ -120,6 +122,42 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- Needed to compile agains spring-security-oauth2 -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>${spring-security.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-aop</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-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-expression</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- commons-codec -->
     <dependency>
       <groupId>commons-codec</groupId>
-- 
2.20.1