diff --git a/.dependabot/config.yml b/.dependabot/config.yml index 0b2c28b51..fe8ef87ab 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -17,5 +17,5 @@ update_configs: - match: dependency_name: "io.jenkins*" - match: - # Required for Jenkins 2.190.1 tests + # Required for Jenkins 2.204.2 tests dependency_name: "org.slf4j*" diff --git a/Jenkinsfile b/Jenkinsfile index 4c89c0a0a..100c5fda4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,9 +4,9 @@ Random random = new Random() // Randomize which Jenkins version is s use_newer_jenkins = random.nextBoolean() // Use newer Jenkins on one build but slightly older on other // build recommended configurations -subsetConfiguration = [ [ jdk: '8', platform: 'windows', jenkins: null ], - [ jdk: '8', platform: 'linux', jenkins: !use_newer_jenkins ? '2.204.1' : '2.190.1', javaLevel: '8' ], - [ jdk: '11', platform: 'linux', jenkins: use_newer_jenkins ? '2.204.1' : '2.190.1', javaLevel: '8' ] +subsetConfiguration = [ [ jdk: '8', platform: 'windows', jenkins: null ], + [ jdk: '8', platform: 'linux', jenkins: !use_newer_jenkins ? '2.204.2' : '2.220', javaLevel: '8' ], + [ jdk: '11', platform: 'linux', jenkins: use_newer_jenkins ? '2.204.2' : '2.220', javaLevel: '8' ] ] buildPlugin(configurations: subsetConfiguration, failFast: false) diff --git a/pom.xml b/pom.xml index f83f181d2..ca333d44f 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ -SNAPSHOT UTF-8 -Dfile.encoding=${project.build.sourceEncoding} - 2.190.1 + 2.204.2 8 false @@ -70,28 +70,28 @@ 0.9.12 test - + org.slf4j log4j-over-slf4j - 1.7.28 + 1.7.26 test - + org.slf4j slf4j-api - 1.7.28 + 1.7.26 test - + org.slf4j jcl-over-slf4j - 1.7.28 + 1.7.26 test - + org.slf4j slf4j-jdk14 - 1.7.28 + 1.7.26 test