Skip to content

Commit

Permalink
Require Jenkins 2.452.4 or newer (#135)
Browse files Browse the repository at this point in the history
* Use standard dependabot configuration and format

* Require Jenkins 2.452.4 or newer

Jenkins 2.452.4 includes a critical security fix that make it a good
minimum Jenkins version.  It is also one of the versions recommended:

https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/

As of June 2024, 60% of installations of the most recent release were
using Jenkins 2.440 or newer.  With advisories and typical uprade
patterns, the percentage is certainly even higher now.

* Use 0.10.0 as next release

Upgrading minimum Jenkins version

* Remove description attribute from pom

No longer used by Jenkins tooling, see index.jelly
  • Loading branch information
MarkEWaite authored Oct 31, 2024
1 parent 0d8809b commit 5b340a0
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
20 changes: 10 additions & 10 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
---
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates

version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
- package-ecosystem: maven
directory: /
schedule:
interval: monthly
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
11 changes: 6 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
Expand All @@ -13,7 +14,6 @@
<version>${revision}${changelist}</version>
<packaging>hpi</packaging>
<name>Git Parameter Plug-In</name>
<description>Adds ability to choose branches, tags or revisions from git repositories configured in project.</description>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>

<licenses>
Expand Down Expand Up @@ -48,10 +48,11 @@
</scm>

<properties>
<revision>0.9.20</revision>
<revision>0.10.0</revision>
<changelist>-SNAPSHOT</changelist>
<!-- Baseline Jenkins version you use to build and test the plugin. Users must have this version or newer to run. -->
<jenkins.version>2.387.3</jenkins.version>
<jenkins.baseline>2.452</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.4</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<spotless.check.skip>false</spotless.check.skip>
</properties>
Expand All @@ -60,8 +61,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.387.x</artifactId>
<version>2543.vfb_1a_5fb_9496d</version>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>3559.vb_5b_81183b_d23</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ExecutionException;
import net.sf.json.JSONObject;
import net.uaznia.lukanus.hudson.plugins.gitparameter.GitParameterDefinition.DescriptorImpl;
import net.uaznia.lukanus.hudson.plugins.gitparameter.jobs.JobWrapper;
Expand Down Expand Up @@ -701,7 +700,7 @@ public void testWorkflowJobWithCpsScmFlowDefinition() throws IOException {
}

@Test
public void testWorkflowJobWithCpsFlowDefinition() throws IOException, InterruptedException, ExecutionException {
public void testWorkflowJobWithCpsFlowDefinition() throws Exception {
WorkflowJob p = jenkins.createProject(WorkflowJob.class, "wfj");
String script =
"node {\n" + " git url: '" + GIT_PARAMETER_REPOSITORY_URL + "' \n" + " echo 'Some message'\n" + "}";
Expand Down

0 comments on commit 5b340a0

Please sign in to comment.