diff --git a/openid-connect-client/.classpath b/openid-connect-client/.classpath
index 3c96d649b..0f53f3e2b 100644
--- a/openid-connect-client/.classpath
+++ b/openid-connect-client/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/openid-connect-client/.settings/org.eclipse.jdt.core.prefs b/openid-connect-client/.settings/org.eclipse.jdt.core.prefs
index 0d0f213d8..6a4fb9595 100644
--- a/openid-connect-client/.settings/org.eclipse.jdt.core.prefs
+++ b/openid-connect-client/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,6 @@
-#Fri Mar 16 15:07:52 EDT 2012
+#Fri Mar 16 16:16:56 EDT 2012
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/openid-connect-client/pom.xml b/openid-connect-client/pom.xml
index e2f86b403..e569f0e1b 100644
--- a/openid-connect-client/pom.xml
+++ b/openid-connect-client/pom.xml
@@ -15,5 +15,23 @@
 		<artifactId>openid-connect-common</artifactId>
 		<version>0.1</version>
 	</dependency>
+		<dependency>
+			<groupId>org.springframework.security.oauth</groupId>
+			<version>1.0.0.BUILD-SNAPSHOT</version>
+			<artifactId>spring-security-oauth2</artifactId>
+		</dependency>  
   </dependencies>
+  <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java-version}</source>
+                    <target>${java-version}</target>
+                </configuration>
+            </plugin>
+	</plugins>
+    </build>
 </project>
\ No newline at end of file
diff --git a/openid-connect-client/target/maven-archiver/pom.properties b/openid-connect-client/target/maven-archiver/pom.properties
index 118c008d2..e73f32a42 100644
--- a/openid-connect-client/target/maven-archiver/pom.properties
+++ b/openid-connect-client/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Mar 16 15:09:40 EDT 2012
+#Fri Mar 16 16:11:13 EDT 2012
 version=0.1
 groupId=org.mitre
 artifactId=openid-connect-client
diff --git a/openid-connect-client/target/openid-connect-client-0.1.jar b/openid-connect-client/target/openid-connect-client-0.1.jar
index 1d4bab6d8..bd8faf4dc 100644
Binary files a/openid-connect-client/target/openid-connect-client-0.1.jar and b/openid-connect-client/target/openid-connect-client-0.1.jar differ
diff --git a/openid-connect-common/.classpath b/openid-connect-common/.classpath
index c53fae393..74d8d97f5 100644
--- a/openid-connect-common/.classpath
+++ b/openid-connect-common/.classpath
@@ -4,11 +4,15 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/openid-connect-common/.project b/openid-connect-common/.project
index 412535cab..ab5f08e36 100644
--- a/openid-connect-common/.project
+++ b/openid-connect-common/.project
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/openid-connect-common/.settings/org.eclipse.jdt.core.prefs b/openid-connect-common/.settings/org.eclipse.jdt.core.prefs
index 55f711ba8..d2a6e1e36 100644
--- a/openid-connect-common/.settings/org.eclipse.jdt.core.prefs
+++ b/openid-connect-common/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Fri Mar 16 15:26:11 EDT 2012
+#Fri Mar 16 16:16:57 EDT 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/openid-connect-common/.settings/org.eclipse.wst.common.project.facet.core.xml b/openid-connect-common/.settings/org.eclipse.wst.common.project.facet.core.xml
index a1f6907b8..5c9bd7532 100644
--- a/openid-connect-common/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/openid-connect-common/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="java" version="1.5"/>
   <installed facet="jst.utility" version="1.0"/>
+  <installed facet="java" version="1.6"/>
 </faceted-project>
diff --git a/openid-connect-common/pom.xml b/openid-connect-common/pom.xml
index 1f2c0aa33..88ca90edc 100644
--- a/openid-connect-common/pom.xml
+++ b/openid-connect-common/pom.xml
@@ -9,4 +9,31 @@
   <artifactId>openid-connect-common</artifactId>
   <description>OpenID Connect Common modules</description>
   <name>OpenID Connect Common</name>
+  <dependencies>
+		<dependency>
+			<groupId>org.springframework.security.oauth</groupId>
+			<version>1.0.0.BUILD-SNAPSHOT</version>
+			<artifactId>spring-security-oauth2</artifactId>
+		</dependency>  
+  </dependencies>
+    <properties>
+        <java-version>1.6</java-version>
+        <org.springframework-version>3.1.1.RELEASE</org.springframework-version>
+        <org.slf4j-version>1.5.10</org.slf4j-version>
+        <spring.security.version>3.1.0.RELEASE</spring.security.version>
+    </properties>
+  <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java-version}</source>
+                    <target>${java-version}</target>
+                </configuration>
+            </plugin>
+	</plugins>
+    </build>
+
 </project>
\ No newline at end of file
diff --git a/openid-connect-common/target/maven-archiver/pom.properties b/openid-connect-common/target/maven-archiver/pom.properties
index 18743c4eb..566d2dcdb 100644
--- a/openid-connect-common/target/maven-archiver/pom.properties
+++ b/openid-connect-common/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Mar 16 15:09:40 EDT 2012
+#Fri Mar 16 16:11:12 EDT 2012
 version=0.1
 groupId=org.mitre
 artifactId=openid-connect-common
diff --git a/openid-connect-common/target/openid-connect-common-0.1.jar b/openid-connect-common/target/openid-connect-common-0.1.jar
index 4492c554a..7dcf9bc10 100644
Binary files a/openid-connect-common/target/openid-connect-common-0.1.jar and b/openid-connect-common/target/openid-connect-common-0.1.jar differ
diff --git a/openid-connect-server/.settings/org.eclipse.wst.common.component b/openid-connect-server/.settings/org.eclipse.wst.common.component
index a3ea0dca2..cec04dc6f 100644
--- a/openid-connect-server/.settings/org.eclipse.wst.common.component
+++ b/openid-connect-server/.settings/org.eclipse.wst.common.component
@@ -5,10 +5,10 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <dependent-module archiveName="openid-connect-common-0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/openid-connect-common/openid-connect-common">
+        <dependent-module archiveName="spring-security-oauth2-1.0.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/spring-security-oauth2/spring-security-oauth2">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="spring-security-oauth2-1.0.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/spring-security-oauth2/spring-security-oauth2">
+        <dependent-module archiveName="openid-connect-common-0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/openid-connect-common/openid-connect-common">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="java-output-path" value="/openid/target/classes"/>
diff --git a/openid-connect-server/pom.xml b/openid-connect-server/pom.xml
index 8c57b3133..9a4717027 100644
--- a/openid-connect-server/pom.xml
+++ b/openid-connect-server/pom.xml
@@ -12,6 +12,11 @@
     	<relativePath>..</relativePath>
     </parent>
     <dependencies>
+		<dependency>
+			<groupId>org.springframework.security.oauth</groupId>
+			<version>1.0.0.BUILD-SNAPSHOT</version>
+			<artifactId>spring-security-oauth2</artifactId>
+		</dependency>  
 		<dependency>
 			<groupId>org.mitre</groupId>
 			<artifactId>openid-connect-common</artifactId>
diff --git a/pom.xml b/pom.xml
index 5f810886e..7ba02e1c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,11 +34,6 @@
     <url></url>
     
     <dependencies>
-		<dependency>
-			<groupId>org.springframework.security.oauth</groupId>
-			<version>1.0.0.BUILD-SNAPSHOT</version>
-			<artifactId>spring-security-oauth2</artifactId>
-		</dependency>
         <!-- Spring -->
         <dependency>
             <groupId>org.springframework</groupId>