diff --git a/openid-connect-client/pom.xml b/openid-connect-client/pom.xml
index e569f0e1b..29898ee32 100644
--- a/openid-connect-client/pom.xml
+++ b/openid-connect-client/pom.xml
@@ -1,37 +1,70 @@
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>openid-connect-parent</artifactId>
     <groupId>org.mitre</groupId>
-    <version>0.1</version>
+    <version>0.1-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
+  <groupId>org.mitre</groupId> 
   <artifactId>openid-connect-client</artifactId>
+  <version>0.1-SNAPSHOT</version> 
   <description>OpenID Connect Client Files</description>
   <name>OpenID Connect Client</name>
   <dependencies>
-	<dependency>
-		<groupId>org.mitre</groupId>
-		<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>  
+    <dependency>
+      <groupId>org.mitre</groupId>
+      <artifactId>openid-connect-common</artifactId>
+      <version>0.1-SNAPSHOT</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
+  <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>
+      <!-- BUILD SOURCE FILES -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.1.2</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- BUILD JavaDoc FILES -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.7</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/openid-connect-common/pom.xml b/openid-connect-common/pom.xml
index 88ca90edc..494c0225c 100644
--- a/openid-connect-common/pom.xml
+++ b/openid-connect-common/pom.xml
@@ -1,39 +1,73 @@
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>openid-connect-parent</artifactId>
     <groupId>org.mitre</groupId>
-    <version>0.1</version>
+    <version>0.1-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
+  <groupId>org.mitre</groupId>  
   <artifactId>openid-connect-common</artifactId>
+  <version>0.1-SNAPSHOT</version>  
   <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>  
+    <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>
+  <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
+  <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>
+      <!-- BUILD SOURCE FILES -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.1.2</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- BUILD JavaDoc FILES -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.7</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/openid-connect-server/pom.xml b/openid-connect-server/pom.xml
index a14bd77dd..c46319e42 100644
--- a/openid-connect-server/pom.xml
+++ b/openid-connect-server/pom.xml
@@ -2,13 +2,15 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.mitre</groupId>    
     <artifactId>openid-connect-server</artifactId>
+    <version>0.1-SNAPSHOT</version>
     <name>OpenIdConnect Server</name>
     <packaging>war</packaging>
     <parent>
     	<groupId>org.mitre</groupId>
     	<artifactId>openid-connect-parent</artifactId>
-    	<version>0.1</version>
+    	<version>0.1-SNAPSHOT</version>
     	<relativePath>..</relativePath>
     </parent>
     <dependencies>
@@ -20,7 +22,7 @@
 		<dependency>
 			<groupId>org.mitre</groupId>
 			<artifactId>openid-connect-common</artifactId>
-			<version>0.1</version>
+			<version>0.1-SNAPSHOT</version>
 		</dependency>
     </dependencies>
     <description>Reference implementation of OpenID Connect spec (http://openid.net/connect/).
diff --git a/pom.xml b/pom.xml
index 7ba02e1c9..27707b3ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,8 @@
     <groupId>org.mitre</groupId>
     <artifactId>openid-connect-parent</artifactId>
     <name>OpenIdConnect</name>
+    <version>0.1-SNAPSHOT</version>        
     <packaging>pom</packaging>
-    <version>0.1</version>
     
     <profiles>
     	<profile>
@@ -18,7 +18,7 @@
 		    	<module>spring-security-oauth/spring-security-oauth2</module>
 		    	<module>openid-connect-common</module>
 		    	<module>openid-connect-client</module>
-				<module>openid-connect-server</module>
+			<module>openid-connect-server</module>
 		    </modules>
     	</profile>
     </profiles>
diff --git a/spring-security-oauth b/spring-security-oauth
index 33acf01dc..5a784a9fb 160000
--- a/spring-security-oauth
+++ b/spring-security-oauth
@@ -1 +1 @@
-Subproject commit 33acf01dccc563c184f897448d7d61ed4aa847ff
+Subproject commit 5a784a9fb7ac11a46cc161e94676e62dac57c2c8