Skip to content
This repository has been archived by the owner on Aug 9, 2024. It is now read-only.

[JENKINS-34131] Upgrade to plugin parent pom 2.6 #5

Merged
merged 6 commits into from
Aug 10, 2016

Conversation

armfergom
Copy link
Contributor

  • Bump to baseline 1.580.1
  • Upgrade to plugin parent pom 2.6
  • Fix Findbugs errors
  • Make tests pass with latest Jenkins baseline
  • Exclude dependency (org.jvnet.tiger-types) in conflict with the one provided by parent pom, causing errors in tests when 1.652+ baseline is used.

@reviewbybees

@jenkinsadmin
Copy link
Member

Thank you for this pull request! Please check this document for how the Jenkins project handles pull requests.

@armfergom armfergom changed the title [JENKINS-34131] [WiP] Upgrade to plugin parent pom 2.6 [JENKINS-34131] Upgrade to plugin parent pom 2.6 Apr 11, 2016
@ghost
Copy link

ghost commented Apr 11, 2016

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.

@@ -207,7 +209,8 @@ public void launch(final SlaveComputer computer, final TaskListener listener) th
SWbemServices services = WMI.connect(session, name);


String path = computer.getNode().getRemoteFS();
Slave node = computer.getNode();
String path = node != null ? node.getRemoteFS() : "";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Specially review this. If node == null, I am not so sure what the behaviour should be. Maybe throw an error better than what's in the PR ATM?

Copy link
Member

Choose a reason for hiding this comment

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

🐜 throw an AbortException

@armfergom
Copy link
Contributor Author

@Vlatombe @jglick you seem to be the most active contributors to this plugin lately, some reviews would be very welcome here please since this has been opened for a while :)

@@ -207,7 +208,8 @@ public void launch(final SlaveComputer computer, final TaskListener listener) th
SWbemServices services = WMI.connect(session, name);


String path = computer.getNode().getRemoteFS();
Slave node = computer.getNode();
String path = node != null ? node.getRemoteFS() : "";
if (path.indexOf(':')==-1) throw new IOException("Remote file system root path of the slave needs to be absolute: "+path);
Copy link
Member

Choose a reason for hiding this comment

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

(currently this will get thrown but with a confusing message)

@jglick
Copy link
Member

jglick commented Jul 28, 2016

🐝

you seem to be the most active contributors to this plugin

Hardly. I split it out of core, that is all.

@armfergom
Copy link
Contributor Author

Thanks for the review. Comments addressed.

if (node != null) {
String id = generateServiceId(node.getRemoteFS());
Win32Service slaveService = services.getService(id);
if(slaveService!=null) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Code style, you need spaces before and after !=

@raul-arabaolaza
Copy link
Contributor

LGTM 🐝

@andresrc
Copy link
Contributor

🐝

@armfergom
Copy link
Contributor Author

@reviewbybees done

@ghost
Copy link

ghost commented Jul 29, 2016

This pull request has completed our internal processes and we now respectfully request the maintainers of this repository to consider our proposal contained within this pull request for merging.

@andresrc andresrc merged commit bb57bcc into jenkinsci:master Aug 10, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants