From ed6f3a366d8cb0c87720e6bc16257ae968c64cd3 Mon Sep 17 00:00:00 2001
From: jglick <jglick@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Fri, 30 Jul 2010 20:23:44 +0000
Subject: [PATCH] Warnings and one error emitted by Maven 3.0 beta 1.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33417 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/pom.xml         |  9 +++++----
 maven-plugin/pom.xml |  2 +-
 pom.xml              | 40 +++++++++++++++++++++++++++-------------
 remoting/pom.xml     |  6 +++---
 4 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 2682724962..174ac927f4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -57,7 +57,6 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.kohsuke.stapler</groupId>
         <artifactId>maven-stapler-plugin</artifactId>
-        <version>1.15</version>
         <extensions>true</extensions>
         <dependencies>
           <dependency>
@@ -128,13 +127,13 @@ THE SOFTWARE.
                 </tstamp>
                 <property name="build.type" value="private" /> <!-- override for "rc" build -->
                 <pathconvert property="version.rc">
-                  <path path="${version}" />
+                  <path path="${project.version}" />
                   <chainedmapper><flattenmapper /><globmapper from="*-SNAPSHOT" to="*-RC" /></chainedmapper>
                 </pathconvert>
                 <condition property="build.version" value="${version.rc} (${now})">
                   <equals arg1="${build.type}" arg2="rc" />
                 </condition>
-                <property name="build.version" value="${version} (${build.type}-${now}-${user.name})" />
+                <property name="build.version" value="${project.version} (${build.type}-${now}-${user.name})" />
                 <!-- default to release version -->
                 <!-- put the version file -->
                 <echo message="The build id is: ${build.version}" />
@@ -213,7 +212,7 @@ THE SOFTWARE.
       <id>release</id>
       <properties>
         <!-- for releases, just use the POM version. See above ant-run plugin for how this gets used. -->
-        <build.version>${version}</build.version>
+        <build.version>${project.version}</build.version>
       </properties>
       <build>
         <plugins>
@@ -796,6 +795,7 @@ THE SOFTWARE.
       <plugin><!-- generate Jelly tag lib documentation -->
         <groupId>org.kohsuke.stapler</groupId>
         <artifactId>maven-stapler-plugin</artifactId>
+        <version>1.15</version>
         <configuration>
           <patterns>
             <pattern>/lib/.*</pattern>
@@ -804,6 +804,7 @@ THE SOFTWARE.
       </plugin>
       <plugin><!-- skip slow dependency analysis -->
         <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.2</version>
         <configuration>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
         </configuration>
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 99bc700bb1..7f77b8b1fc 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -52,7 +52,7 @@ THE SOFTWARE.
         </dependency>
 
         <dependency>
-          <groupId>${groupId}</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>maven-agent</artifactId>
           <version>${project.version}</version>
         </dependency>
diff --git a/pom.xml b/pom.xml
index df2ce20b9a..0ca51e01fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,26 @@ THE SOFTWARE.
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.6.1</version>
         </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.5</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.2-beta-5</version>
+        </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.4.3</version>
+      </plugin>
         <plugin>
           <!--
             Both test harness and core uses stapler as an extension,
@@ -137,16 +157,6 @@ THE SOFTWARE.
           <remoteTagging>true</remoteTagging><!-- work around http://jira.codehaus.org/browse/SCM-406 -->
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <configuration>
-          <!--
-            *.html files are in UTF-8, and *.properties are in iso-8859-1, so this configuration is acturally incorrect,
-            but this suppresses a warning from Maven, and as long as we don't do filtering we should be OK.
-          -->
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
         <version>1.0</version>
@@ -177,9 +187,10 @@ THE SOFTWARE.
         </configuration>
       </plugin>
 
-      <plugin><!-- we specify this in the parent POM, so this is redundant, but otherwise IntelliJ is unhappy -->
+      <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
+        <version>2.3.1</version>
+        <configuration><!-- we specify this in the parent POM, so this is redundant, but otherwise IntelliJ is unhappy -->
           <source>1.5</source>
           <target>1.5</target>
         </configuration>
@@ -241,6 +252,9 @@ THE SOFTWARE.
   <properties>
     <maven.version>2.0.9</maven.version>
     <maven.embedder.version>2.0.4</maven.embedder.version>
+    <!-- *.html files are in UTF-8, and *.properties are in iso-8859-1, so this configuration is acturally incorrect,
+    but this suppresses a warning from Maven, and as long as we don't do filtering we should be OK. -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
   <profiles>
@@ -323,7 +337,7 @@ THE SOFTWARE.
                 </goals>
                 <phase>package</phase>
                 <configuration>
-                  <finalName>hudson-${version}</finalName>
+                  <finalName>hudson-${project.version}</finalName>
                   <descriptors>
                     <descriptor>assembly-src.xml</descriptor>
                   </descriptors>
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 1befa4e9d0..4fcee5ec71 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -105,13 +105,13 @@ THE SOFTWARE.
                 </tstamp>
                 <property name="build.type" value="private" /> <!-- override for "rc" build -->
                 <pathconvert property="version.rc">
-                  <path path="${version}" />
+                  <path path="${project.version}" />
                   <chainedmapper><flattenmapper /><globmapper from="*-SNAPSHOT" to="*-RC" /></chainedmapper>
                 </pathconvert>
                 <condition property="build.version" value="${version.rc} (${now})">
                   <equals arg1="${build.type}" arg2="rc" />
                 </condition>
-                <property name="build.version" value="${version} (${build.type}-${now}-${user.name})" />
+                <property name="build.version" value="${project.version} (${build.type}-${now}-${user.name})" />
                 <!-- default to release version -->
                 <!-- put the version file -->
                 <mkdir dir="target/classes/hudson/remoting" />
@@ -178,7 +178,7 @@ THE SOFTWARE.
       <id>release</id>
       <properties>
         <!-- for releases, just use the POM version. See above ant-run plugin for how this gets used. -->
-        <build.version>${version}</build.version>
+        <build.version>${project.version}</build.version>
       </properties>
     </profile>
   </profiles>
-- 
GitLab