diff --git a/pom.xml b/pom.xml
index 323f7d659..062cac61d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,7 +245,6 @@
 	        <artifactId>maven-javadoc-plugin</artifactId>
 	        <version>2.7</version>
 	         <configuration>
-	           <javadoc:aggregate>true</javadoc:aggregate>
 	           <aggregate>true</aggregate>
 	           <breakiterator>true</breakiterator>
 	           <header>Spring Data Commons</header>
diff --git a/spring-data-commons-parent/pom.xml b/spring-data-commons-parent/pom.xml
index 25c25eae5..df7754066 100644
--- a/spring-data-commons-parent/pom.xml
+++ b/spring-data-commons-parent/pom.xml
@@ -203,21 +203,14 @@
 	</build>
 	<pluginRepositories>
 		<pluginRepository>
-			<id>spring-libs-release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://repo.springsource.org/libs-release</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>repository.plugin.springsource.release</id>
-			<name>SpringSource Maven Repository</name>
-			<url>http://repository.springsource.com/maven/bundles/release</url>
+			<id>spring-plugins-release</id>
+			<url>http://repo.springsource.org/plugins-release</url>
 		</pluginRepository>
 	</pluginRepositories>
 	<repositories>
 		<repository>
-			<id>spring-libs-snapshot</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://repo.springsource.org/libs-snapshot</url>
+			<id>spring-libs-release</id>
+			<url>http://repo.springsource.org/libs-release</url>
 		</repository>
 	</repositories>
 	<reporting>