diff --git a/hikaricp-java6/pom.xml b/hikaricp-java6/pom.xml
index 019ed5dc..4b3f176b 100644
--- a/hikaricp-java6/pom.xml
+++ b/hikaricp-java6/pom.xml
@@ -40,8 +40,8 @@
 
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <felix.version>5.0.0</felix.version>
       <felix.bundle.plugin.version>2.5.3</felix.bundle.plugin.version>
-      <felix.version>4.6.0</felix.version>
    </properties>
 
    <parent>
@@ -72,7 +72,6 @@
                <mainClass>com.zaxxer.hikari.util.JavassistProxyFactory</mainClass>
                <arguments>
                   <argument>hikaricp-java6</argument>
-                  <argument>com.zaxxer.hikari.util.Java6ConcurrentBag</argument>
                </arguments>
             </configuration>
          </plugin>
diff --git a/hikaricp/pom.xml b/hikaricp/pom.xml
index f84b99bd..cc309780 100644
--- a/hikaricp/pom.xml
+++ b/hikaricp/pom.xml
@@ -40,7 +40,7 @@
 
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <felix.version>4.6.0</felix.version>
+      <felix.version>5.0.0</felix.version>
       <felix.bundle.plugin.version>2.5.3</felix.bundle.plugin.version>
    </properties>
 
@@ -95,7 +95,7 @@
          <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.7.2.201409121644</version>
+            <version>0.7.4.201502262128</version>
             <executions>
                <!-- Prepares the property pointing to the JaCoCo runtime agent which is passed as VM argument when Maven the Surefire plugin is executed. -->
                <execution>
@@ -109,11 +109,7 @@
                      <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
                      <propertyName>surefireArgLine</propertyName>
                      <excludes>
-                        <exclude>**/com/zaxxer/hikari/proxy/ProxyFactory</exclude>
-                        <exclude>**/com/zaxxer/hikari/proxy/ResultSetProxy</exclude>
-                        <exclude>**/com/zaxxer/hikari/proxy/StatementProxy</exclude>
-                        <exclude>**/com/zaxxer/hikari/proxy/CallableStatementProxy</exclude>
-                        <exclude>**/com/zaxxer/hikari/proxy/PreparedStatementProxy</exclude>
+                        <exclude>**/com/zaxxer/hikari/proxy/Hikari*</exclude>
                         <exclude>**/com/zaxxer/hikari/metrics/**</exclude>
                      </excludes>
                   </configuration>
@@ -131,12 +127,8 @@
                      <!-- Sets the output directory for the code coverage report. -->
                      <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
                      <excludes>
-                        <exclude>**/com/zaxxer/hikari/proxy/ProxyFactory.class</exclude>
-                        <exclude>**/com/zaxxer/hikari/proxy/ResultSetProxy.class</exclude>
-                        <exclude>**/com/zaxxer/hikari/proxy/StatementProxy.class</exclude>
-                        <exclude>**/com/zaxxer/hikari/proxy/CallableStatementProxy.class</exclude>
-                        <exclude>**/com/zaxxer/hikari/proxy/PreparedStatementProxy.class</exclude>
-                        <exclude>**/com/zaxxer/hikari/metrics/**</exclude>
+                         <exclude>**/com/zaxxer/hikari/proxy/Hikari*</exclude>
+                         <exclude>**/com/zaxxer/hikari/metrics/**</exclude>
                      </excludes>
                   </configuration>
                </execution>
diff --git a/pom.xml b/pom.xml
index ad54cc60..58e2d62a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
 
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <felix.version>4.6.0</felix.version>
+      <felix.version>5.0.0</felix.version>
       <hibernate.version>4.3.8.Final</hibernate.version>
       <javassist.version>3.18.2-GA</javassist.version>
       <jndi.version>0.11.4.1</jndi.version>