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

update to 2.176.4 #225

Merged
merged 6 commits into from
Aug 18, 2020
Merged

update to 2.176.4 #225

merged 6 commits into from
Aug 18, 2020

Conversation

car-roll
Copy link
Collaborator

updating jenkins version to 2.176.4, supersedes #214

@@ -159,6 +159,12 @@
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
Copy link
Member

Choose a reason for hiding this comment

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

Why?

Copy link
Collaborator Author

@car-roll car-roll Aug 17, 2020

Choose a reason for hiding this comment

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

because of:
Caused by: java.io.IOException: Jenkins Git plugin version 4.2.2 failed to load. Matrix Project Plugin version 1.4.1 is older than required. To fix, install version 1.14 or later.
😞

Copy link
Member

Choose a reason for hiding this comment

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

Well the BOM defines a version for matrix-project so perhaps you just need an explicit dependency, but without version?

Copy link
Member

Choose a reason for hiding this comment

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

I would also add a comment here explaining why the dependency exists, something like this:

<!-- Required because git plugin optionally depends on a recent version of matrix-project, and if we do not depend on matrix-project here, an old version of matrix-project is installed automatically as a detached plugin, causing git plugin to fail to load. -->

pom.xml Outdated
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
<version>1.14</version>
Copy link
Member

Choose a reason for hiding this comment

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

so

Suggested change
<version>1.14</version>

@@ -159,6 +159,12 @@
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
Copy link
Member

Choose a reason for hiding this comment

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

I would also add a comment here explaining why the dependency exists, something like this:

<!-- Required because git plugin optionally depends on a recent version of matrix-project, and if we do not depend on matrix-project here, an old version of matrix-project is installed automatically as a detached plugin, causing git plugin to fail to load. -->

Comment on lines 68 to 69
// TODO: Fails using Windows Git
DockerTestUtil.assumeNotWindows();
Copy link
Member

Choose a reason for hiding this comment

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

nit: I'm not totally sure why DockerTestUtil.assumeNotWindows exists, but if you use assumeFalse directly you can have the message show up when the test is skipped (same goes for DockerBasicModelDefTest.failureBeforeStages, and if you want to make this change I think you'll need to add some imports manually):

Suggested change
// TODO: Fails using Windows Git
DockerTestUtil.assumeNotWindows();
assumeFalse("Fails using the version of Git installed on the Windows ACI agents on ci.jenkins.io", Functions.isWindows());

pom.xml Outdated
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.40</version>
<version>3.57</version>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<version>3.57</version>
<version>4.6</version>

@car-roll car-roll merged commit ae49bf8 into jenkinsci:master Aug 18, 2020
@car-roll car-roll deleted the 2.176.4 branch August 18, 2020 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants