diff --git a/cli/pom.xml b/cli/pom.xml
index 201bd8cfeff24525939d5a2c1fe98d1d96b8d0a8..80ba8857ffb5cfccc6e81a4739ae211bc48b9922 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -12,6 +12,7 @@
   <build>
     <plugins>
       <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
@@ -33,7 +34,6 @@
       <plugin>
         <groupId>org.jvnet.localizer</groupId>
         <artifactId>maven-localizer-plugin</artifactId>
-        <version>1.10</version>
         <executions>
           <execution>
             <goals>
diff --git a/core/pom.xml b/core/pom.xml
index dd7e03c597fab473727cfb71757164cce85e8501..636bea2e9a805b7163cd8afb8363e6db4e79c1ed 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -43,7 +43,6 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.jvnet.hudson.tools</groupId>
         <artifactId>maven-encoding-plugin</artifactId>
-        <version>1.1</version>
         <executions>
           <execution>
             <goals>
@@ -56,20 +55,10 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.kohsuke.stapler</groupId>
         <artifactId>maven-stapler-plugin</artifactId>
-        <version>1.12</version>
-        <extensions>true</extensions>
-        <dependencies>
-          <dependency>
-            <groupId>org.jvnet.maven-jellydoc-plugin</groupId>
-            <artifactId>maven-jellydoc-plugin</artifactId>
-            <version>1.4</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.jvnet.localizer</groupId>
         <artifactId>maven-localizer-plugin</artifactId>
-        <version>1.10</version>
         <executions>
           <execution>
             <goals>
@@ -83,6 +72,7 @@ THE SOFTWARE.
         </executions>
       </plugin>
       <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antlr-plugin</artifactId>
         <configuration>
           <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
@@ -127,6 +117,7 @@ THE SOFTWARE.
         </executions>
       </plugin>
       <plugin><!-- set main class -->
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -145,7 +136,6 @@ THE SOFTWARE.
         -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>apt-maven-plugin</artifactId>
-        <version>1.0-alpha-2</version>
         <configuration>
           <force>true</force><!-- disable staleness check -->
           <factory>org.jvnet.hudson.tools.ExtensionPointListerFactory</factory>
@@ -193,7 +183,6 @@ THE SOFTWARE.
           <plugin><!-- execute apt:process for "Extension points" Wiki page generation -->
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>apt-maven-plugin</artifactId>
-            <version>1.0-alpha-2</version>
             <executions>
               <execution>
                 <goals>
@@ -234,7 +223,6 @@ THE SOFTWARE.
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>findbugs-maven-plugin</artifactId>
-            <version>1.2</version>
             <configuration>
               <effort>Max</effort>
               <threshold>Normal</threshold>
@@ -273,6 +261,7 @@ THE SOFTWARE.
           </plugin>
           <plugin>
             <!-- unit tests are run by GMaven through Ant. -->
+	    <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <skipTests>true</skipTests>
@@ -734,6 +723,7 @@ THE SOFTWARE.
         </configuration>
       </plugin>
       <plugin><!-- skip slow dependency analysis -->
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml
index 2068d26efddd844670edaab6eb0773b8c8c8ea35..e968d9936ca73c27cbdc06b757c2fb1fbf21fd9a 100644
--- a/maven-agent/pom.xml
+++ b/maven-agent/pom.xml
@@ -42,6 +42,7 @@ THE SOFTWARE.
   <build>
     <plugins>
       <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -53,13 +54,15 @@ THE SOFTWARE.
       </plugin>
       <plugin>
         <!-- compile with 1.2 so that we can report JDK version errors nicely -->
-        <artifactId>maven-compiler-plugin</artifactId>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.2</source>
           <target>1.2</target>
         </configuration>
       </plugin>
       <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <forkMode>never</forkMode>
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 52770c717c744439f5fc80a0c616c347e75b9589..f8218116bb45ac704c2b087cb49bd4f742c990de 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -133,19 +133,14 @@ THE SOFTWARE.
             <plugin>
                 <groupId>org.jvnet.hudson.tools</groupId>
                 <artifactId>maven-hpi-plugin</artifactId>
-                <version>1.31</version>
-                <extensions>true</extensions>
             </plugin>
             <plugin>
                 <groupId>org.kohsuke.stapler</groupId>
                 <artifactId>maven-stapler-plugin</artifactId>
-                <version>1.11</version>
-                <extensions>true</extensions>
             </plugin>
             <plugin>
                 <groupId>org.jvnet.localizer</groupId>
                 <artifactId>maven-localizer-plugin</artifactId>
-                <version>1.8</version>
                 <executions>
                     <execution>
                         <goals>
