Skip to content

Commit 1270c9a

Browse files
mawinter69mawinter69
committed
switch to renovate
use Java 21 for the build and do some cleanup
1 parent fdf38a1 commit 1270c9a

File tree

6 files changed

+60
-56
lines changed

6 files changed

+60
-56
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 10 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/codeql.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ jobs:
2626
- name: Checkout
2727
uses: actions/checkout@v5
2828

29+
- name: Set up Java
30+
uses: actions/setup-java@v4
31+
with:
32+
distribution: 'temurin'
33+
java-version: 21
34+
2935
- name: Initialize CodeQL
3036
uses: github/codeql-action/init@v4
3137
with:

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,12 @@
55
.settings
66
work
77
keystore
8+
9+
# IntelliJ IDEA project files
10+
*.iml
11+
*.iws
12+
*.ipr
813
.idea
14+
15+
# VSCode
16+
.vscode

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ buildPlugin(
22
useContainerAgent: true,
33
forkCount: '0.5C',
44
configurations: [
5-
[platform: 'linux', jdk: 17]
5+
[platform: 'linux', jdk: 21]
66
])

‎pom.xml‎

Lines changed: 39 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.jenkins-ci.plugins</groupId>
77
<artifactId>plugin</artifactId>
8-
<version>5.27</version>
8+
<version>6.2116.v7501b_67dc517</version>
99
<relativePath/>
1010
</parent>
1111

@@ -38,27 +38,27 @@
3838
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
3939
<jenkins.baseline>2.516</jenkins.baseline>
4040
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
41-
<powermock.version>1.6.1</powermock.version>
42-
<checkstyle.version>12.0.1</checkstyle.version>
41+
<checkstyle.version>13.0.0</checkstyle.version>
4342
<ban-junit4-imports.skip>false</ban-junit4-imports.skip>
43+
<ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
4444
<hpi.compatibleSinceVersion>2.0</hpi.compatibleSinceVersion>
4545
</properties>
4646

4747
<dependencyManagement>
4848
<dependencies>
49-
<dependency>
50-
<groupId>io.jenkins.tools.bom</groupId>
51-
<artifactId>bom-${jenkins.baseline}.x</artifactId>
52-
<version>5543.vfd758c7c868d</version>
53-
<type>pom</type>
54-
<scope>import</scope>
55-
</dependency>
49+
<dependency>
50+
<groupId>io.jenkins.tools.bom</groupId>
51+
<artifactId>bom-${jenkins.baseline}.x</artifactId>
52+
<version>5933.vcf06f7b_5d1a_2</version>
53+
<type>pom</type>
54+
<scope>import</scope>
55+
</dependency>
5656
</dependencies>
5757
</dependencyManagement>
5858
<dependencies>
5959
<dependency>
60-
<groupId>io.jenkins.plugins</groupId>
61-
<artifactId>ionicons-api</artifactId>
60+
<groupId>io.jenkins.plugins</groupId>
61+
<artifactId>ionicons-api</artifactId>
6262
</dependency>
6363
<dependency>
6464
<groupId>io.jenkins.plugins</groupId>
@@ -76,23 +76,17 @@
7676
<scope>test</scope>
7777
</dependency>
7878
<dependency>
79-
<groupId>com.github.stephenc.jcip</groupId>
80-
<artifactId>jcip-annotations</artifactId>
81-
<version>1.0-1</version>
79+
<groupId>org.jenkins-ci.plugins</groupId>
80+
<artifactId>mock-slave</artifactId>
81+
<version>193.v88c279d0c584</version>
8282
<scope>test</scope>
8383
</dependency>
8484
<dependency>
8585
<groupId>org.jenkins-ci.plugins</groupId>
86-
<artifactId>mock-slave</artifactId>
87-
<version>193.v88c279d0c584</version>
86+
<artifactId>mock-security-realm</artifactId>
87+
<version>106.va_5286004db_2e</version>
8888
<scope>test</scope>
8989
</dependency>
90-
<dependency>
91-
<groupId>org.jenkins-ci.plugins</groupId>
92-
<artifactId>mock-security-realm</artifactId>
93-
<version>106.va_5286004db_2e</version>
94-
<scope>test</scope>
95-
</dependency>
9690
<dependency>
9791
<groupId>org.jenkins-ci.plugins</groupId>
9892
<artifactId>matrix-auth</artifactId>
@@ -141,30 +135,30 @@
141135
</dependency>
142136
</dependencies>
143137
<configuration>
144-
<configLocation>${project.basedir}/.build-config/checkstyle.xml</configLocation>
145-
<suppressionsLocation>${project.basedir}/.build-config/checkstyle-suppressions.xml</suppressionsLocation>
146-
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
147-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
148-
<consoleOutput>true</consoleOutput>
138+
<configLocation>${project.basedir}/.build-config/checkstyle.xml</configLocation>
139+
<suppressionsLocation>${project.basedir}/.build-config/checkstyle-suppressions.xml</suppressionsLocation>
140+
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
141+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
142+
<consoleOutput>true</consoleOutput>
149143
</configuration>
150144
<executions>
151-
<execution>
152-
<id>compile-checkstyle</id>
153-
<goals>
154-
<goal>checkstyle</goal>
155-
</goals>
156-
<phase>compile</phase>
157-
</execution>
158-
<execution>
159-
<id>test-check</id>
160-
<goals>
161-
<goal>check</goal>
162-
</goals>
163-
<phase>test</phase>
164-
<configuration>
165-
<violationSeverity>warning</violationSeverity>
166-
</configuration>
167-
</execution>
145+
<execution>
146+
<id>compile-checkstyle</id>
147+
<goals>
148+
<goal>checkstyle</goal>
149+
</goals>
150+
<phase>compile</phase>
151+
</execution>
152+
<execution>
153+
<id>test-check</id>
154+
<goals>
155+
<goal>check</goal>
156+
</goals>
157+
<phase>test</phase>
158+
<configuration>
159+
<violationSeverity>warning</violationSeverity>
160+
</configuration>
161+
</execution>
168162
</executions>
169163
</plugin>
170164
</plugins>

0 commit comments

Comments
 (0)