diff --git a/ldif/ldif-batch/pom.xml b/ldif/ldif-batch/pom.xml
index b8968cff..6368db0e 100644
--- a/ldif/ldif-batch/pom.xml
+++ b/ldif/ldif-batch/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.springframework.ldap</groupId>
       <artifactId>spring-ldap-ldif-core</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/ldif/ldif-core/pom.xml b/ldif/ldif-core/pom.xml
index ce5a176c..25d4b3a2 100644
--- a/ldif/ldif-core/pom.xml
+++ b/ldif/ldif-core/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.springframework.ldap</groupId>
       <artifactId>spring-ldap-core</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/odm/pom.xml b/odm/pom.xml
index 345d85eb..b2b3baee 100644
--- a/odm/pom.xml
+++ b/odm/pom.xml
@@ -83,13 +83,13 @@
         <dependency>
             <groupId>org.springframework.ldap</groupId>
             <artifactId>spring-ldap-core</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.ldap</groupId>
             <artifactId>spring-ldap-core-tiger</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>org.springframework.ldap</groupId>
             <artifactId>spring-ldap-test</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1e20a14d..8d878742 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -239,7 +239,7 @@
 							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 						</manifest>
 						<manifestEntries>
-							<Spring-LDAP-Version>${pom.version}</Spring-LDAP-Version>
+							<Spring-LDAP-Version>${project.version}</Spring-LDAP-Version>
 						</manifestEntries>
 					</archive>
 				</configuration>
diff --git a/pom.xml b/pom.xml
index 86ce4a90..85ea4411 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,9 +339,6 @@
 						</links>
 					</configuration>
 				</plugin>
-				<plugin>
-					<artifactId>maven-project-info-reports-plugin</artifactId>
-				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>versions-maven-plugin</artifactId>
@@ -367,7 +364,7 @@
 									<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 								</manifest>
 								<manifestEntries>
-									<Spring-LDAP-Version>${pom.version}</Spring-LDAP-Version>
+									<Spring-LDAP-Version>${project.version}</Spring-LDAP-Version>
 								</manifestEntries>
 							</archive>
 							<descriptors>
@@ -387,7 +384,7 @@
 									<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 								</manifest>
 								<manifestEntries>
-									<Spring-LDAP-Version>${pom.version}</Spring-LDAP-Version>
+									<Spring-LDAP-Version>${project.version}</Spring-LDAP-Version>
 								</manifestEntries>
 							</archive>
 							<descriptors>
@@ -439,7 +436,7 @@
 					<entities>
 						<entity>
 							<name>version</name>
-							<value>${pom.version}</value>
+							<value>${project.version}</value>
 						</entity>
 					</entities>
 					<postProcess>
diff --git a/test/integration-tests/pom.xml b/test/integration-tests/pom.xml
index 62176f68..ae86f428 100644
--- a/test/integration-tests/pom.xml
+++ b/test/integration-tests/pom.xml
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<scope>test</scope>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -57,11 +57,6 @@
 			<version>3.2.6.ga</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
@@ -97,4 +92,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/test/pom.xml b/test/pom.xml
index faf59867..d712e2f5 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -47,7 +47,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <warName>${pom.artifactId}</warName>
+                    <warName>${project.artifactId}</warName>
                 </configuration>
             </plugin>
         </plugins>