diff --git a/all/pom.xml b/all/pom.xml
index cdf008afcc..e588c9e68a 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -33,34 +33,6 @@
     <packaging>pom</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-lang</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-config-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-config-ogdl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-crypto-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-crypto-hash</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-crypto-cipher</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-event</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
diff --git a/cache/pom.xml b/cache/pom.xml
index 2b316708aa..7e91a15c6f 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -29,27 +29,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shiro-cache</artifactId>
     <name>Apache Shiro :: Cache</name>
-    <packaging>bundle</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.apache.shiro.cache</Bundle-SymbolicName>
-                        <Export-Package>org.apache.shiro.cache*;version=${project.version}</Export-Package>
-                        <Import-Package>
-                            org.apache.shiro*;version="${shiro.osgi.importRange}",
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
     <dependencies>
         <dependency>
diff --git a/config/core/pom.xml b/config/core/pom.xml
index 643a45f1bf..b548f5c478 100644
--- a/config/core/pom.xml
+++ b/config/core/pom.xml
@@ -30,28 +30,6 @@
     <artifactId>shiro-config-core</artifactId>
     <name>Apache Shiro :: Configuration :: Core</name>
 
-    <packaging>bundle</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.apache.shiro.config.core</Bundle-SymbolicName>
-                        <Export-Package>org.apache.shiro.config*;version=${project.version}</Export-Package>
-                        <Import-Package>
-                            org.apache.shiro*;version="${shiro.osgi.importRange}",
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.shiro</groupId>
diff --git a/config/ogdl/pom.xml b/config/ogdl/pom.xml
index 9dc88859c7..5e062da870 100644
--- a/config/ogdl/pom.xml
+++ b/config/ogdl/pom.xml
@@ -31,7 +31,6 @@
     <name>Apache Shiro :: Configuration :: OGDL</name>
     <description>Support for Shiro's Object Graph Definition Language (mostly used in Ini configuration) where
         declared name/value pairs are interpreted to create an object graph</description>
-    <packaging>bundle</packaging>
 
     <build>
         <plugins>
@@ -47,21 +46,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.apache.shiro.config.core</Bundle-SymbolicName>
-                        <Export-Package>org.apache.shiro.config*;version=${project.version}</Export-Package>
-                        <Import-Package>
-                            org.apache.shiro*;version="${shiro.osgi.importRange}",
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/core/pom.xml b/core/pom.xml
index 6761d26cd3..f4be55b047 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -55,7 +55,6 @@
                         <Export-Package>org.apache.shiro*;version=${project.version}</Export-Package>
                         <Import-Package>
                             org.apache.shiro*;version="${shiro.osgi.importRange}",
-                            org.apache.commons.beanutils*;resolution:=optional,
                             *
                         </Import-Package>
                     </instructions>
@@ -93,6 +92,14 @@
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-event</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
diff --git a/crypto/cipher/pom.xml b/crypto/cipher/pom.xml
index e64d75173f..c9955e5bd0 100644
--- a/crypto/cipher/pom.xml
+++ b/crypto/cipher/pom.xml
@@ -29,27 +29,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shiro-crypto-cipher</artifactId>
     <name>Apache Shiro :: Cryptography :: Ciphers</name>
-    <packaging>bundle</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.apache.shiro.crypto.cipher</Bundle-SymbolicName>
-                        <Export-Package>org.apache.shiro.crypto.*;version=${project.version}</Export-Package>
-                        <Import-Package>
-                            org.apache.shiro.crypto**;version="${shiro.osgi.importRange}",
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
     <dependencies>
         <dependency>
diff --git a/crypto/core/pom.xml b/crypto/core/pom.xml
index 5592f46b98..982c34d54e 100644
--- a/crypto/core/pom.xml
+++ b/crypto/core/pom.xml
@@ -29,27 +29,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shiro-crypto-core</artifactId>
     <name>Apache Shiro :: Cryptography :: Core</name>
-    <packaging>bundle</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.apache.shiro.crypto.core</Bundle-SymbolicName>
-                        <Export-Package>org.apache.shiro.crypto*;version=${project.version}</Export-Package>
-                        <Import-Package>
-                            org.apache.shiro.crypto*;version="${shiro.osgi.importRange}",
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
     <dependencies>
         <dependency>
