diff --git a/pom.xml b/pom.xml
index 8140859b6..4e2373333 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,7 @@
 	<name>Spring Data Commons Distribution</name>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
+
 	<modules>
 		<module>spring-data-commons-parent</module>
 		<module>spring-data-commons-core</module>
@@ -67,6 +68,8 @@
 		<dist.accessKey>s3 access key</dist.accessKey>
 		<dist.secretKey>s3 secret key</dist.secretKey>
 		-->
+	    <javadoc.loc>src/main/javadoc</javadoc.loc>
+	    <findbugs.skip>false</findbugs.skip>
 	</properties>
 	<profiles>
 		<profile>
@@ -87,24 +90,7 @@
 			</distributionManagement>
 		</profile>
 	</profiles>
-	<distributionManagement>
-		<!-- see 'staging' profile for dry-run deployment settings -->
-		<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
-		<site>
-			<id>spring-site</id>
-			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-commons/docs/${project.version}</url>
-		</site>
-		<repository>
-			<id>spring-milestone</id>
-			<name>Spring Milestone Repository</name>
-			<url>s3://maven.springframework.org/milestone</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
+
 	<build>
 		<extensions>
 			<extension>
@@ -260,11 +246,102 @@
 					</dependency>
 				</dependencies>
 			</plugin>
+
+	      <plugin>
+	        <artifactId>maven-javadoc-plugin</artifactId>
+	        <version>2.7</version>
+	         <configuration>
+	           <javadoc:aggregate>true</javadoc:aggregate>
+	           <aggregate>true</aggregate>
+	           <breakiterator>true</breakiterator>
+	           <header>Spring Data Key-Value</header>
+	           <source>1.5</source>
+	           <show>protected</show>
+	           <quiet>true</quiet>
+	           <javadocDirectory>${javadoc.loc}</javadocDirectory>
+	           <overview>${javadoc.loc}/overview.html</overview>
+	           <stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile>
+	           <docfilessubdirs>true</docfilessubdirs>
+
+	           <groups>
+	             <group>
+	                <title>Spring Data Commons Core</title>
+	                <packages>org.springframework.data.commons.core*</packages>
+	             </group>            
+	             <group>
+	                <title>Spring Data Commons Aspects</title>
+	                <packages>org.springframework.data.commons.aspects*</packages>
+	             </group>            
+	           </groups>
+	           <links>
+	             <link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
+	             <link>http://download.oracle.com/javase/6/docs/api/</link>
+	           </links>
+	         </configuration>
+	      </plugin>
+
 		</plugins>
-		<!-- the name of this project is 'spring-amqp-dist';
-			 make sure the zip file is just 'spring-amqp'. -->
+		<!-- the name of this project is 'spring-data-commons-dist';
+			 make sure the zip file is just 'spring-data-commons'. -->
 		<finalName>${dist.finalName}</finalName>
+
 	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jxr-maven-plugin</artifactId>
+			</plugin>
+
+			<!-- ============== -->
+			<!-- FindBugs -->
+			<!-- ============== -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<version>2.3.1</version>
+				<configuration>
+					<!--
+					<xmlOutput>true</xmlOutput>
+					<xmlOutputDirectory>target</xmlOutputDirectory>
+					-->
+					<threshold>Normal</threshold>
+					<effort>Default</effort>
+					<!--
+					<debug>true</debug>
+					<relaxed>true</relaxed>
+					-->
+					<skip>${findbugs.skip}</skip>
+				</configuration>
+			</plugin>
+
+			<!-- ============== -->
+			<!-- jDepend        -->
+			<!-- ============== -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jdepend-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-pmd-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.6</version>
+				<configuration>
+					<aggregate>true</aggregate>
+				</configuration>
+			</plugin>						
+		</plugins>
+	</reporting>
+
 	<repositories>
 		<repository>
 			<id>repository.springframework.maven.release</id>
@@ -283,4 +360,23 @@
 			<url>http://repository.springsource.com/maven/bundles/release</url>
 		</repository>
 	</repositories>
+
+	<distributionManagement>
+		<!-- see 'staging' profile for dry-run deployment settings -->
+		<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
+		<site>
+			<id>spring-site</id>
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-commons/docs/${project.version}</url>
+		</site>
+		<repository>
+			<id>spring-milestone</id>
+			<name>Spring Milestone Repository</name>
+			<url>s3://maven.springframework.org/milestone</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
 </project>
\ No newline at end of file