Rolling back r21576

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@21662 71c3de6d-444a-0410-be80-ed276b4c234a

cli/pom.xml

@@ -12,7 +12,6 @@
   <build>
     <plugins>
       <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
@@ -34,6 +33,7 @@
       <plugin>
         <groupId>org.jvnet.localizer</groupId>
         <artifactId>maven-localizer-plugin</artifactId>
+        <version>1.10</version>
         <executions>
           <execution>
             <goals>

core/pom.xml

@@ -43,6 +43,7 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.jvnet.hudson.tools</groupId>
         <artifactId>maven-encoding-plugin</artifactId>
+        <version>1.1</version>
         <executions>
           <execution>
             <goals>
@@ -55,10 +56,20 @@ 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>
@@ -72,7 +83,6 @@ THE SOFTWARE.
         </executions>
       </plugin>
       <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antlr-plugin</artifactId>
         <configuration>
           <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
@@ -117,7 +127,6 @@ THE SOFTWARE.
         </executions>
       </plugin>
       <plugin><!-- set main class -->
-	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -136,6 +145,7 @@ 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>
@@ -183,6 +193,7 @@ 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>
@@ -223,6 +234,7 @@ THE SOFTWARE.
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>findbugs-maven-plugin</artifactId>
+            <version>1.2</version>
             <configuration>
               <effort>Max</effort>
               <threshold>Normal</threshold>
@@ -261,7 +273,6 @@ 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>
@@ -723,7 +734,6 @@ 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>

maven-agent/pom.xml

@@ -42,7 +42,6 @@ THE SOFTWARE.
   <build>
     <plugins>
       <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -54,15 +53,13 @@ THE SOFTWARE.
       </plugin>
       <plugin>
         <!-- compile with 1.2 so that we can report JDK version errors nicely -->
-	<groupId>org.apache.maven.plugins</groupId>
-	<artifactId>maven-compiler-plugin</artifactId>
+        <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>

maven-plugin/pom.xml

@@ -133,14 +133,19 @@ 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>
@@ -157,8 +162,7 @@ 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>

pom.xml

@@ -59,11 +59,47 @@ 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>
@@ -76,7 +112,6 @@ THE SOFTWARE.
         </configuration>
       </plugin>
       <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
         <configuration>
           <!--
@@ -87,7 +122,6 @@ THE SOFTWARE.
         </configuration>
       </plugin>
       <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <inherited>false</inherited>
         <configuration>
@@ -98,8 +132,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>
@@ -117,6 +151,7 @@ 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>
@@ -127,7 +162,6 @@ 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>
@@ -136,7 +170,6 @@ THE SOFTWARE.
       </plugin>
 
       <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
         <executions>
           <execution>
@@ -203,6 +236,7 @@ THE SOFTWARE.
           <plugin>
             <groupId>org.jvnet.sorcerer</groupId>
             <artifactId>maven-sorcerer-plugin</artifactId>
+            <version>0.8</version>
           </plugin>
         </plugins>
       </reporting>
@@ -211,6 +245,7 @@ THE SOFTWARE.
           <plugin>
             <groupId>org.jvnet.sorcerer</groupId>
             <artifactId>maven-sorcerer-plugin</artifactId>
+            <version>0.8</version>
           </plugin>
         </plugins>
       </build>

remoting/pom.xml

@@ -44,6 +44,7 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
+	<version>2.1</version>
         <configuration>
           <threshold>High</threshold>
         </configuration>
@@ -59,8 +60,7 @@ THE SOFTWARE.
         </configuration>
       </plugin>
       <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-	<artifactId>maven-jar-plugin</artifactId>
+        <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
             <manifest>

test/pom.xml

@@ -40,7 +40,6 @@ 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
@@ -61,6 +60,7 @@ 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,7 +201,6 @@ 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>

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,6 +123,7 @@ 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>
@@ -245,6 +246,7 @@ THE SOFTWARE.
           <plugin>
             <groupId>org.jvnet.updatecenter2</groupId>
             <artifactId>maven-makepkgs-plugin</artifactId>
+            <version>0.3</version>
             <executions>
               <execution>
                 <goals>