Skip to content

Update Gradle Wrapper to 7.4.2 #2289

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

Merged
peterzhuamazon merged 2 commits into from
Jul 7, 2022
Merged

Update Gradle Wrapper to 7.4.2 #2289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ee7ffa
Update Gradle Wrapper to 7.4.2
dbwiddis Jun 30, 2022
bda0683
Update Jenkins scan to new Gradle version
dbwiddis Jun 30, 2022
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ repositories {
}

dependencies {
compile group: 'junit', name: 'junit', version: '4.13.2'
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.9', ext: 'pom'
implementation group: 'com.cloudbees', name: 'groovy-cps', version: '1.31'
testImplementation group: 'org.yaml', name: 'snakeyaml', version: '1.29'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
15 changes: 1 addition & 14 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@

#
# SPDX-License-Identifier: Apache-2.0
#
# The OpenSearch Contributors require contributions made to
# this file be licensed under the Apache-2.0 license or a
# compatible open source license.
#
# Modifications Copyright OpenSearch Contributors. See
# GitHub history for details.
#

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5
259 changes: 154 additions & 105 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions jenkins/vulnerability-scan/whitesource-scan.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ pipeline {

void scan() {
sh """
curl -SLO https://services.gradle.org/distributions/gradle-6.6.1-bin.zip
unzip gradle-6.6.1-bin.zip
GRADLE_HOME=`realpath gradle-6.6.1`
curl -SLO https://services.gradle.org/distributions/gradle-7.4.2-bin.zip
Copy link
Copy Markdown
Member

@zelinh zelinh Jul 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes from our latest Jenkins WS scan I see this kind of error on scanning OpenSearch repo

[WARN] [2022-07-01 03:18:01,879 +0000] - Read error line #5: A problem occurred evaluating project ':buildSrc'.
[WARN] [2022-07-01 03:18:01,879 +0000] - Read error line #6: > Gradle 7.4.1+ is required to build opensearch

Updating the gradle version here should helps. I will do some offline runs to validate this as well.

unzip gradle-7.4.2-bin.zip
GRADLE_HOME=`realpath gradle-7.4.2`
export PATH=\${GRADLE_HOME}/bin:\$PATH
gradle --version
cd ./tools/vulnerability-scan/
Expand Down