diff --git a/access/access-tool/tool/pom.xml b/access/access-tool/tool/pom.xml
index 83a4e271bd91..3fdc4ae0e8b3 100644
--- a/access/access-tool/tool/pom.xml
+++ b/access/access-tool/tool/pom.xml
@@ -25,8 +25,6 @@
     <dependency>
       <groupId>org.sakaiproject.oauth</groupId>
       <artifactId>oauth-api</artifactId>
-      <version>1.2-SNAPSHOT</version>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
   <build>
diff --git a/common/ddl/pom.xml b/common/ddl/pom.xml
index 70b2545c930f..2bf4deb0e362 100644
--- a/common/ddl/pom.xml
+++ b/common/ddl/pom.xml
@@ -11,7 +11,7 @@
     <parent>
 		<groupId>org.sakaiproject.common</groupId>
 		<artifactId>common</artifactId>
-	    <version>1.2-SNAPSHOT</version>
+	    <version>12-SNAPSHOT</version>
 	</parent>
 	
     <properties>
@@ -24,30 +24,30 @@
          <dependency>
         <groupId>org.sakaiproject.common</groupId>
         <artifactId>sakai-common-edu-person-api</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>12-SNAPSHOT</version>
       </dependency>
       <dependency>
       <groupId>org.sakaiproject.common</groupId>
       <artifactId>sakai-common-composite-component-data</artifactId>
-      <version>1.2-SNAPSHOT</version>
+      <version>12-SNAPSHOT</version>
     </dependency>
     <dependency>
         <groupId>org.sakaiproject.common</groupId>
         <artifactId>sakai-common-composite-component</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>12-SNAPSHOT</version>
       </dependency>
       
      
       <dependency>
         <groupId>org.sakaiproject.common</groupId>
         <artifactId>sakai-common-manager-api</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>12-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.sakaiproject.common</groupId>
         <artifactId>sakai-common-type-api</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>12-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
      
diff --git a/entitybroker/tool/pom.xml b/entitybroker/tool/pom.xml
index 5cd5ef5660c6..c74ff5660ef3 100644
--- a/entitybroker/tool/pom.xml
+++ b/entitybroker/tool/pom.xml
@@ -42,8 +42,6 @@
         <dependency>
             <groupId>org.sakaiproject.oauth</groupId>
             <artifactId>oauth-api</artifactId>
-            <version>1.2-SNAPSHOT</version>
-            <scope>provided</scope>
         </dependency>
         <!-- Kernel dependencies -->
         <dependency>
diff --git a/jsf/jsf-widgets-sun-depend/pom.xml b/jsf/jsf-widgets-sun-depend/pom.xml
index b503553deb38..557a222123a8 100644
--- a/jsf/jsf-widgets-sun-depend/pom.xml
+++ b/jsf/jsf-widgets-sun-depend/pom.xml
@@ -8,8 +8,7 @@
         <version>12-SNAPSHOT</version>
     </parent>
 
-    <name>Sakai JSF widget dependencies for Sun's RI
-        (sakai-depend-jsf-widgets-sun)</name>
+    <name>Sakai JSF widget dependencies for Sun's RI (sakai-depend-jsf-widgets-sun)</name>
     <groupId>org.sakaiproject.jsf</groupId>
     <artifactId>jsf-widgets-sun-depend</artifactId>
     <organization>
diff --git a/jsf/myfaces-widgets-depend/pom.xml b/jsf/myfaces-widgets-depend/pom.xml
index 116a65722ade..2afb4bf5190e 100644
--- a/jsf/myfaces-widgets-depend/pom.xml
+++ b/jsf/myfaces-widgets-depend/pom.xml
@@ -8,8 +8,7 @@
         <version>12-SNAPSHOT</version>
     </parent>
 
-    <name>Sakai JSF Widgets Dependencies for MyFaces
-        (sakai-depend-jsf-widgets-myfaces)</name>
+    <name>Sakai JSF Widgets Dependencies for MyFaces (sakai-depend-jsf-widgets-myfaces)</name>
     <groupId>org.sakaiproject.jsf</groupId>
     <artifactId>myfaces-widgets-depend</artifactId>
     <organization>
