提交 edf7953c 编写于 作者: S Stephen Connolly 提交者: Kohsuke Kawaguchi

use build-helper and dependency-unpack for some of the antrun stuff

Conflicts:

	war/pom.xml
上级 6af0308f
...@@ -48,6 +48,13 @@ THE SOFTWARE. ...@@ -48,6 +48,13 @@ THE SOFTWARE.
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>executable-war</artifactId>
<version>1.20</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.jenkins-ci.main</groupId> <groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-core</artifactId> <artifactId>jenkins-core</artifactId>
...@@ -148,6 +155,7 @@ THE SOFTWARE. ...@@ -148,6 +155,7 @@ THE SOFTWARE.
<!-- version specified in grandparent pom --> <!-- version specified in grandparent pom -->
<executions> <executions>
<execution> <execution>
<id>list-dependencies</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>list</goal> <goal>list</goal>
...@@ -156,6 +164,21 @@ THE SOFTWARE. ...@@ -156,6 +164,21 @@ THE SOFTWARE.
<outputFile>${basedir}/target/classes/dependencies.txt</outputFile> <outputFile>${basedir}/target/classes/dependencies.txt</outputFile>
</configuration> </configuration>
</execution> </execution>
<execution>
<!-- put executable war header -->
<id>executable-war-header</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.jenkins-ci</includeGroupIds>
<includeArtifactIds>executable-war</includeArtifactIds>
<includeScope>provided</includeScope>
<includes>**/*.class</includes>
<outputDirectory>target/generated-resources</outputDirectory>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
...@@ -197,14 +220,6 @@ THE SOFTWARE. ...@@ -197,14 +220,6 @@ THE SOFTWARE.
<tasks> <tasks>
<mkdir dir="target/generated-resources" /> <mkdir dir="target/generated-resources" />
<!-- put executable war header -->
<resolveArtifact groupId="org.jenkins-ci" artifactId="executable-war" version="1.22" type="jar" property="executable-war.jar" />
<unjar src="${executable-war.jar}" dest="target/generated-resources">
<patternset>
<include name="**/*.class" />
</patternset>
</unjar>
<!-- dependencies that goes to unusual locations --> <!-- 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/remoting.jar" />
<resolveArtifact artifactId="remoting" tofile="${basedir}/target/generated-resources/WEB-INF/slave.jar" /> <resolveArtifact artifactId="remoting" tofile="${basedir}/target/generated-resources/WEB-INF/slave.jar" />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册