@@ -162,7 +157,8 @@ THE SOFTWARE.
                 <!--
                   javadoc plugin 2.3 apparently interferes with the release process,
                   so sticking to 2.2 (http://www.nabble.com/description-setting-plugin-tp14846399p14950047.html)
-                -->
+		-->
+		<groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.2</version>
             </plugin>
diff --git a/pom.xml b/pom.xml
index 4b4039ef2d3d989efca03f881011400543f8877d..e9c3784e90bc93d8b16cecca4309e255a674dfaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,47 +59,11 @@ THE SOFTWARE.
 
   <build>
     <defaultGoal>install</defaultGoal>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.kohsuke.gmaven</groupId>
-          <artifactId>gmaven-plugin</artifactId>
-          <version>1.0-rc-5-patch-2</version>
-          <dependencies>
-            <dependency><!-- this needs to be visible to Ant inside GMaven, so has to be a plugin dependency -->
-              <groupId>org.apache.ant</groupId>
-              <artifactId>ant-junit</artifactId>
-              <version>1.7.0</version>
-            </dependency>
-            <dependency>
-              <groupId>net.sourceforge.cobertura</groupId>
-              <artifactId>cobertura</artifactId>
-              <version>1.9</version>
-            </dependency>
-            <dependency>
-              <!-- this provided scope dependency doesn't get added to GMaven unless explicitly added here -->
-              <groupId>javax.servlet</groupId>
-              <artifactId>servlet-api</artifactId>
-              <version>2.4</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
-          <artifactId>maven-antrun-extended-plugin</artifactId>
-          <version>1.39</version>
-        </plugin>
-	<plugin>
-	  <artifactId>maven-javadoc-plugin</artifactId>
-	  <version>2.5</version>
-	</plugin>
-      </plugins>
-    </pluginManagement>
     
     <plugins>
       <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-9</version>
         <configuration>
           <!-- enable release profile during the release, create IPS package, and sign bits. -->
           <prepareVerifyArgs>-P release,ips,sign</prepareVerifyArgs>
@@ -112,6 +76,7 @@ THE SOFTWARE.
         </configuration>
       </plugin>
       <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
         <configuration>
           <!--
@@ -122,6 +87,7 @@ THE SOFTWARE.
         </configuration>
       </plugin>
       <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <inherited>false</inherited>
         <configuration>
@@ -132,8 +98,8 @@ THE SOFTWARE.
         </configuration>
       </plugin>
       <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.0</version>
         <executions>
           <execution>
             <goals>
@@ -151,7 +117,6 @@ THE SOFTWARE.
         <!-- make sure our code doesn't have 1.6 dependencies except where we know it -->
         <groupId>org.jvnet</groupId>
         <artifactId>animal-sniffer</artifactId>
-        <version>1.2</version>
         <configuration>
           <signature>
             <groupId>org.jvnet.animal-sniffer</groupId>
@@ -162,6 +127,7 @@ THE SOFTWARE.
       </plugin>
 
       <plugin><!-- we specify this in the parent POM, so this is redundant, but otherwise IntelliJ is unhappy -->
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.5</source>
@@ -170,6 +136,7 @@ THE SOFTWARE.
       </plugin>
 
       <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
         <executions>
           <execution>
@@ -236,7 +203,6 @@ THE SOFTWARE.
           <plugin>
             <groupId>org.jvnet.sorcerer</groupId>
             <artifactId>maven-sorcerer-plugin</artifactId>
-            <version>0.8</version>
           </plugin>
         </plugins>
       </reporting>
@@ -245,7 +211,6 @@ THE SOFTWARE.
           <plugin>
             <groupId>org.jvnet.sorcerer</groupId>
             <artifactId>maven-sorcerer-plugin</artifactId>
-            <version>0.8</version>
           </plugin>
         </plugins>
       </build>
diff --git a/remoting/pom.xml b/remoting/pom.xml
index ebe1abcd4e80235bd27946ff8f59523427e0a531..d9a5eb9cc04e965f497b7c82ef7ffae50024c06f 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -44,7 +44,6 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-	<version>2.1</version>
         <configuration>
           <threshold>High</threshold>
         </configuration>
@@ -60,7 +59,8 @@ THE SOFTWARE.
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
             <manifest>
diff --git a/test/pom.xml b/test/pom.xml
index d50ecb9f2be46aa86d8fd586297b26f15b2232c5..5e580c7baef2ab74c5ea21e1d901c2ec910fc00e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -40,6 +40,7 @@ THE SOFTWARE.
   <build>
     <plugins>
       <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <!-- override with -DforkMode=pertest if you have "unable to create thread problems" on Windows
@@ -60,7 +61,6 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.codehaus.groovy.maven</groupId>
         <artifactId>gmaven-plugin</artifactId>
-        <version>1.0-rc-5</version>
         <executions>
           <execution>
             <id>preset-packager</id>
@@ -201,6 +201,7 @@ THE SOFTWARE.
           </plugin>
           <plugin>
             <!-- unit tests are run by GMaven through Ant. -->
+	    <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <skipTests>true</skipTests>
diff --git a/war/pom.xml b/war/pom.xml
index e9392f18f9e5860df0dee218acab9d4a54deecf8..fdd3903a93ecfe9f509101c78038dc6cfa15151b 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -45,8 +45,8 @@ THE SOFTWARE.
     
     <plugins>
       <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.0</version>
         <configuration>
           <webResources>
             <resource>
@@ -123,7 +123,6 @@ THE SOFTWARE.
         <!-- this is really just a patched version of maven-jetty-plugin to workaround issue #932 -->
         <groupId>org.jvnet.hudson.tools</groupId>
         <artifactId>maven-hudson-dev-plugin</artifactId>
-        <version>6.1.7</version>
         <configuration>
           <contextPath>${contextPath}</contextPath>
           <connectors>
@@ -246,7 +245,6 @@ THE SOFTWARE.
           <plugin>
             <groupId>org.jvnet.updatecenter2</groupId>
             <artifactId>maven-makepkgs-plugin</artifactId>
-            <version>0.3</version>
             <executions>
               <execution>
                 <goals>