Skip to content
Permalink
Browse files

[JENKINS-24064] Replace war-for-test classifier with executable-war t…

…ype.
  • Loading branch information...
jglick committed May 24, 2017
1 parent 3351cc6 commit af6e21510b71eb1903cc2169cfca1e5c6654a8ce
Showing with 8 additions and 29 deletions.
  1. +1 −1 pom.xml
  2. +7 −5 test/pom.xml
  3. +0 −23 war/pom.xml
@@ -531,7 +531,7 @@ THE SOFTWARE.
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>1.122</version>
<version>2.0-20170524.211828-1</version> <!-- TODO https://github.com/jenkinsci/maven-hpi-plugin/pull/65 -->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -44,14 +44,11 @@ THE SOFTWARE.

<dependencies>
<dependency>
<!--
put hudson.war in the classpath. we can't pull in the war artifact directly
because Maven excludes all wars from classpath automatically. so we need a jar artifact.
-->
<groupId>${project.groupId}</groupId>
<artifactId>jenkins-war</artifactId>
<version>${project.version}</version>
<classifier>war-for-test</classifier>
<type>executable-war</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -189,6 +186,11 @@ THE SOFTWARE.

<build>
<plugins>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>maven-stapler-plugin</artifactId>
@@ -414,29 +414,6 @@ THE SOFTWARE.
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<!-- deploy the war as a jar, so that the tests can pull this into the classpath -->
<id>deploy-war-for-test</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/${project.build.finalName}.war</file>
<type>jar</type>
<classifier>war-for-test</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
<plugin><!-- generate licenses.xml -->
<groupId>com.cloudbees</groupId>
<artifactId>maven-license-plugin</artifactId>

0 comments on commit af6e215

Please sign in to comment.
You can’t perform that action at this time.