From 61c2b292c47adf1daa8c2e17d1a65c710fb40596 Mon Sep 17 00:00:00 2001 From: Ayushi Kumari Date: Tue, 9 Jun 2026 21:37:01 +0530 Subject: [PATCH 1/6] Updated Yaml --- .github/workflows/build.yaml | 7 ++----- .github/workflows/cleanup-old-runs.yml | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 77d4356..71bd8d8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -59,8 +59,7 @@ jobs: with: java-version: ${{ matrix.jdk }} distribution: "semeru" - cache: maven - - name: Build with Maven + - name: Build with Maven Wrapper run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} verify build-gradle: @@ -99,6 +98,4 @@ jobs: java-version: ${{ matrix.jdk }} distribution: 'semeru' - name: Build with Gradle Wrapper - run: ./gradlew clean build -Pjava_version=${{ matrix.jdk }} - -# Made with Bob + run: ./gradlew clean build -Pjava_version=${{ matrix.jdk }} diff --git a/.github/workflows/cleanup-old-runs.yml b/.github/workflows/cleanup-old-runs.yml index 089e879..0ea8903 100644 --- a/.github/workflows/cleanup-old-runs.yml +++ b/.github/workflows/cleanup-old-runs.yml @@ -20,5 +20,3 @@ jobs: repository: ${{ github.repository }} retain_days: 30 keep_minimum_runs: 3 # Keep at least 3 recent runs of each workflow - -# Made with Bob \ No newline at end of file From 4790f85b01360fc2caf4691d68b1a3fd76e79e74 Mon Sep 17 00:00:00 2001 From: Ayushi Kumari Date: Tue, 9 Jun 2026 22:09:36 +0530 Subject: [PATCH 2/6] Updated files --- .github/workflows/build.yaml | 10 +++++----- cics-java-liberty-link-app/build.gradle | 6 ++++-- gradle.properties | 10 ++++++++++ pom.xml | 18 +++++++++++++++++- settings.gradle | 7 +++++++ 5 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 gradle.properties diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 71bd8d8..09e4c2b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -60,8 +60,8 @@ jobs: java-version: ${{ matrix.jdk }} distribution: "semeru" - name: Build with Maven Wrapper - run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} verify - + run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} package + build-gradle: name: Build Gradle @@ -84,8 +84,8 @@ jobs: run: gradle build -Pjava_version=${{ matrix.jdk }} build-gradlew: - name: Build Gradle Wrapper - + name: Build Gradle wrapper + runs-on: ubuntu-latest strategy: matrix: @@ -98,4 +98,4 @@ jobs: java-version: ${{ matrix.jdk }} distribution: 'semeru' - name: Build with Gradle Wrapper - run: ./gradlew clean build -Pjava_version=${{ matrix.jdk }} + run: ./gradlew build -Pjava_version=${{ matrix.jdk }} diff --git a/cics-java-liberty-link-app/build.gradle b/cics-java-liberty-link-app/build.gradle index 58a5209..8395aff 100644 --- a/cics-java-liberty-link-app/build.gradle +++ b/cics-java-liberty-link-app/build.gradle @@ -12,8 +12,10 @@ version = '1.0.0' java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + toolchain + { + languageVersion = JavaLanguageVersion.of(java_version) + } } // If in Eclipse, add Javadoc to the local project classpath diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..2e2acde --- /dev/null +++ b/gradle.properties @@ -0,0 +1,10 @@ +java_version = 17 + +# Gradle daemon improves build performance +org.gradle.daemon=true + +# Enable parallel builds for faster compilation +org.gradle.parallel=true + +# Configuration cache disabled - CICS Bundle Plugin 1.0.8 not compatible +# org.gradle.configuration-cache=true \ No newline at end of file diff --git a/pom.xml b/pom.xml index e0c80f2..98e441f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ com.ibm.cics.server.invocation.CICSProgram annotation for Link to Liberty. - 1.8 + 17 DFHWLP UTF-8 ${java.version} @@ -38,4 +38,20 @@ cics-java-liberty-link-app cics-java-liberty-link-bundle + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + + + + diff --git a/settings.gradle b/settings.gradle index 93b433f..b028d48 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,10 @@ +// ============================================================================ +// Root Project Configuration +// ============================================================================ rootProject.name = 'cics-java-liberty-link' + +// ============================================================================ +// Subprojects +// ============================================================================ include(':cics-java-liberty-link-app') include(':cics-java-liberty-link-bundle') From 34fb3d2b5b298e64b9e063c1f8a460af541c72f4 Mon Sep 17 00:00:00 2001 From: Ayushi Kumari Date: Tue, 9 Jun 2026 22:12:40 +0530 Subject: [PATCH 3/6] Updated Pom file --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 98e441f..74086e2 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.13.0 ${java.version} From 45403a4344d3c6b11a0a9dd8bd2aa2e554b9436b Mon Sep 17 00:00:00 2001 From: Ayushi Kumari Date: Tue, 9 Jun 2026 22:21:19 +0530 Subject: [PATCH 4/6] Updated files --- gradle.properties | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2e2acde..c7bb65b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -java_version = 17 +java_version = 8 # Gradle daemon improves build performance org.gradle.daemon=true diff --git a/pom.xml b/pom.xml index 74086e2..1fd1233 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ com.ibm.cics.server.invocation.CICSProgram annotation for Link to Liberty. - 17 + 8 DFHWLP UTF-8 ${java.version} From dac3c3b099e13219f7b3d7421a926a8a402c2e79 Mon Sep 17 00:00:00 2001 From: Ayushi Kumari Date: Tue, 9 Jun 2026 22:23:54 +0530 Subject: [PATCH 5/6] Updated Pom.xml file --- cics-java-liberty-link-app/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cics-java-liberty-link-app/pom.xml b/cics-java-liberty-link-app/pom.xml index a88dbc0..9f27b43 100644 --- a/cics-java-liberty-link-app/pom.xml +++ b/cics-java-liberty-link-app/pom.xml @@ -32,12 +32,12 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.1 + 3.13.0 com.ibm.cics - com.ibm.cics.server.invocation + com.ibm.cics.server.invocation From af133008f24c59878ab529eaa282d55982921837 Mon Sep 17 00:00:00 2001 From: Ayushi Kumari Date: Tue, 9 Jun 2026 22:36:21 +0530 Subject: [PATCH 6/6] Updated pom.xml file --- pom.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1fd1233..7e589a4 100644 --- a/pom.xml +++ b/pom.xml @@ -44,14 +44,11 @@ - + org.apache.maven.plugins maven-compiler-plugin 3.13.0 - - ${java.version} -