diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index cada2340..1f389ad1 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -41,8 +41,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.4</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.easymock</groupId>
@@ -51,4 +49,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/ldif/ldif-batch/pom.xml b/ldif/ldif-batch/pom.xml
index 6368db0e..ae2a3933 100644
--- a/ldif/ldif-batch/pom.xml
+++ b/ldif/ldif-batch/pom.xml
@@ -9,7 +9,7 @@
   <name>Spring LDAP LDIF Batch</name>
   <description>Classes for integration with the Spring Batch Framework</description>
   <properties>
-    <spring-batch.version>2.0.2.RELEASE</spring-batch.version>
+    <spring-batch.version>2.0.3.RELEASE</spring-batch.version>
   </properties>
   <dependencies>
     <dependency>
@@ -39,8 +39,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/ldif/ldif-core/pom.xml b/ldif/ldif-core/pom.xml
index 320ac22c..9e5020f4 100644
--- a/ldif/ldif-core/pom.xml
+++ b/ldif/ldif-core/pom.xml
@@ -18,8 +18,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
diff --git a/odm/pom.xml b/odm/pom.xml
index 29acfd73..6245a574 100644
--- a/odm/pom.xml
+++ b/odm/pom.xml
@@ -140,8 +140,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.4</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index dcf4e8d2..73be0f5b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -34,7 +34,8 @@
 	</scm>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>2.5.6.SEC02</spring.version>
+		<spring.version>3.0.5.RELEASE</spring.version>
+		<junit.version>4.8.2</junit.version>
 	</properties>
 	<repositories>
 		<repository>
@@ -111,7 +112,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>2.1</version>
+					<version>2.1.1</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-install-plugin</artifactId>
@@ -131,7 +132,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.2-beta-2</version>
+					<version>2.2</version>
 				</plugin>
 				<plugin>
 					<groupId>com.agilejava.docbkx</groupId>
@@ -140,7 +141,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.5</version>
+					<version>2.7</version>
 					<configuration>
 						<encoding>${project.build.sourceEncoding}</encoding>
 						<aggregate>true</aggregate>
@@ -556,7 +557,7 @@
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>3.8.2</version>
+				<version>${junit.version}</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
diff --git a/pom.xml b/pom.xml
index a2f87f81..b7162fe9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
 	</scm>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>2.5.6.SEC02</spring.version>
+		<spring.version>3.0.5.RELEASE</spring.version>
 	</properties>
 	<modules>
 		<module>parent</module>
@@ -314,31 +314,6 @@
 					<artifactId>docbkx-maven-plugin</artifactId>
 					<version>2.0.6</version>
 				</plugin>
-				<plugin>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<encoding>${project.build.sourceEncoding}</encoding>
-						<aggregate>true</aggregate>
-						<breakiterator>true</breakiterator>
-						<header>Spring LDAP Framework</header>
-						<quiet>true</quiet>
-						<stylesheetfile>${basedir}/src/main/javadoc/javadoc.css</stylesheetfile>
-						<overview>${basedir}/src/main/javadoc/overview.html</overview>
-						<javadocDirectory>${basedir}/src/main/javadoc</javadocDirectory>
-						<excludePackageNames>org.springframework.ldap.samples:org.springframework.ldap.itest</excludePackageNames>
-						<links>
-							<link>http://download.oracle.com/javase/1.4.2/docs/api</link>
-							<link>http://download.oracle.com/javase/1.5.0/docs/api</link>
-							<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
-							<link>http://logging.apache.org/log4j/1.2/apidocs/</link>
-							<link>http://commons.apache.org/logging/apidocs/</link>
-							<link>http://commons.apache.org/dbcp/apidocs/</link>
-							<link>http://commons.apache.org/pool/apidocs/</link>
-							<link>http://junit.sourceforge.net/javadoc/</link>
-						</links>
-					</configuration>
-				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>versions-maven-plugin</artifactId>
@@ -482,11 +457,32 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</version>
+				<version>2.7</version>
 				<reportSets>
 					<reportSet>
+					<configuration>
+						<encoding>${project.build.sourceEncoding}</encoding>
+						<aggregate>true</aggregate>
+						<breakiterator>true</breakiterator>
+						<header>Spring LDAP Framework</header>
+						<quiet>true</quiet>
+						<stylesheetfile>${basedir}/src/main/javadoc/javadoc.css</stylesheetfile>
+						<overview>${basedir}/src/main/javadoc/overview.html</overview>
+						<javadocDirectory>${basedir}/src/main/javadoc</javadocDirectory>
+						<excludePackageNames>org.springframework.ldap.samples:org.springframework.ldap.itest</excludePackageNames>
+						<links>
+							<link>http://download.oracle.com/javase/1.4.2/docs/api</link>
+							<link>http://download.oracle.com/javase/1.5.0/docs/api</link>
+							<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
+							<link>http://logging.apache.org/log4j/1.2/apidocs/</link>
+							<link>http://commons.apache.org/logging/apidocs/</link>
+							<link>http://commons.apache.org/dbcp/apidocs/</link>
+							<link>http://commons.apache.org/pool/apidocs/</link>
+							<link>http://junit.sourceforge.net/javadoc/</link>
+						</links>
+					</configuration>
 						<reports>
-							<report>javadoc</report>
+							<report>aggregate</report>
 						</reports>
 					</reportSet>
 				</reportSets>
diff --git a/test/integration-tests-openldap/pom.xml b/test/integration-tests-openldap/pom.xml
index 486ee140..27c405ae 100644
--- a/test/integration-tests-openldap/pom.xml
+++ b/test/integration-tests-openldap/pom.xml
@@ -104,8 +104,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.4</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/test/integration-tests-sunone/pom.xml b/test/integration-tests-sunone/pom.xml
index cf47a383..8ef1ecf7 100644
--- a/test/integration-tests-sunone/pom.xml
+++ b/test/integration-tests-sunone/pom.xml
@@ -75,8 +75,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.4</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -84,4 +82,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/test/integration-tests/pom.xml b/test/integration-tests/pom.xml
index ae86f428..7063f05c 100644
--- a/test/integration-tests/pom.xml
+++ b/test/integration-tests/pom.xml
@@ -83,8 +83,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.4</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>