Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-24064] Replace war-for-test classifier with executable-war type #65

Merged
merged 2 commits into from
May 25, 2017

Conversation

jglick
Copy link
Member

@jglick jglick commented May 24, 2017

JENKINS-24064

Should allow us to avoid deploying two copies of jenkins.war, while simplifying how WarExploder finds the WAR file to use.

@reviewbybees

@ghost
Copy link

ghost commented May 24, 2017

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

Copy link
Member

@stephenc stephenc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe consider additional fallbacks

@@ -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");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May want to fallback to finding the old one if this newer match fails

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, probably could do that, if we wanted to allow the newer plugin to be used in older POMs.

@jglick jglick merged commit 4b55ed1 into jenkinsci:master May 25, 2017
@jglick jglick deleted the executable-war-JENKINS-24064 branch May 25, 2017 13:56
@svanoort
Copy link
Member

Note that this introduced JENKINS-45245

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants