diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml index ae100dd..53b5d7f 100644 --- a/.github/workflows/java.yaml +++ b/.github/workflows/java.yaml @@ -8,6 +8,9 @@ on: schedule: - cron: '0 0 * * *' +permissions: + contents: read + jobs: build-maven: name: Build Maven @@ -31,7 +34,7 @@ jobs: cache: maven - name: Build with Maven run: mvn --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} package - - run: mkdir staging && cp target/*.war staging + - run: mkdir staging && cp cics-java-liberty-springboot-jdbc-app/target/*.war staging - uses: actions/upload-artifact@v4 with: name: cics-java-liberty-sprintboot-jdbc (Maven, Java ${{ matrix.jdk }}) @@ -80,6 +83,30 @@ jobs: java-version: ${{ matrix.jdk }} distribution: 'semeru' - name: Build with Gradle - uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0 + uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 with: arguments: bootWar -Pjava_version=${{ matrix.jdk }} + + build-gradlew: + name: Build Gradle wrapper + + runs-on: ubuntu-latest + continue-on-error: ${{ matrix.experimental }} + strategy: + matrix: + jdk: [17, 21] + experimental: [false] + include: + - jdk: 25 + experimental: true + steps: + - uses: actions/checkout@v3 + - name: Set up JDK ${{ matrix.jdk }} + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.jdk }} + distribution: 'semeru' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + - name: Build with Gradle + run: ./gradlew build bootWar -Pjava_version=${{ matrix.jdk }} diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 1a5b2aa..454e07e 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,9 +1,15 @@ - - - - - - - - + + + + + + + + + + + + + + diff --git a/etc/config/cics_bundle_project/cics-java-liberty-springboot-jdbc-cicsbundle-0.1.0/META-INF/cics.xml b/etc/config/cics_bundle_project/cics-java-liberty-springboot-jdbc-cicsbundle-1.0.0/META-INF/cics.xml similarity index 77% rename from etc/config/cics_bundle_project/cics-java-liberty-springboot-jdbc-cicsbundle-0.1.0/META-INF/cics.xml rename to etc/config/cics_bundle_project/cics-java-liberty-springboot-jdbc-cicsbundle-1.0.0/META-INF/cics.xml index d94bf46..b2966ce 100644 --- a/etc/config/cics_bundle_project/cics-java-liberty-springboot-jdbc-cicsbundle-0.1.0/META-INF/cics.xml +++ b/etc/config/cics_bundle_project/cics-java-liberty-springboot-jdbc-cicsbundle-1.0.0/META-INF/cics.xml @@ -1,7 +1,7 @@ - + - 2026-04-30T06:27:31.459931Z + 2026-05-05T16:01:06.431684Z diff --git a/etc/config/cics_bundle_project/cics-java-liberty-springboot-jdbc-cicsbundle-0.1.0/cics-java-liberty-springboot-jdbc.warbundle b/etc/config/cics_bundle_project/cics-java-liberty-springboot-jdbc-cicsbundle-1.0.0/cics-java-liberty-springboot-jdbc.warbundle similarity index 100% rename from etc/config/cics_bundle_project/cics-java-liberty-springboot-jdbc-cicsbundle-0.1.0/cics-java-liberty-springboot-jdbc.warbundle rename to etc/config/cics_bundle_project/cics-java-liberty-springboot-jdbc-cicsbundle-1.0.0/cics-java-liberty-springboot-jdbc.warbundle diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..1b33c55 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..aaaabb3 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.14.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..23d15a9 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -112,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -203,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -211,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 7101f8e..5eed7ee 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -68,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell