Skip to content

Commit 8f5cb75

Browse files
authored
Merge branch 'master' into JENKINS-68371
2 parents 6481b77 + 144bcd1 commit 8f5cb75

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

.github/workflows/cd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3232

3333
- name: Check interesting categories
34-
uses: jenkins-infra/interesting-category-action@v1.0.0
34+
uses: jenkins-infra/interesting-category-action@v1.1.0
3535
id: interesting-categories
3636
if: steps.verify-ci-status.outputs.result == 'success'
3737
with:
@@ -52,7 +52,7 @@ jobs:
5252
distribution: temurin
5353
java-version: 8
5454
- name: Release
55-
uses: jenkins-infra/jenkins-maven-cd-action@v1.2.0
55+
uses: jenkins-infra/jenkins-maven-cd-action@v1.3.0
5656
with:
5757
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5858
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}

pom.xml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.jenkins-ci.plugins</groupId>
55
<artifactId>plugin</artifactId>
6-
<version>4.39</version>
6+
<version>4.40</version>
77
<relativePath />
88
</parent>
99

@@ -13,12 +13,12 @@
1313
<name>Kubernetes plugin</name>
1414
<description>Jenkins plugin to run dynamic agents in a Kubernetes cluster</description>
1515
<packaging>hpi</packaging>
16-
<url>https://github.com/jenkinsci/kubernetes-plugin</url>
16+
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
1717

1818
<scm>
19-
<connection>scm:git:https://github.com/jenkinsci/kubernetes-plugin.git</connection>
20-
<developerConnection>scm:git:https://github.com/jenkinsci/kubernetes-plugin.git</developerConnection>
21-
<url>https://github.com/jenkinsci/kubernetes-plugin</url>
19+
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
20+
<developerConnection>scm:git:https://github.com/${gitHubRepo}.git</developerConnection>
21+
<url>https://github.com/${gitHubRepo}</url>
2222
<tag>${scmTag}</tag>
2323
</scm>
2424

@@ -45,10 +45,10 @@
4545
<connectorHost />
4646
<jenkins.host.address />
4747
<slaveAgentPort />
48-
<java.level>8</java.level>
4948
<jenkins.version>2.303.3</jenkins.version>
5049
<no-test-jar>false</no-test-jar>
5150
<useBeta>true</useBeta>
51+
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
5252
</properties>
5353

5454
<dependencies>
@@ -214,12 +214,6 @@
214214
<artifactId>bouncycastle-api</artifactId>
215215
<scope>test</scope>
216216
</dependency>
217-
<dependency>
218-
<groupId>org.jenkins-ci.modules</groupId>
219-
<artifactId>instance-identity</artifactId>
220-
<version>2.2</version>
221-
<scope>provided</scope>
222-
</dependency>
223217
<dependency>
224218
<groupId>pl.pragmatists</groupId>
225219
<artifactId>JUnitParams</artifactId>

0 commit comments

Comments
 (0)