Skip to content

Commit 656c5ea

Browse files
committed
chore: Upgrade to latest LTS core version supporting Java 8 (requires 2.346.3)
1 parent 62d19d6 commit 656c5ea

File tree

3 files changed

+12
-28
lines changed

3 files changed

+12
-28
lines changed

pom.xml

+7-26
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>plugin</artifactId>
77
<groupId>org.jenkins-ci.plugins</groupId>
88
<!-- Baseline Jenkins version you use to build and test the plugin. Users must have this version or newer to run. -->
9-
<version>4.31</version>
9+
<version>4.51</version>
1010
<relativePath />
1111
</parent>
1212
<artifactId>config-driven-pipeline</artifactId>
@@ -23,20 +23,8 @@
2323
<url>http://opensource.org/licenses/MIT</url>
2424
</license>
2525
</licenses>
26-
<developers>
27-
<developer>
28-
<id>justinharringa</id>
29-
<name>Justin Harringa</name>
30-
<email>[email protected]</email>
31-
</developer>
32-
<developer>
33-
<id>ma3oxuct</id>
34-
<name>Andrey Falko</name>
35-
<email>[email protected]</email>
36-
</developer>
37-
</developers>
3826
<scm>
39-
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
27+
<connection>scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
4028
<developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
4129
<url>http://github.com/jenkinsci/${project.artifactId}-plugin</url>
4230
<tag>HEAD</tag>
@@ -45,9 +33,10 @@
4533
<annotation-indexer.version>1.16</annotation-indexer.version>
4634
<github-branch-source.version>2.4.1</github-branch-source.version>
4735
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
48-
<java.level>8</java.level>
4936
<java.version>1.8</java.version>
50-
<jenkins.version>2.277.4</jenkins.version>
37+
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
38+
<jenkins.baseline>2.346</jenkins.baseline>
39+
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
5140
<junit.version>4.13.2</junit.version>
5241
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
5342
<pipeline-utility-steps-test.version>2.11.0</pipeline-utility-steps-test.version>
@@ -107,7 +96,6 @@
10796
<dependency>
10897
<groupId>org.jenkins-ci.plugins.workflow</groupId>
10998
<artifactId>workflow-multibranch</artifactId>
110-
<version>${workflow-multibranch.version}</version>
11199
</dependency>
112100
<dependency>
113101
<groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -177,13 +165,11 @@
177165
<dependency>
178166
<groupId>junit</groupId>
179167
<artifactId>junit</artifactId>
180-
<version>${junit.version}</version>
181168
<scope>test</scope>
182169
</dependency>
183170
<dependency>
184171
<groupId>org.jenkins-ci.plugins.workflow</groupId>
185172
<artifactId>workflow-multibranch</artifactId>
186-
<version>${workflow-multibranch.version}</version>
187173
<classifier>tests</classifier>
188174
<scope>test</scope>
189175
</dependency>
@@ -197,13 +183,11 @@
197183
<dependency>
198184
<groupId>org.junit.jupiter</groupId>
199185
<artifactId>junit-jupiter</artifactId>
200-
<version>${junit-jupiter.version}</version>
201186
<scope>test</scope>
202187
</dependency>
203188
<dependency>
204189
<groupId>org.junit.jupiter</groupId>
205190
<artifactId>junit-jupiter-api</artifactId>
206-
<version>${junit-jupiter.version}</version>
207191
<scope>test</scope>
208192
</dependency>
209193
</dependencies>
@@ -223,7 +207,6 @@
223207
<plugins>
224208
<plugin>
225209
<artifactId>maven-compiler-plugin</artifactId>
226-
<version>3.9.0</version>
227210
<configuration>
228211
<source>${java.version}</source>
229212
<target>${java.version}</target>
@@ -232,7 +215,6 @@
232215
<plugin>
233216
<groupId>org.apache.maven.plugins</groupId>
234217
<artifactId>maven-surefire-plugin</artifactId>
235-
<version>${maven-surefire-plugin.version}</version>
236218
<dependencies>
237219
<dependency>
238220
<groupId>org.junit.vintage</groupId>
@@ -244,7 +226,6 @@
244226
<plugin>
245227
<groupId>org.jacoco</groupId>
246228
<artifactId>jacoco-maven-plugin</artifactId>
247-
<version>${jacoco-maven-plugin.version}</version>
248229
<executions>
249230
<execution>
250231
<id>pre-unit-test</id>
@@ -275,8 +256,8 @@
275256
<dependencies>
276257
<dependency>
277258
<groupId>io.jenkins.tools.bom</groupId>
278-
<artifactId>bom-2.222.x</artifactId>
279-
<version>887.vae9c8ac09ff7</version>
259+
<artifactId>bom-${jenkins.baseline}.x</artifactId>
260+
<version>1763.v092b_8980a_f5e</version>
280261
<scope>import</scope>
281262
<type>pom</type>
282263
</dependency>

src/main/java/org/jenkinsci/plugins/workflow/multibranch/template/ConfigFileEnvironmentContributingAction.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import hudson.EnvVars;
44
import hudson.Extension;
5-
import hudson.model.*;
5+
import hudson.model.EnvironmentContributingAction;
6+
import hudson.model.InvisibleAction;
7+
import hudson.model.Run;
68

79
import javax.annotation.Nonnull;
810

src/test/java/org/jenkinsci/plugins/workflow/multibranch/template/finder/ConfigurationValueFinderTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
import java.util.stream.Stream;
88

9-
import static org.junit.jupiter.api.Assertions.*;
9+
import static org.junit.jupiter.api.Assertions.assertEquals;
10+
import static org.junit.jupiter.api.Assertions.assertNull;
1011

1112
class ConfigurationValueFinderTest {
1213

0 commit comments

Comments
 (0)