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

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

@reviewbybees

This comment has been minimized.

Copy link

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

left a comment

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");

This comment has been minimized.

Copy link
@stephenc

stephenc May 24, 2017

Member

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

This comment has been minimized.

Copy link
@jglick

jglick May 24, 2017

Author Member

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
1 check passed
1 check passed
continuous-integration/jenkins/pr-merge This commit looks good
Details
@jglick jglick deleted the jglick:executable-war-JENKINS-24064 branch May 25, 2017
@svanoort

This comment has been minimized.

Copy link
Member

commented Sep 13, 2017

Note that this introduced JENKINS-45245

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.