Skip to content

Commit

Permalink
Merge remote-tracking branch origin/master into gsoc-2023-project (
Browse files Browse the repository at this point in the history
…#1508)

* Bump maven-failsafe-plugin from 3.1.0 to 3.1.2 (#1502)

* Update Jenkins version to 2.387.3 in pom.xml (#1504)

* Bumps plugin pom from 4.66 to 4.67. (#1506)

https://github.com/jenkinsci/plugin-pom/releases/tag/plugin-4.67 provides
more details of the changes, including:

* Fix hamcrest versioning - @timja
  https://redirect.github.com/jenkinsci/plugin-pom/issues/785

* Update HtmlUnit package for jacoco - @timja
  https://redirect.github.com/jenkinsci/plugin-pom/issues/778

* Use latest plugin BOM for 2.387.x (#1507)

The minimum Jenkins version is already set to 2.387.3 so we should also
update the plugin bill of materials to rely on 2.387.x as well.

---------

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kris Stern <krisstern@outlook.com>
Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
Co-authored-by: Sync project branch action <sync-project-branch@jenkins.io>
  • Loading branch information
5 people authored Jun 18, 2023
1 parent 93f131c commit 10c8b8b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
<dependency>
<!-- Pick up common dependencies for the selected LTS line: https://github.com/jenkinsci/bom#usage -->
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.361.x</artifactId>
<version>2102.v854b_fec19c92</version>
<artifactId>bom-2.387.x</artifactId>
<version>2179.v0884e842b_859</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down

0 comments on commit 10c8b8b

Please sign in to comment.