Skip to content

Commit

Permalink
Use jenkins.baseline to match archetype (#77)
Browse files Browse the repository at this point in the history
* Use dependabot config from archetype

* Avoid bom version mismatches with jenkins.baseline

The Jenkins plugin archetype uses jenkins.baseline to prevent
inconsistencies between the minimum required Jenkins version and the
Jenkins plugin bill of materials version.  Use the same technique in
this plugin.
  • Loading branch information
MarkEWaite authored Nov 23, 2024
1 parent e3e91ac commit 158e4ac
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
18 changes: 10 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates
---
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates

version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
labels:
- "dependencies"
schedule:
interval: "weekly"
- package-ecosystem: maven
directory: /
schedule:
interval: monthly
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,14 @@
<revision>1.4</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/artifactdeployer-plugin</gitHubRepo>
<jenkins.version>2.361.4</jenkins.version>
<jenkins.baseline>2.361</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.4</jenkins.version>
<!-- Requires triage -->
<spotbugs.threshold>High</spotbugs.threshold>
</properties>

<scm>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:ssh://[email protected]/${gitHubRepo}.git</developerConnection>
<url>https://github.com/${gitHubRepo}</url>
<tag>${scmTag}</tag>
Expand All @@ -60,7 +61,7 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.361.x</artifactId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>2102.v854b_fec19c92</version>
<scope>import</scope>
<type>pom</type>
Expand Down Expand Up @@ -88,7 +89,6 @@
<repository>
<id>atlassian-public</id>
<url>https://maven.atlassian.com/repository/public</url>

</repository>
</repositories>
<pluginRepositories>
Expand Down

0 comments on commit 158e4ac

Please sign in to comment.