diff --git a/crypto/hash/pom.xml b/crypto/hash/pom.xml
index 4944d20ad3..8bd435a043 100644
--- a/crypto/hash/pom.xml
+++ b/crypto/hash/pom.xml
@@ -29,27 +29,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shiro-crypto-hash</artifactId>
     <name>Apache Shiro :: Cryptography :: Hashing</name>
-    <packaging>bundle</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.apache.shiro.crypto.hash</Bundle-SymbolicName>
-                        <Export-Package>org.apache.shiro.crypto.hash*;version=${project.version}</Export-Package>
-                        <Import-Package>
-                            org.apache.shiro.crypto.core*;version="${shiro.osgi.importRange}",
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
     <dependencies>
         <dependency>
diff --git a/event/pom.xml b/event/pom.xml
index c08d56c804..8333031eb8 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -29,27 +29,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shiro-event</artifactId>
     <name>Apache Shiro :: Event</name>
-    <packaging>bundle</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.apache.shiro.event</Bundle-SymbolicName>
-                        <Export-Package>org.apache.shiro.event*;version=${project.version}</Export-Package>
-                        <Import-Package>
-                            org.apache.shiro*;version="${shiro.osgi.importRange}",
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
     <dependencies>
         <dependency>
diff --git a/integration-tests/support/pom.xml b/integration-tests/support/pom.xml
index 789d72a419..0c2f75fdb6 100644
--- a/integration-tests/support/pom.xml
+++ b/integration-tests/support/pom.xml
@@ -30,16 +30,6 @@
 	<name>Apache Shiro :: ITs :: Support</name>
 
 	<dependencies>
-	    <dependency>
-	        <groupId>javax.servlet</groupId>
-	        <artifactId>jstl</artifactId>
-			<scope>compile</scope>
-	    </dependency>
-	    <dependency>
-	        <groupId>javax.servlet</groupId>
-	        <artifactId>javax.servlet-api</artifactId>
-	        <scope>provided</scope>
-	    </dependency>
 	    <dependency>
 	        <groupId>org.slf4j</groupId>
 	        <artifactId>slf4j-log4j12</artifactId>
