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

bump jenkins and pom version, add incrementals #59

Merged
merged 13 commits into from
Jul 26, 2022

Conversation

jetersen
Copy link
Member

bumping jenkins version to remove sshd module to avoid cyclic dependencies.

unblocking jenkinsci/bom#1275

@batmat @jglick

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests - that demonstrates feature works or fixes the issue

@jetersen
Copy link
Member Author

jetersen commented Jul 22, 2022

I need an adult (@timja @lemeurherve) to grant me super powers (write permisson) so I can be allowed to update jenkinsfile.

Not like this changing big things in this PR pure maintenance.

@lemeurherve
Copy link
Member

lemeurherve commented Jul 22, 2022

Replayed a build with manually replaced Jenkins version in the pipeline.

pom.xml Outdated Show resolved Hide resolved
@timja
Copy link
Member

timja commented Jul 22, 2022

/reviewer batmat

@comment-ops-bot comment-ops-bot bot requested a review from batmat July 22, 2022 07:56
@lemeurherve
Copy link
Member

/reviewer batmat

Oh nice, it works even without the @, great!

Co-authored-by: Tim Jacomb <[email protected]>
@timja
Copy link
Member

timja commented Jul 22, 2022

/reviewer batmat

Oh nice, it works even without the @, great!

yup both works for user only :)

@jetersen
Copy link
Member Author

jetersen commented Jul 22, 2022

need someone with super powers to rebuild, pretty please 😅

I guess we need a github-jenkins-comments-op.

Or have Jenkins trust org members 😞

Or perhaps I can ask for ci.jenkins.io rebuild permission? 👏

@lemeurherve
Copy link
Member

need someone with super powers to rebuild, pretty please 😅

Replayed 🙂

Or perhaps I can ask for ci.jenkins.io rebuild permission? 👏

Could you open an issue in the help desk for that please?

@jetersen
Copy link
Member Author

Could you open an issue in the help desk for that please?

Done

@jetersen
Copy link
Member Author

Can confirm this fixes the issues we are having in bom and jenkinsci/bom#1275

Jenkinsfile Outdated Show resolved Hide resolved
pom.xml Outdated
<relativePath />
</parent>
<artifactId>variant</artifactId>
<version>1.5-SNAPSHOT</version>
<version>${revision}${changelist}</version>
Copy link
Member

Choose a reason for hiding this comment

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

Or we could go straight to CD, if the maintainer (whoever that is) approves.

Copy link
Member

Choose a reason for hiding this comment

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

Or we could go straight to CD, if the maintainer (whoever that is) approves.

@batmat

Copy link
Member Author

Choose a reason for hiding this comment

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

Co-authored-by: Jesse Glick <[email protected]>
<optional>true</optional>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>2.3.14</version>
<type>hpi</type>
Copy link
Member

Choose a reason for hiding this comment

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

It turns out that I also need this fix (the removal of <type>hpi</type> for my project, so I wish you a speedy merge and release!

@basil
Copy link
Member

basil commented Jul 25, 2022

@jetersen It turns out that in addition to your changes, I also need this change for my work on Maven HPI plugin/PCT:

diff --git a/pom.xml b/pom.xml
index b0d5525..2b9803c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,23 +67,11 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <classpathDependencyExcludes>
-              <classpathDependencyExcludes>org.jenkins-ci.plugins:beer</classpathDependencyExcludes>
-            </classpathDependencyExcludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </build>
   <properties>
     <revision>1.5</revision>
     <changelist>-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <jenkins.version>2.319.3</jenkins.version>
+    <maven.test.dependency.excludes>org.jenkins-ci.plugins:beer</maven.test.dependency.excludes>
   </properties>
 </project>

This will allow jenkinsci/maven-hpi-plugin#367 to extend these properties rather than clobbering them.

Any chance you'd be willing to combine efforts and add the above to your PR? I realize that is asking a lot, so no problem if the answer is no - I can wait until after this is merged and then file a separate PR on top of it. But if you're willing to take on these extra low-risk changes, it could save some time.

@jetersen
Copy link
Member Author

No problem, let me include it :)

@jetersen jetersen merged commit a1a2771 into jenkinsci:master Jul 26, 2022
@jetersen jetersen deleted the bump branch July 26, 2022 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants