8000 Merge pull request #190 from basil/refresh · jenkinsci/github-api-plugin@e35d9dd · GitHub
[go: up one dir, main page]
Skip to content

Commit e35d9dd

Browse files
jglickjglick
authored
Merge pull request #190 from basil/refresh
Refresh plugin for December 2022
2 parents 039da83 + ebc7293 commit e35d9dd

File tree

3 files changed

+20
-63
lines changed

3 files changed

+20
-63
lines changed

‎.github/workflows/cd.yaml

Lines changed: 5 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,52 +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/verify-ci-status-action@v1.2.2
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/interesting-category-action@v1.2.1
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.3.0
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/jenkins-maven-cd-action@v1.3.3
56-
with:
57-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58-
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
59-
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
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 }}

‎Jenkinsfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
buildPlugin(platforms: ['maven'])
1+
buildPlugin(useContainerAgent: true, configurations: [
2+
[platform: 'linux', jdk: 17],
3+
[platform: 'windows', jdk: 11],
4+
])

‎pom.xml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<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">
23
<modelVersion>4.0.0</modelVersion>
34
<parent>
45
<groupId>org.jenkins-ci.plugins</groupId>
56
<artifactId>plugin</artifactId>
6-
<version>4.40</version>
7+
<version>4.53</version>
78
<relativePath />
89
</parent>
910

1011
<licenses>
1112
<license>
1213
<name>The MIT License (MIT)</name>
13-
<url>http://opensource.org/licenses/MIT</url>
14+
<url>https://opensource.org/licenses/MIT</url>
1415
<distribution>repo</distribution>
1516
</license>
1617
</licenses>
@@ -19,13 +20,13 @@
1920
<version>${revision}-${changelist}</version>
2021
<packaging>hpi</packaging>
2122
<name>GitHub API Plugin</name>
22-
<url>https://github.com/jenkinsci/github-api-plugin</url>
23+
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
2324

2425
<properties>
2526
<revision>1.303</revision>
2627
<changelist>999999-SNAPSHOT</changelist>
27-
<jenkins.version>2.289.1</jenkins.version>
28-
<java.level>8</java.level>
28+
<jenkins.version>2.361.4</jenkins.version>
29+
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
2930
<no-test-jar>false</no-test-jar>
3031
</properties>
3132

@@ -37,17 +38,14 @@
3738
<dependency>
3839
<groupId>io.jenkins.plugins</groupId>
3940
<artifactId>commons-lang3-api</artifactId>
40-
<version>3.12.0-36.vd97de6465d5b_</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>io.jenkins.plugins</groupId>
4444
<artifactId>okhttp-api</artifactId>
45-
<version>4.9.2-20211102</version>
4645
</dependency>
4746
<dependency>
4847
<groupId>io.jenkins.plugins</groupId>
4948
<artifactId>jjwt-api</artifactId>
50-
<version>0.11.2-5.143e44951c52</version>
5149
<optional>true</optional>
5250
</dependency>
5351
<dependency>
@@ -111,8 +109,8 @@
111109
<dependencies>
112110
<dependency>
113 A3E2 111
<groupId>io.jenkins.tools.bom</groupId>
114-
<artifactId>bom-2.289.x</artifactId>
115-
<version>1438.v6a_2c29d73f82</version>
112+
<artifactId>bom-2.361.x</artifactId>
113+
<version>1750.v0071fa_4c4a_e3</version>
116114
<scope>import</scope>
117115
<type>pom</type>
118116
</dependency>
@@ -135,9 +133,9 @@
135133
</pluginRepositories>
136134

137135
<scm>
138-
<connection>scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
139-
<developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
140-
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
136+
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
137+
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
138+
<url>https://github.com/${gitHubRepo}</url>
141139
<tag>${scmTag}</tag>
142140
</scm>
143141
</project>

0 commit comments

Comments
 (0)
0