From 62820f701826a36252439d17332b3e92bcd01614 Mon Sep 17 00:00:00 2001 From: "Bala.FA" Date: Mon, 19 Aug 2024 10:05:41 +0530 Subject: [PATCH] upgrade gradle and dependencies Signed-off-by: Bala.FA --- .github/workflows/codeql-analysis.yml | 8 +++---- .github/workflows/gradle.yml | 6 ++--- build.gradle | 30 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 20 ++++++++-------- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 723e3aa7b..a3d742403 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,11 +39,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -54,7 +54,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -68,4 +68,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 87a2ccb8b..0bd5213c4 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -14,11 +14,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java-version: ['8', '11', '17'] + java-version: ['8', '11', '17', '21'] os: [ubuntu-latest, windows-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check limited Guava usage if: matrix.os == 'ubuntu-latest' run: | @@ -27,7 +27,7 @@ jobs: exit 1 fi - name: Setup java ${{ matrix.java-version }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: ${{ matrix.java-version }} diff --git a/build.gradle b/build.gradle index 7fdf71b21..c62162d9e 100644 --- a/build.gradle +++ b/build.gradle @@ -14,16 +14,16 @@ * limitations under the License. */ -/*****************************/ -/* gradleVersion = '8.6' */ -/*****************************/ +/******************************/ +/* gradleVersion = '8.10' */ +/******************************/ plugins { id "com.github.johnrengelman.shadow" version "8.1.1" id "com.github.spotbugs" version "5.2.1" id "io.codearte.nexus-staging" version "0.30.0" id "de.marcphilipp.nexus-publish" version "0.4.0" - id "com.diffplug.spotless" version "6.13.0" + id "com.diffplug.spotless" version "6.14.1" } /* @@ -52,16 +52,16 @@ subprojects { dependencies { api "com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" - api "com.google.guava:guava:33.0.0-jre" + api "com.google.guava:guava:33.3.0-jre" api "com.squareup.okhttp3:okhttp:4.12.0" - api "com.fasterxml.jackson.core:jackson-annotations:2.16.1" - api "com.fasterxml.jackson.core:jackson-core:2.16.1" - api "com.fasterxml.jackson.core:jackson-databind:2.16.1" - api "org.bouncycastle:bcprov-jdk18on:1.78" - api "org.apache.commons:commons-compress:1.26.0" - api "commons-codec:commons-codec:1.16.1" - api "org.xerial.snappy:snappy-java:1.1.10.5" - compileOnly "com.github.spotbugs:spotbugs-annotations:4.8.3" + api "com.fasterxml.jackson.core:jackson-annotations:2.17.2" + api "com.fasterxml.jackson.core:jackson-core:2.17.2" + api "com.fasterxml.jackson.core:jackson-databind:2.17.2" + api "org.bouncycastle:bcprov-jdk18on:1.78.1" + api "org.apache.commons:commons-compress:1.27.0" + api "commons-codec:commons-codec:1.17.1" + api "org.xerial.snappy:snappy-java:1.1.10.6" + compileOnly "com.github.spotbugs:spotbugs-annotations:4.8.6" testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0" testImplementation "junit:junit:4.13.2" @@ -243,7 +243,7 @@ project(':adminapi') { dependencies { api project(':api') - api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1" + api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2" testImplementation project(':api') } @@ -347,7 +347,7 @@ project(':adminapi') { project(':examples') { dependencies { - compileOnly "me.tongfei:progressbar:0.9.5" + compileOnly "me.tongfei:progressbar:0.10.1" compileOnly project(':api') } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..9355b4155 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f1..25da30dbd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail