Skip to content

Commit 8f4fde4

Browse files
authored
Merge branch 'master' into JENKINS-66898
2 parents 48ca763 + 2b196c7 commit 8f4fde4

File tree

4 files changed

+14
-59
lines changed

4 files changed

+14
-59
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
version: 2
44
updates:
5-
- package-ecosystem: "maven"
5+
- package-ecosystem: maven
66
directory: "/"
77
schedule:
8-
interval: "weekly"
9-
- package-ecosystem: "github-actions"
8+
interval: weekly
9+
- package-ecosystem: github-actions
1010
directory: "/"
1111
schedule:
12-
interval: "weekly"
12+
interval: weekly

.github/workflows/cd.yaml

Lines changed: 5 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -8,53 +8,8 @@ on:
88
- completed
99

1010
jobs:
11-
validate:
12-
runs-on: ubuntu-latest
13-
outputs:
14-
should_release: ${{ steps.verify-ci-status.outputs.result == 'success' && steps.interesting-categories.outputs.interesting == 'true' }}
15-
steps:
16-
- name: Verify CI status
17-
uses: jenkins-infra/[email protected]
18-
id: verify-ci-status
19-
with:
20-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21-
output_result: true
22-
23-
- name: Release Drafter
24-
uses: release-drafter/release-drafter@v5
25-
if: steps.verify-ci-status.outputs.result == 'success'
26-
with:
27-
name: next
28-
tag: next
29-
version: next
30-
env:
31-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32-
33-
- name: Check interesting categories
34-
uses: jenkins-infra/[email protected]
35-
id: interesting-categories
36-
if: steps.verify-ci-status.outputs.result == 'success'
37-
with:
38-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39-
40-
release:
41-
runs-on: ubuntu-latest
42-
needs: [validate]
43-
if: needs.validate.outputs.should_release == 'true'
44-
steps:
45-
- name: Check out
46-
uses: actions/checkout@v3
47-
with:
48-
fetch-depth: 0
49-
- name: Set up JDK 8
50-
uses: actions/setup-java@v3
51-
with:
52-
distribution: 'adopt'
53-
java-version: 8
54-
- name: Release
55-
uses: jenkins-infra/[email protected]
56-
with:
57-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58-
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
59-
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
60-
11+
maven-cd:
12+
uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1
13+
secrets:
14+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
15+
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}

.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.3</version>
5+
<version>1.4</version>
66
</extension>
77
</extensions>

pom.xml

Lines changed: 4 additions & 4 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.40</version>
31+
<version>4.44</version>
3232
<relativePath/>
3333
</parent>
3434
<groupId>io.jenkins.plugins</groupId>
@@ -63,15 +63,15 @@
6363
</pluginRepositories>
6464
<properties>
6565
<changelist>999999-SNAPSHOT</changelist>
66-
<jenkins.version>2.289.1</jenkins.version>
66+
<jenkins.version>2.289.3</jenkins.version>
6767
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
6868
</properties>
6969
<dependencyManagement>
7070
<dependencies>
7171
<dependency>
7272
<groupId>io.jenkins.tools.bom</groupId>
7373
<artifactId>bom-2.289.x</artifactId>
74-
<version>1008.vb9e22885c9cf</version>
74+
<version>1500.ve4d05cd32975</version>
7575
<scope>import</scope>
7676
<type>pom</type>
7777
</dependency>
@@ -200,7 +200,7 @@
200200
<dependency>
201201
<groupId>org.tmatesoft.svnkit</groupId>
202202
<artifactId>svnkit-cli</artifactId>
203-
<version>1.10.1</version>
203+
<version>1.10.7</version>
204204
<scope>test</scope>
205205
</dependency>
206206
</dependencies>

0 commit comments

Comments
 (0)