diff --git a/master/pom.xml b/master/pom.xml
index 2f812c563da7..21a4fe1ee614 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -1537,6 +1537,12 @@
         <version>${sakai.version}</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.sakaiproject.oauth</groupId>
+        <artifactId>oauth-api</artifactId>
+        <version>${sakai.version}</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
         <groupId>org.sakaiproject.jsf</groupId>
         <artifactId>jsf-app</artifactId>
diff --git a/oauth/api/pom.xml b/oauth/api/pom.xml
index 92fb5ebad633..b802b96a611a 100755
--- a/oauth/api/pom.xml
+++ b/oauth/api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sakaiproject.oauth</groupId>
         <artifactId>oauth-base</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>12-SNAPSHOT</version>
     </parent>
 
     <artifactId>oauth-api</artifactId>
diff --git a/oauth/dao-hbm/pom.xml b/oauth/dao-hbm/pom.xml
index 1715c19b5bf3..b39833d5ba18 100755
--- a/oauth/dao-hbm/pom.xml
+++ b/oauth/dao-hbm/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sakaiproject.oauth</groupId>
         <artifactId>oauth-base</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/oauth/dao-memory/pom.xml b/oauth/dao-memory/pom.xml
index ec022d6bd93d..6802efdee130 100755
--- a/oauth/dao-memory/pom.xml
+++ b/oauth/dao-memory/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sakaiproject.oauth</groupId>
         <artifactId>oauth-base</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/oauth/dao-server-config/pom.xml b/oauth/dao-server-config/pom.xml
index 9160444ab73c..72164a9f167e 100755
--- a/oauth/dao-server-config/pom.xml
+++ b/oauth/dao-server-config/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sakaiproject.oauth</groupId>
         <artifactId>oauth-base</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/oauth/impl/pom.xml b/oauth/impl/pom.xml
index f905fe3abead..500d8ee9774d 100755
--- a/oauth/impl/pom.xml
+++ b/oauth/impl/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sakaiproject.oauth</groupId>
         <artifactId>oauth-base</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>12-SNAPSHOT</version>
     </parent>
 
     <artifactId>oauth-impl</artifactId>
@@ -19,7 +19,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>oauth-api</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/oauth/pack/pom.xml b/oauth/pack/pom.xml
index 127b5c702ed2..b9a519e18778 100755
--- a/oauth/pack/pom.xml
+++ b/oauth/pack/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sakaiproject.oauth</groupId>
         <artifactId>oauth-base</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>12-SNAPSHOT</version>
     </parent>
 
     <artifactId>oauth-pack</artifactId>
@@ -23,7 +23,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>oauth-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/oauth/pom.xml b/oauth/pom.xml
index 0fd3b152dd54..1e19475ab327 100755
--- a/oauth/pom.xml
+++ b/oauth/pom.xml
@@ -5,7 +5,6 @@
 
     <groupId>org.sakaiproject.oauth</groupId>
     <artifactId>oauth-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     
     <parent>
diff --git a/oauth/tool/pom.xml b/oauth/tool/pom.xml
index 185e1992741e..9e0c67c02d2e 100755
--- a/oauth/tool/pom.xml
+++ b/oauth/tool/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sakaiproject.oauth</groupId>
         <artifactId>oauth-base</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>12-SNAPSHOT</version>
     </parent>
 
     <artifactId>oauth-tool</artifactId>
diff --git a/simple-rss-portlet/pom.xml b/simple-rss-portlet/pom.xml
index 9af01e1471ff..4152f14a3564 100644
--- a/simple-rss-portlet/pom.xml
+++ b/simple-rss-portlet/pom.xml
@@ -8,7 +8,6 @@
   	<description>An RSS/Atom feed reader.</description>
   	<url>https://wiki.jasig.org/display/PLT/Simple+RSS+Portlet</url>
   	
-  	<version>1.2.3-SNAPSHOT</version>
   	<packaging>war</packaging>
   	
     <parent>