diff --git a/core/pom.xml b/core/pom.xml
index 30d415a..b640001 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -11,10 +11,6 @@
 		<version>0.7.0.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<properties>
-		<spring.version>2.5.6.SEC01</spring.version>
-	</properties>
-
 	<dependencies>
 	
 		<dependency>
diff --git a/core/template.mf b/core/template.mf
index b05008b..43ef5a6 100644
--- a/core/template.mf
+++ b/core/template.mf
@@ -7,4 +7,5 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Template: 
  ${project.artifactId}.*;version="${project.version}"
 Import-Template: 
- org.springframework.*;version="${spring.version:[=.=.=.=,+2.0.0)}"
+ org.springframework.*;version="${spring.version:[=.=.=.=,+2.0.0)}",
+ org.w3c.dom.*;version="0.0.0"
diff --git a/metadata/pom.xml b/metadata/pom.xml
index b61bdf6..62b106a 100644
--- a/metadata/pom.xml
+++ b/metadata/pom.xml
@@ -18,11 +18,11 @@
 			<version>${project.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.4</version>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>commons-lang</groupId>-->
+<!--			<artifactId>commons-lang</artifactId>-->
+<!--			<version>2.4</version>-->
+<!--		</dependency>-->
 	</dependencies>
 
 </project>
diff --git a/metadata/src/main/java/org/synyx/hera/metadata/SimplePluginMetadata.java b/metadata/src/main/java/org/synyx/hera/metadata/SimplePluginMetadata.java
index 1667c27..172e46f 100644
--- a/metadata/src/main/java/org/synyx/hera/metadata/SimplePluginMetadata.java
+++ b/metadata/src/main/java/org/synyx/hera/metadata/SimplePluginMetadata.java
@@ -16,8 +16,7 @@
 
 package org.synyx.hera.metadata;
 
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
+import static org.springframework.util.ObjectUtils.*;
 
 
 /**
@@ -86,15 +85,18 @@ public class SimplePluginMetadata implements PluginMetadata {
     @Override
     public boolean equals(Object obj) {
 
+        if (this == obj) {
+            return true;
+        }
+
         if (!(obj instanceof PluginMetadata)) {
             return false;
         }
 
         PluginMetadata that = (PluginMetadata) obj;
 
-        boolean sameName = StringUtils.equals(this.getName(), that.getName());
-        boolean sameVersion =
-                StringUtils.equals(this.getName(), that.getName());
+        boolean sameName = nullSafeEquals(this.getName(), that.getName());
+        boolean sameVersion = nullSafeEquals(this.getName(), that.getName());
 
         return sameName && sameVersion;
     }
@@ -108,6 +110,6 @@ public class SimplePluginMetadata implements PluginMetadata {
     @Override
     public int hashCode() {
 
-        return ObjectUtils.hashCode(name) + ObjectUtils.hashCode(version);
+        return nullSafeHashCode(name) + nullSafeHashCode(version);
     }
 }
diff --git a/metadata/template.mf b/metadata/template.mf
index 56aae70..edda40a 100644
--- a/metadata/template.mf
+++ b/metadata/template.mf
@@ -5,15 +5,7 @@ Bundle-Vendor: Synyx GmbH & Co. KG
 Bundle-Version: ${project.version}
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Template: 
- org.synyx.hades.*;version="${project.version}"
+ ${project.artifactId}.*;version="${project.version}"
 Import-Template: 
- javax.persistence.*;version="[1.0.0,1.1.0)", 
- org.aopalliance.*;version="[1.0.0,2.0.0)", 
- org.apache.commons.logging.*;version="[1.1.0,1.2.0)",
- org.aspectj.lang.*;version="[1.6.0,1.7.0)",
- org.eclipse.persistence.*;version="[1.0.0,1.2.0)";resolution:=optional,
- org.hibernate.*;version="[3.2.0,3.4.0)";resolution:=optional,
- org.apache.openjpa.*;version="[1.2.1,2.0.0)";resolution:=optional, 
- org.joda.time.*;version="[1.5.0,2.0.0)",
- org.springframework.*;version="[2.5.0,4.0.0)",
- org.w3c.dom.*;version="0.0.0"
+ org.synyx.hera.core.*;version="${project.version:[=.=.=.=,+1.0.0)}",
+ org.springframework.*;version="${spring.version:[=.=.=.=,+2.0.0)}"
diff --git a/pom.xml b/pom.xml
index 764db93..3a84d2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,10 @@
         <module>core</module>
         <module>metadata</module>
     </modules>
+    
+    <properties>
+        <spring.version>2.5.6.SEC02</spring.version>
+    </properties>
 
     <developers>
         <developer>
@@ -160,6 +164,9 @@
 						<phase>process-classes</phase>
 					</execution>
 				</executions>
+                <configuration>
+                    <failOnWarnings>true</failOnWarnings>
+                </configuration>
      		</plugin>
 
             <plugin>