Skip to content

Commit 1d28d0e

Browse files
Upgrade jenkins and plugins version
Signed-off-by: Prudhvi Godithi <[email protected]>
1 parent aff4f1c commit 1d28d0e

File tree

3 files changed

+40
-14
lines changed

3 files changed

+40
-14
lines changed

.github/workflows/groovy-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- name: Setup Java
1111
uses: actions/setup-java@v4
1212
with:
13-
java-version: 11
13+
java-version: 17
1414
distribution: 'temurin'
1515
- uses: actions/checkout@v3
1616
- name: Run Tests

build.gradle

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ plugins {
2020
id 'groovy'
2121
}
2222

23+
java {
24+
sourceCompatibility = JavaVersion.VERSION_17
25+
targetCompatibility = JavaVersion.VERSION_17
26+
}
27+
2328
repositories {
2429
mavenCentral()
2530
maven { url 'https://repo.jenkins-ci.org/releases/' }
@@ -34,6 +39,7 @@ dependencies {
3439
testImplementation group: 'org.yaml', name: 'snakeyaml', version: '2.0'
3540
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.4.1'
3641
testImplementation group: 'com.lesfurets', name:'jenkins-pipeline-unit', version: '1.13'
42+
testImplementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '3.1.8'
3743
}
3844

3945
configurations.all {
@@ -44,7 +50,7 @@ configurations.all {
4450
force group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.18.0'
4551
force group: 'org.checkerframework', name: 'checker-qual', version: '3.33.0'
4652
force group: 'com.google.j2objc', name: 'j2objc-annotations', version: '2.8'
47-
force group: 'org.jenkins-ci.plugins', name: 'durable-task', version: '547.vd1ea_007d100c'
53+
force group: 'org.jenkins-ci.plugins', name: 'durable-task', version: '587.v84b_877235b_45'
4854
}
4955
}
5056

@@ -64,23 +70,32 @@ sourceSets {
6470
}
6571

6672
sharedLibrary {
67-
coreVersion = '2.426.3' // https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-core/
68-
testHarnessVersion = '2085.va_c531db_287b_d' // https://mvnrepository.com/artifact/org.jenkins-ci.main/jenkins-test-harness?repo=jenkins-releases
73+
coreVersion = '2.492.3' // https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-core/
74+
testHarnessVersion = '2457.vb_7281b_a_d62e8' // https://mvnrepository.com/artifact/org.jenkins-ci.main/jenkins-test-harness?repo=jenkins-releases
6975
pluginDependencies {
7076
// see https://mvnrepository.com/artifact/org.jenkins-ci.plugins/<name>?repo=jenkins-releases for latest
71-
workflowCpsGlobalLibraryPluginVersion = '609.vd95673f149b_b'
72-
dependency('io.jenkins.plugins', 'pipeline-groovy-lib', '613.v9c41a_160233f')
73-
dependency('org.jenkins-ci.plugins.workflow', 'workflow-multibranch', '2.26.1')
74-
dependency('org.jenkins-ci.plugins', 'pipeline-input-step', '456.vd8a_957db_5b_e9') // https://repo.jenkins-ci.org/public/org/jenkins-ci/plugins/pipeline-input-step/
75-
dependency('org.jenkins-ci.plugins', 'script-security', '1229.v4880b_b_e905a_6')
76-
dependency('org.jenkins-ci.plugins', 'credentials', '1112.vc87b_7a_3597f6')
77-
dependency('org.jenkins-ci.plugins', 'git-client', '3.11.1')
78-
dependency('org.apache.sshd', 'sshd-core', '2.12.1')
79-
dependency('org.jenkins-ci.plugins', 'junit', '1166.1168.vd6b_8042a_06de')
80-
dependency('org.jenkins-ci.plugins', 'mailer', '408.vd726a_1130320') // https://repo.jenkins-ci.org/public/org/jenkins-ci/plugins/mailer/
77+
dependency('io.jenkins.plugins', 'pipeline-groovy-lib', '752.vdddedf804e72')
78+
dependency('org.jenkins-ci.plugins.workflow', 'workflow-multibranch', '806.vb_b_688f609ee9')
79+
dependency('org.jenkins-ci.plugins', 'pipeline-input-step', '527.vd61b_1d3c5078') // https://repo.jenkins-ci.org/public/org/jenkins-ci/plugins/pipeline-input-step/
80+
dependency('org.jenkins-ci.plugins', 'script-security', '1373.vb_b_4a_a_c26fa_00')
81+
dependency('org.jenkins-ci.plugins', 'credentials', '1415.v831096eb_5534')
82+
dependency('org.jenkins-ci.plugins', 'git-client', '6.2.0')
83+
dependency('org.apache.sshd', 'sshd-core', '2.15.0')
84+
dependency('org.jenkins-ci.plugins', 'junit', '1335.v6b_a_a_e18534e1')
85+
dependency('org.jenkins-ci.plugins', 'mailer', '509.vc54d23fc427e') // https://repo.jenkins-ci.org/public/org/jenkins-ci/plugins/mailer/
8186
}
8287
}
8388

89+
// Configure tasks to use Java 17
90+
tasks.withType(JavaCompile) {
91+
options.release = 17
92+
}
93+
94+
tasks.withType(GroovyCompile) {
95+
sourceCompatibility = '17'
96+
targetCompatibility = '17'
97+
}
98+
8499
test {
85100
testLogging {
86101
events "failed"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
#
2+
# SPDX-License-Identifier: Apache-2.0
3+
#
4+
# The OpenSearch Contributors require contributions made to
5+
# this file be licensed under the Apache-2.0 license or a
6+
# compatible open source license.
7+
#
8+
# Modifications Copyright OpenSearch Contributors. See
9+
# GitHub history for details.
10+
#
11+
112
distributionBase=GRADLE_USER_HOME
213
distributionPath=wrapper/dists
314
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip

0 commit comments

Comments
 (0)