diff --git a/pom.xml b/pom.xml
index 17c2d7a..b3ebf7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,7 +249,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.7</version>
+                    <version>3.0.0</version>
                     <executions>
                         <execution>
                             <phase>generate-sources</phase>
@@ -1651,7 +1651,7 @@
 
             <dependency>
                 <groupId>org.glassfish.main.ejb</groupId>
-                <artifactId>ejb-container</artifactId>
+                    <artifactId>ejb-container</artifactId>
                 <version>${gf.impl.version}</version>
             </dependency>
             <dependency>
@@ -1945,20 +1945,20 @@
         <checkstyle.version>6.8.1</checkstyle.version>
         <easymock.version>3.3</easymock.version>
         <ejb.version>3.2.3</ejb.version>
-        <gf.impl.version>5.1.0</gf.impl.version>
+        <gf.impl.version>5.0</gf.impl.version>
         <fasterxml.classmate.version>1.3.3</fasterxml.classmate.version>
         <findbugs.glassfish.version>1.7</findbugs.glassfish.version>
         <findbugs.version>3.0.3</findbugs.version>
         <freemarker.version>2.3.27-incubating</freemarker.version>
         <gae.version>1.9.59</gae.version>
         <gpg.mvn.plugin.version>1.6</gpg.mvn.plugin.version>
-        <grizzly.client.version>1.13</grizzly.client.version>
+        <grizzly.client.version>1.16</grizzly.client.version>
         <grizzly2.version>2.4.4</grizzly2.version>
         <guava.version>18.0</guava.version>
         <hamcrest.version>1.3</hamcrest.version>
         <xmlunit.version>1.6</xmlunit.version>
         <hk2.version>2.5.0</hk2.version>
-        <hk2.config.version>5.1.0</hk2.config.version>
+        <hk2.config.version>2.5.0-b56</hk2.config.version>
         <httpclient.version>4.5</httpclient.version> <!-- TODO: 4.5.2 doesn't work; apache client connector tests -->
         <jackson.version>2.9.6</jackson.version>
         <jackson1.version>1.9.13</jackson1.version>