diff --git a/.github/workflows/gradle.yaml b/.github/workflows/gradle.yaml index 92b7a55d3..8e6e1d92f 100644 --- a/.github/workflows/gradle.yaml +++ b/.github/workflows/gradle.yaml @@ -104,7 +104,7 @@ jobs: git clone --branch=master https://github.com/vmware/singleton.git server cd $GITHUB_WORKSPACE/server/g11n-ws && ./gradlew build -x test find $GITHUB_WORKSPACE/server/publish/ -name 'singleton-[0~9]*.jar' -exec mv '{}' $GITHUB_WORKSPACE/server/publish/singleton.jar \; - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: singleton-service path: ./server/publish/singleton.jar @@ -122,7 +122,7 @@ jobs: with: distribution: 'adopt-openj9' java-version: '8' - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4 with: name: singleton-service - name: Smoke Test diff --git a/build.gradle b/build.gradle index 85b83497c..666db49da 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 VMware, Inc. + * Copyright 2019-2025 VMware, Inc. * SPDX-License-Identifier: EPL-2.0 */ apply plugin: 'java' @@ -37,9 +37,7 @@ dependencies { compile group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '2.3.1' compile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' compile group: 'org.apache.taglibs', name: 'taglibs-standard-impl', version: '1.2.5' - compile("com.googlecode.json-simple:json-simple:1.1.1") { - exclude group: 'junit' - } + compile group: 'org.json', name: 'json', version: '20250107' compile group: 'com.vmware.singleton', name: 'singleton-i18n-patterns-core', version: '[0.5.1,)' compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30' testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.30'