- Bundling ssh-slaves out of the box to improve the distributed build experience.

- Modified the use of the antrun plugin so that things like Winstone don't need to use <scope>provided</scope> hack.

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

war/pom.xml

@@ -70,7 +70,7 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
         <artifactId>maven-antrun-extended-plugin</artifactId>
-        <version>1.36</version>
+        <version>1.39</version>
         <executions>
           <execution>
             <id>package</id>
@@ -92,11 +92,12 @@ THE SOFTWARE.
               <goal>run</goal>
             </goals>
             <configuration>
+              <verifyArtifact>false</verifyArtifact>
               <tasks>
                 <mkdir dir="target/generated-resources" />
 
                 <!-- put executable war header -->
-                <resolveArtifact artifactId="executable-war" property="executable-war.jar" />
+                <resolveArtifact groupId="org.jvnet.hudson" artifactId="executable-war" version="1.8" type="jar" property="executable-war.jar" />
                 <unjar src="${executable-war.jar}" dest="target/generated-resources">
                   <patternset>
                     <include name="**/*.class" />
@@ -106,11 +107,14 @@ THE SOFTWARE.
                 <!-- dependencies that goes to unusual locations -->
                 <resolveArtifact artifactId="remoting" tofile="${basedir}/target/generated-resources/WEB-INF/remoting.jar" />
                 <resolveArtifact artifactId="remoting" tofile="${basedir}/target/generated-resources/WEB-INF/slave.jar" />
-                <resolveArtifact artifactId="winstone" tofile="${basedir}/target/generated-resources/winstone.jar" />
-
-                <!-- maven plugin is bundled -->
-                <resolveArtifact artifactId="maven-plugin" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/maven-plugin.hpi" />
+                <resolveArtifact groupId="org.jvnet.hudson.winstone" artifactId="winstone" version="0.9.10-hudson-9" type="jar"
+                                 tofile="${basedir}/target/generated-resources/winstone.jar" />
 
+                <!-- bundled plugins -->
+                <resolveArtifact groupId="${project.groupId}" artifactId="maven-plugin" version="${project.version}" type="hpi"
+                                 tofile="${basedir}/target/generated-resources/WEB-INF/plugins/maven-plugin.hpi" />
+                <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="ssh-slaves" version="0.4" type="hpi"
+                                 tofile="${basedir}/target/generated-resources/WEB-INF/plugins/ssh-slaves.hpi" />
               </tasks>
             </configuration>
           </execution>
@@ -187,37 +191,6 @@ THE SOFTWARE.
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <!--
-        classes in this jar will be rebundled into the war.
-        marking it provided so that this won't show up in WEB-INF/lib
-      -->
-      <groupId>org.jvnet.hudson</groupId>
-      <artifactId>executable-war</artifactId>
-      <version>1.8</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <!--
-        this dependency is just so that we can put winstone.jar in the war.
-        marking it provided so that this won't show up in WEB-INF/lib
-      -->
-      <groupId>org.jvnet.hudson.winstone</groupId>
-      <artifactId>winstone</artifactId>
-      <version>0.9.10-hudson-9</version>
-      <scope>provided</scope>
-    </dependency>
-      <dependency>
-        <!--
-          this dependency is just so that we can put maven-pluginhpi in the war.
-          marking it provided so that this won't show up in WEB-INF/lib
-        -->
-        <groupId>org.jvnet.hudson.main</groupId>
-        <artifactId>maven-plugin</artifactId>
-        <version>${project.version}</version>
-        <type>hpi</type>
-        <scope>provided</scope>
-      </dependency>
     <!-- offline profiler API when we need it -->
     <!--dependency>
       <groupId>com.yourkit.api</groupId>