Index: appserver/persistence/cmp/cmp-scripts/pom.xml
===================================================================
--- appserver/persistence/cmp/cmp-scripts/pom.xml	(revision 49745)
+++ appserver/persistence/cmp/cmp-scripts/pom.xml	(working copy)
@@ -93,6 +93,7 @@
                 <artifactId>maven-glassfishbuild-plugin</artifactId>
             </plugin>
         </plugins>
+<!--
         <extensions>
             <extension>
                 <groupId>org.glassfish.build</groupId>
@@ -100,6 +101,7 @@
                 <version>${glassfishbuild.version}</version>
             </extension>
         </extensions>
+-->
     </build>
 
 </project>
Index: appserver/persistence/cmp/pom.xml
===================================================================
--- appserver/persistence/cmp/pom.xml	(revision 49745)
+++ appserver/persistence/cmp/pom.xml	(working copy)
@@ -66,4 +66,13 @@
         <module>cmp-scripts</module>
         <module>cmp-all</module>
     </modules>
+    <build>
+        <extensions>
+            <extension>
+                <groupId>org.glassfish.build</groupId>
+                <artifactId>maven-glassfishbuild-extension</artifactId>
+                <version>${glassfishbuild.version}</version>
+            </extension>
+        </extensions>
+    </build>
 </project>
Index: appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml
===================================================================
--- appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml	(revision 49745)
+++ appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml	(working copy)
@@ -115,6 +115,7 @@
                 <artifactId>maven-glassfishbuild-plugin</artifactId>
             </plugin>
         </plugins>
+<!--
         <extensions>
             <extension>
                 <groupId>org.glassfish.build</groupId>
@@ -122,6 +123,7 @@
                 <version>${glassfishbuild.version}</version>
             </extension>
         </extensions>
+-->
     </build>
 
     <dependencies>
Index: appserver/extras/pom.xml
===================================================================
--- appserver/extras/pom.xml	(revision 49745)
+++ appserver/extras/pom.xml	(working copy)
@@ -61,4 +61,13 @@
         <module>javaee</module>
         <module>appserv-rt</module>
     </modules>
+    <build>
+        <extensions>
+            <extension>
+                <groupId>org.glassfish.build</groupId>
+                <artifactId>maven-glassfishbuild-extension</artifactId>
+                <version>${glassfishbuild.version}</version>
+            </extension>
+        </extensions>
+    </build>
 </project>
Index: appserver/ejb/ejb-timer-databases/pom.xml
===================================================================
--- appserver/ejb/ejb-timer-databases/pom.xml	(revision 49745)
+++ appserver/ejb/ejb-timer-databases/pom.xml	(working copy)
@@ -113,6 +113,7 @@
                 <artifactId>maven-glassfishbuild-plugin</artifactId>
             </plugin>
         </plugins>
+<!--
         <extensions>
             <extension>
                 <groupId>org.glassfish.build</groupId>
@@ -120,6 +121,7 @@
                 <version>${glassfishbuild.version}</version>
             </extension>
         </extensions>
+-->
     </build>
 
     <dependencies>
Index: appserver/ejb/pom.xml
===================================================================
--- appserver/ejb/pom.xml	(revision 49745)
+++ appserver/ejb/pom.xml	(working copy)
@@ -63,4 +63,13 @@
         <module>ejb-timer-databases</module>
         <module>ejb-timer-service-app</module>
     </modules>
+    <build>
+        <extensions>
+            <extension>
+                <groupId>org.glassfish.build</groupId>
+                <artifactId>maven-glassfishbuild-extension</artifactId>
+                <version>${glassfishbuild.version}</version>
+            </extension>
+        </extensions>	
+    </build>
 </project>
Index: pom.xml
===================================================================
--- pom.xml	(revision 49745)
+++ pom.xml	(working copy)
@@ -113,8 +113,8 @@
         <grizzly.version>2.1.2</grizzly.version>
         <jsr181-api.version>1.0-MR1</jsr181-api.version>
         <saaj-api.version>1.3</saaj-api.version>
-        <hk2.version>1.6.18</hk2.version>
-        <hk2.plugin.version>1.6.18</hk2.plugin.version>
+        <hk2.version>1.6.19-SNAPSHOT</hk2.version>
+        <hk2.plugin.version>1.6.19-SNAPSHOT</hk2.plugin.version>
         <trilead-ssh2.version>build212-hudson-6</trilead-ssh2.version>
         <product.name>GlassFish Server Open Source Edition</product.name>
         <abbrev_product_name>glassfish</abbrev_product_name>