@@ -61,17 +51,6 @@
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>apache-jsp</artifactId>
-            <version>${jetty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>apache-jstl</artifactId>
-            <version>${jetty.version}</version>
-            <type>pom</type>
-        </dependency>
         <dependency>
             <groupId>com.github.mjeanroy</groupId>
             <artifactId>junit-servers-jetty</artifactId>
diff --git a/lang/pom.xml b/lang/pom.xml
index 6787ee7989..416539c851 100644
--- a/lang/pom.xml
+++ b/lang/pom.xml
@@ -34,7 +34,6 @@
         The lang module encapsulates only language-specific utilities that are used by various
         other modules.  It exists to augment what we would have liked to see in the JDK but does not exist.
     </description>
-    <packaging>bundle</packaging>
 
     <dependencies>
 
@@ -52,27 +51,4 @@
             <artifactId>log4j</artifactId>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.apache.shiro.lang</Bundle-SymbolicName>
-                        <Export-Package>org.apache.shiro.*;version=${project.version}</Export-Package>
-                        <!-- javax.servlet.jsp* marked as optional per SHIRO-390: -->
-                        <Import-Package>
-                            org.apache.shiro*;version="${shiro.osgi.importRange}",
-                            javax.servlet.jsp*;resolution:=optional,
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/pom.xml b/pom.xml
index 10527df22e..967877c6ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,7 +229,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -555,6 +555,37 @@
                     <serverId>apache.releases.https</serverId>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                  <execution>
+                    <id>enforce-ban-duplicate-classes</id>
+                    <goals>
+                      <goal>enforce</goal>
+                    </goals>
+                    <configuration>
+                      <rules>
+                        <banDuplicateClasses>
+                          <findAllDuplicates>true</findAllDuplicates>
+                          <scopes>
+                              <scope>compile</scope>
+                          </scopes>
+                        </banDuplicateClasses>
+                      </rules>
+                      <fail>true</fail>
+                    </configuration>
+                  </execution>
+                </executions>
+                <dependencies>
+                  <dependency>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>extra-enforcer-rules</artifactId>
+                    <version>1.0-beta-6</version>
+                  </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
     </build>
 
@@ -618,6 +649,40 @@
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-core</artifactId>
                 <version>1.4.1-SNAPSHOT</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.shiro</groupId>
+                        <artifactId>shiro-config-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.shiro</groupId>
+                        <artifactId>shiro-config-ogdl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.shiro</groupId>
+                        <artifactId>shiro-lang</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.shiro</groupId>
+                        <artifactId>shiro-event</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.shiro</groupId>
+                        <artifactId>shiro-crypto-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.shiro</groupId>
+                        <artifactId>shiro-crypto-cipher</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.shiro</groupId>
+                        <artifactId>shiro-crypto-hash</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.shiro</groupId>
+                        <artifactId>shiro-cache</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.shiro</groupId>
@@ -752,6 +817,13 @@
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>${junit.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- Hamcrest 2+ uses a different artifactId -->
+                        <groupId>org.hamcrest</groupId>
+                        <artifactId>hamcrest-core</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <!-- used for the 'hashpass' command line tool: -->
diff --git a/samples/quickstart-guice/pom.xml b/samples/quickstart-guice/pom.xml
index 4ec41925dd..4485f3a3f9 100644
--- a/samples/quickstart-guice/pom.xml
+++ b/samples/quickstart-guice/pom.xml
@@ -61,6 +61,10 @@
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-guice</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
 
         <!-- configure logging -->
         <dependency>
diff --git a/samples/quickstart/pom.xml b/samples/quickstart/pom.xml
index 9441eece03..1c36dfcac2 100644
--- a/samples/quickstart/pom.xml
+++ b/samples/quickstart/pom.xml
@@ -61,6 +61,10 @@
         </dependency>
 
         <!-- configure logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml
index d4bbd93d99..fc11275770 100644
--- a/support/aspectj/pom.xml
+++ b/support/aspectj/pom.xml
@@ -38,11 +38,15 @@
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
+            <artifactId>aspectjweaver</artifactId>
         </dependency>
+         <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+         </dependency>
         <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <!-- Test dependencies -->
         <dependency>
diff --git a/support/ehcache/pom.xml b/support/ehcache/pom.xml
index 32c6f28ea4..ad6563f5bd 100644
--- a/support/ehcache/pom.xml
+++ b/support/ehcache/pom.xml
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-cache</artifactId>
+            <artifactId>shiro-core</artifactId>
         </dependency>
         <dependency>
             <groupId>net.sf.ehcache</groupId>
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index 159058ccfa..4819a6c97b 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -54,6 +54,10 @@
             <artifactId>guice-servlet</artifactId>
             <optional>true</optional>
         </dependency>
+         <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
diff --git a/support/hazelcast/pom.xml b/support/hazelcast/pom.xml
index 84d1eb2602..49e1bde672 100644
--- a/support/hazelcast/pom.xml
+++ b/support/hazelcast/pom.xml
@@ -38,7 +38,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-cache</artifactId>
+            <artifactId>shiro-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.hazelcast</groupId>
diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml
index 7a8e07e119..8a110c1d64 100644
--- a/support/quartz/pom.xml
+++ b/support/quartz/pom.xml
@@ -40,6 +40,10 @@
             <groupId>org.opensymphony.quartz</groupId>
             <artifactId>quartz</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
index 697380fec8..4709148ea6 100644
--- a/test-coverage/pom.xml
+++ b/test-coverage/pom.xml
@@ -32,38 +32,10 @@
     <packaging>pom</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-lang</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-event</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-config-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-config-ogdl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-crypto-cipher</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-crypto-hash</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-crypto-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-web</artifactId>
@@ -79,12 +51,14 @@
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-cas</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-cache</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-ehcache</artifactId>
@@ -97,6 +71,12 @@
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-guice</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>aopalliance</groupId>
+                    <artifactId>aopalliance</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
diff --git a/web/pom.xml b/web/pom.xml
index 61fab4f7a6..88679b54ad 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -62,6 +62,10 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>