Skip to content

chore: Upgrade to latest LTS core version supporting Java 8 (requires 2.346.3) #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gounthar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: Upgrade to latest LTS core version supporting Java 8 (requires 2.346.3) #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 7 additions & 26 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>plugin</artifactId>
<groupId>org.jenkins-ci.plugins</groupId>
<!-- Baseline Jenkins version you use to build and test the plugin. Users must have this version or newer to run. -->
<version>4.31</version>
<version>4.51</version>
<relativePath />
</parent>
<artifactId>config-driven-pipeline</artifactId>
Expand All @@ -23,20 +23,8 @@
<url>http://opensource.org/licenses/MIT</url>
</license>
</licenses>
<developers>
<developer>
<id>justinharringa</id>
<name>Justin Harringa</name>
<email>[email protected]</email>
</developer>
<developer>
<id>ma3oxuct</id>
<name>Andrey Falko</name>
<email>[email protected]</email>
</developer>
</developers>
<scm>
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<connection>scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
<url>http://github.com/jenkinsci/${project.artifactId}-plugin</url>
<tag>HEAD</tag>
Expand All @@ -45,9 +33,10 @@
<annotation-indexer.version>1.16</annotation-indexer.version>
<github-branch-source.version>2.4.1</github-branch-source.version>
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
<java.level>8</java.level>
<java.version>1.8</java.version>
<jenkins.version>2.277.4</jenkins.version>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.346</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<junit.version>4.13.2</junit.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<pipeline-utility-steps-test.version>2.11.0</pipeline-utility-steps-test.version>
Expand Down Expand Up @@ -107,7 +96,6 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
<version>${workflow-multibranch.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down Expand Up @@ -177,13 +165,11 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
<version>${workflow-multibranch.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand All @@ -197,13 +183,11 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -223,7 +207,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.9.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
Expand All @@ -232,7 +215,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.junit.vintage</groupId>
Expand All @@ -244,7 +226,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco-maven-plugin.version}</version>
<executions>
<execution>
<id>pre-unit-test</id>
Expand Down Expand Up @@ -275,8 +256,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.222.x</artifactId>
<version>887.vae9c8ac09ff7</version>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>1763.v092b_8980a_f5e</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
4 changes: 3 additions & 1 deletion ...kinsci/plugins/workflow/multibranch/template/ConfigFileEnvironmentContributingAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import hudson.EnvVars;
import hudson.Extension;
import hudson.model.*;
import hudson.model.EnvironmentContributingAction;
import hudson.model.InvisibleAction;
import hudson.model.Run;

import javax.annotation.Nonnull;

Expand Down
3 changes: 2 additions & 1 deletion .../jenkinsci/plugins/workflow/multibranch/template/finder/ConfigurationValueFinderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

import java.util.stream.Stream;

import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;

class ConfigurationValueFinderTest {

Expand Down