From db8695be1b558090d20255b8e046f53dfde3d80e Mon Sep 17 00:00:00 2001
From: Stephen Connolly <stephen.alan.connolly@gmail.com>
Date: Mon, 4 Jul 2011 22:05:54 +0100
Subject: [PATCH] remove use of antrun from core (now have another plugin fix
 required (hpi))

---
 core/pom.xml                                  | 71 +++++++++----------
 .../hudson/model/hudson-version.properties    |  1 +
 .../jenkins/model/jenkins-version.properties  |  1 +
 pom.xml                                       |  2 +-
 4 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 core/src/main/resources/hudson/model/hudson-version.properties
 create mode 100644 core/src/main/resources/jenkins/model/jenkins-version.properties

diff --git a/core/pom.xml b/core/pom.xml
index e4f5e0b7dc..e94000b7a5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -510,6 +510,24 @@ THE SOFTWARE.
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+        <filtering>false</filtering>
+        <excludes>
+          <exclude>hudson/model/hudson-version.properties</exclude>
+          <exclude>jenkins/model/jenkins-version.properties</exclude>
+        </excludes>
+      </resource>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>hudson/model/hudson-version.properties</include>
+          <include>jenkins/model/jenkins-version.properties</include>
+        </includes>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.jenkins-ci.tools</groupId>
@@ -613,43 +631,28 @@ THE SOFTWARE.
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
-        <artifactId>maven-antrun-extended-plugin</artifactId>
-        <!-- version specified in grandparent pom -->
+        <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
+            <id>winsw</id>
             <phase>generate-resources</phase>
-            <configuration>
-              <tasks>
-                <tstamp>
-                  <format property="now" pattern="MM/dd/yyyy HH:mm" unit="hour" />
-                </tstamp>
-                <property name="build.type" value="private" /> <!-- override for "rc" build -->
-                <pathconvert property="version.rc">
-                  <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="${project.version} (${build.type}-${now}-${user.name})" />
-                <!-- default to release version -->
-                <!-- put the version file -->
-                <echo message="The build id is: ${build.version}" />
-                <mkdir dir="target/classes/hudson/model" />
-                <echo file="target/classes/hudson/model/hudson-version.properties">version=${build.version}
-                </echo>
-                <mkdir dir="target/classes/jenkins/model" />
-                <echo file="target/classes/jenkins/model/jenkins-version.properties">version=${build.version}
-                </echo>
-                <!-- download winsw.exe -->
-                <mkdir dir="target/classes/windows-service" />
-                <resolveArtifact artifactId="winsw" tofile="target/classes/windows-service/jenkins.exe" />
-              </tasks>
-            </configuration>
             <goals>
-              <goal>run</goal>
+              <!-- we use copy as this is a dependency from outside the reactor -->
+              <goal>copy</goal>
             </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>com.sun.winsw</groupId>
+                  <artifactId>winsw</artifactId>
+                  <version>1.10</version>
+                  <classifier>bin</classifier>
+                  <type>exe</type>
+                  <outputDirectory>${project.build.outputDirectory}/windows-service</outputDirectory>
+                  <destFileName>jenkins.exe</destFileName>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -700,10 +703,6 @@ THE SOFTWARE.
     </profile>
     <profile>
       <id>release</id>
-      <properties>
-        <!-- for releases, just use the POM version. See above ant-run plugin for how this gets used. -->
-        <build.version>${project.version}</build.version>
-      </properties>
       <build>
         <plugins>
           <plugin><!-- execute apt:process for "Extension points" Wiki page generation -->
diff --git a/core/src/main/resources/hudson/model/hudson-version.properties b/core/src/main/resources/hudson/model/hudson-version.properties
new file mode 100644
index 0000000000..9b9343d10d
--- /dev/null
+++ b/core/src/main/resources/hudson/model/hudson-version.properties
@@ -0,0 +1 @@
+version=${build.version}
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/model/jenkins-version.properties b/core/src/main/resources/jenkins/model/jenkins-version.properties
new file mode 100644
index 0000000000..9b9343d10d
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/jenkins-version.properties
@@ -0,0 +1 @@
+version=${build.version}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3a1dd0d9c1..bbebbb3748 100644
--- a/pom.xml
+++ b/pom.xml
@@ -377,7 +377,7 @@ THE SOFTWARE.
         <plugin>
           <groupId>org.jenkins-ci.tools</groupId>
           <artifactId>maven-hpi-plugin</artifactId>
-          <version>1.72</version>
+          <version>1.73-SNAPSHOT</version>
         </plugin>
       </plugins>
     </pluginManagement>
-- 
GitLab