Skip to content

Commit 753e5f1

Browse files
basilMarkEWaite
andauthored
Refresh plugin for 2023 (Java 11, Jenkins 2.361.4, ...) (#118)
* Refresh plugin for 2023 * Fix merge mistake * Use most recent 2.361.x bom --------- Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
1 parent 9061c24 commit 753e5f1

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

Jenkinsfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Builds a module using https://github.com/jenkins-infra/pipeline-library
2-
buildPlugin(configurations: [
3-
[platform: 'linux', jdk: '8'],
4-
[platform: 'linux', jdk: '11'],
5-
[platform: 'windows', jdk: '11'],
2+
buildPlugin(useContainerAgent: true, configurations: [
3+
[platform: 'linux', jdk: 17],
4+
[platform: 'windows', jdk: 11],
65
])

pom.xml

Lines changed: 9 additions & 14 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>4.51</version>
8+
<version>4.55</version>
99
<relativePath />
1010
</parent>
1111

@@ -16,15 +16,15 @@
1616
<properties>
1717
<revision>4.5.14</revision>
1818
<changelist>999999-SNAPSHOT</changelist>
19-
<jenkins.version>2.319.1</jenkins.version>
19+
<jenkins.version>2.361.4</jenkins.version>
2020
<httpcore.version>4.4.16</httpcore.version>
2121
<httpclient.version>${revision}</httpclient.version>
2222
<httpasyncclient.version>4.1.5</httpasyncclient.version>
2323
</properties>
2424

2525
<name>Jenkins Apache HttpComponents Client 4.x API Plugin</name>
2626
<description>Bundles Apache HttpComponents Client 4.x and allows it to be used by Jenkins plugins</description>
27-
<url>https://github.com/jenkinsci/apache-httpcomponents-client-4-api-plugin</url>
27+
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
2828

2929
<licenses>
3030
<license>
@@ -50,8 +50,8 @@
5050
<dependencies>
5151
<dependency>
5252
<groupId>io.jenkins.tools.bom</groupId>
53-
<artifactId>bom-2.319.x</artifactId>
54-
<version>1508.v4b_d09ff0e893</version>
53+
<artifactId>bom-2.361.x</artifactId>
54+
<version>1841.v7b_22c5218e1a</version>
5555
<scope>import</scope>
5656
<type>pom</type>
5757
</dependency>
@@ -130,7 +130,7 @@
130130
<dependency>
131131
<groupId>de.skuzzle.enforcer</groupId>
132132
<artifactId>restrict-imports-enforcer-rule</artifactId>
133-
<version>0.7.0</version>
133+
<version>2.1.0</version>
134134
</dependency>
135135
</dependencies>
136136
<executions>
@@ -142,15 +142,10 @@
142142
</goals>
143143
<configuration>
144144
<rules>
145-
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.RestrictImports">
146-
<basePackage>**</basePackage>
147-
<includeTestCode>true</includeTestCode>
148-
<bannedImports>
149-
<bannedImport>org.apache.commons.httpclient.**</bannedImport>
150-
</bannedImports>
151-
</restrictImports>
145+
<RestrictImports>
146+
<bannedImport>org.apache.commons.httpclient.**</bannedImport>
147+
</RestrictImports>
152148
</rules>
153-
<fail>true</fail>
154149
</configuration>
155150
</execution>
156151
</executions>

0 commit comments

Comments
 (0)