Skip to content

Commit 5871bd7

Browse files
author
Edgars Batna
committed
Merge branch 'master' of https://github.com/mdealer/workflow-durable-task-step-plugin into remove-max-label-length
2 parents a53be2a + c03bbb6 commit 5871bd7

34 files changed

+1901
-476
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @jenkinsci/workflow-durable-task-step-plugin-developers

‎.github/dependabot.yml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.github/renovate.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"github>jenkinsci/renovate-config"
5+
]
6+
}

‎.github/workflows/auto-merge-safe-deps.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: Automatically approve and merge safe dependency updates
2+
on:
3+
- pull_request_target
4+
permissions:
5+
contents: write
6+
pull-requests: write
7+
jobs:
8+
auto-merge-safe-deps:
9+
uses: jenkins-infra/github-reusable-workflows/.github/workflows/auto-merge-safe-deps.yml@v1

‎.github/workflows/close-bom-if-passing.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Close BOM update PR if passing
2+
on:
3+
check_run:
4+
types:
5+
- completed
6+
permissions:
7+
contents: read
8+
pull-requests: write
9+
jobs:
10+
close-bom-if-passing:
11+
uses: jenkins-infra/github-reusable-workflows/.github/workflows/close-bom-if-passing.yml@v1

‎.github/workflows/jenkins-security-scan.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Jenkins Security Scan
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
types: [ opened, synchronize, reopened ]
9+
workflow_dispatch:
10+
11+
permissions:
12+
security-events: write
13+
contents: read
14+
actions: read
15+
16+
jobs:
17+
security-scan:
18+
uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
19+
with:
20+
java-cache: 'maven' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
21+
# java-version: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.

‎.mvn/extensions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.4</version>
5+
<version>1.13</version>
66
</extension>
77
</extensions>

‎Jenkinsfile‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
buildPlugin(useContainerAgent: true, configurations: [
2-
[platform: 'linux', jdk: 17],
3-
[platform: 'windows', jdk: 11],
1+
/*
2+
See the documentation for more options:
3+
4+
https://github.com/jenkins-infra/pipeline-library/
5+
6+
*/
7+
buildPlugin(
8+
useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
9+
configurations: [
10+
[platform: 'linux', jdk: 25],
11+
[platform: 'windows', jdk: 21],
412
])

‎pom.xml‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>org.jenkins-ci.plugins</groupId>
3030
<artifactId>plugin</artifactId>
31-
<version>4.52</version>
31+
<version>6.2122.v70b_7b_f659d72</version>
3232
<relativePath/>
3333
</parent>
3434
<groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -66,7 +66,8 @@
6666
</pluginRepositories>
6767
<properties>
6868
<changelist>999999-SNAPSHOT</changelist>
69-
<jenkins.version>2.361.4</jenkins.version>
69+
<jenkins.baseline>2.479</jenkins.baseline>
70+
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
7071
<useBeta>true</useBeta>
7172
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
7273
<hpi.compatibleSinceVersion>2.40</hpi.compatibleSinceVersion>
@@ -75,8 +76,8 @@
7576
<dependencies>
7677
<dependency>
7778
<groupId>io.jenkins.tools.bom</groupId>
78-
<artifactId>bom-2.361.x</artifactId>
79-
<version>1654.vcb_69d035fa_20</version>
79+
<artifactId>bom-${jenkins.baseline}.x</artifactId>
80+
<version>4023.va_eeb_b_4e45f07</version>
8081
<scope>import</scope>
8182
<type>pom</type>
8283
</dependency>
@@ -114,6 +115,11 @@
114115
<artifactId>workflow-basic-steps</artifactId>
115116
<scope>test</scope>
116117
</dependency>
118+
<dependency>
119+
<groupId>org.jenkins-ci.plugins</groupId>
120+
<artifactId>pipeline-input-step</artifactId>
121+
<scope>test</scope>
122+
</dependency>
117123
<dependency>
118124
<groupId>org.jenkins-ci.plugins</groupId>
119125
<artifactId>pipeline-stage-step</artifactId>
@@ -156,7 +162,19 @@
156162
<dependency>
157163
<groupId>io.jenkins.plugins</groupId>
158164
<artifactId>generic-environment-filters</artifactId>
159-
<version>1.2</version>
165+
<version>1.22.vc8fb_fb_c169e5</version>
166+
<scope>test</scope>
167+
</dependency>
168+
<dependency>
169+
<groupId>org.jenkins-ci.plugins</groupId>
170+
<artifactId>mock-slave</artifactId>
171+
<version>193.v88c279d0c584</version>
172+
<scope>test</scope>
173+
</dependency>
174+
<dependency>
175+
<groupId>org.awaitility</groupId>
176+
<artifactId>awaitility</artifactId>
177+
<version>4.3.0</version>
160178
<scope>test</scope>
161179
</dependency>
162180
</dependencies>

0 commit comments

Comments
 (0)