diff --git a/.classpath b/.classpath
index f1c9e1c9b..6be21badf 100644
--- a/.classpath
+++ b/.classpath
@@ -5,12 +5,16 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth2/src/main/java"/>
-	<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth2/src/main/resources"/>
-	<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth2/src/test/java"/>
-	<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth2/src/test/resources"/>
-	<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth/src/main/java"/>
 	<classpathentry kind="src" path="mitre-local/src/main/java"/>
+	<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth2/src/main/resources"/>
+	<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth/src/main/java"/>
+	<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth/src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
diff --git a/.project b/.project
index 04bd3391d..9e70fd3c0 100644
--- a/.project
+++ b/.project
@@ -36,8 +36,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index b5bffc576..45ba36f2a 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,11 +5,10 @@
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/spring-security-oauth/spring-security-oauth2/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/spring-security-oauth/spring-security-oauth2/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/spring-security-oauth/spring-security-oauth2/src/test/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/spring-security-oauth/spring-security-oauth2/src/test/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/spring-security-oauth/spring-security-oauth/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/mitre-local/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/spring-security-oauth/spring-security-oauth2/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/spring-security-oauth/spring-security-oauth/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/spring-security-oauth/spring-security-oauth/src/main/resources"/>
 		<property name="java-output-path" value="target/classes"/>
         <property name="context-root" value="openid"/>
 	</wb-module>
diff --git a/pom.xml b/pom.xml
index 0de433283..1a02dfcaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,6 +236,11 @@
         	<artifactId>bcprov-jdk16</artifactId>
         	<version>1.46</version>
         </dependency>
+        <dependency>
+        	<groupId>org.codehaus.jackson</groupId>
+        	<artifactId>jackson-mapper-asl</artifactId>
+        	<version>1.9.2</version>
+        </dependency>
     </dependencies>
     <repositories>
         <!-- For testing against latest Spring snapshots -->
diff --git a/spring-security-oauth b/spring-security-oauth
index 7f152e3b5..7a55ca546 160000
--- a/spring-security-oauth
+++ b/spring-security-oauth
@@ -1 +1 @@
-Subproject commit 7f152e3b5a9d806ae410159b3235beb7f2672189
+Subproject commit 7a55ca546a3567a8a1833340d0ff9e2b47cf4bdc