Skip to content
Permalink
Browse files

Merge pull request #65 from jglick/executable-war-JENKINS-24064

[JENKINS-24064] Replace war-for-test classifier with executable-war type
  • Loading branch information...
jglick committed May 25, 2017
2 parents c50d496 + c5f1c00 commit 4b55ed1ed5115a01e605f60a3b09627c38b1111d
@@ -724,7 +724,7 @@ protected Artifact getJenkinsWarArtifact() throws MojoExecutionException {
if (jenkinsWarId!=null)
match = (a.getGroupId()+':'+a.getArtifactId()).equals(jenkinsWarId);
else
match = (a.getArtifactId().equals("jenkins-war") || a.getArtifactId().equals("hudson-war")) && a.getType().equals("war");
match = (a.getArtifactId().equals("jenkins-war") || a.getArtifactId().equals("hudson-war")) && (a.getType().equals("executable-war") || a.getType().equals("war"));
if(match)
return a;
}
@@ -121,5 +121,19 @@
<addedToClasspath>true</addedToClasspath>
</configuration>
</component>

<!-- See JENKINS-24064 for background; used to be war-for-test classifier. -->
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>executable-war</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
<type>executable-war</type>
<extension>war</extension>
<language>java</language>
<addedToClasspath>true</addedToClasspath>
</configuration>
</component>

</components>
</component-set>

0 comments on commit 4b55ed1

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