From 19760c4dc25a91ff371b17d417c4da86000d4222 Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 15:08:34 +0100 Subject: [PATCH 1/6] Trim root jdt.core.prefs to standard form; fix M2e classpath attributes --- .settings/org.eclipse.jdt.core.prefs | 5 ----- cics-java-liberty-springboot-transactions-app/.classpath | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 8c9943d..62ef348 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,6 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error diff --git a/cics-java-liberty-springboot-transactions-app/.classpath b/cics-java-liberty-springboot-transactions-app/.classpath index 816f63d..bea4734 100644 --- a/cics-java-liberty-springboot-transactions-app/.classpath +++ b/cics-java-liberty-springboot-transactions-app/.classpath @@ -13,6 +13,11 @@ - + + + + + + From 70251830c181fd08de782ccd6f75cf313492af0a Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 15:28:47 +0100 Subject: [PATCH 2/6] Fix root .project WTP natures; BOM to gradle.properties; fix wst.common.component; tidy .project, .gitignore, build.yaml --- .github/workflows/build.yaml | 6 ++-- .gitignore | 1 + .project | 19 ---------- .../.project | 36 ++++++++++--------- .../build.gradle | 2 +- gradle.properties | 3 ++ 6 files changed, 28 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8e3afd3..487aad2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,12 +1,13 @@ name: Build +permissions: + contents: read + on: push: branches: ["main"] pull_request: branches: ["main"] -permissions: - contents: read jobs: check-copyright: @@ -99,4 +100,3 @@ jobs: distribution: 'semeru' - name: Build with Gradle Wrapper run: ./gradlew clean build -Pjava_version=${{ matrix.jdk }} - diff --git a/.gitignore b/.gitignore index d829b3c..40d4abd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ !src/**/build/ gradle-app.setting !gradle-wrapper.jar +!gradle-wrapper.properties # Maven target/ diff --git a/.project b/.project index 098fb41..ebee31b 100644 --- a/.project +++ b/.project @@ -5,21 +5,6 @@ - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - org.eclipse.buildship.core.gradleprojectbuilder @@ -32,10 +17,6 @@ - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature org.eclipse.buildship.core.gradleprojectnature org.eclipse.m2e.core.maven2Nature diff --git a/cics-java-liberty-springboot-transactions-app/.project b/cics-java-liberty-springboot-transactions-app/.project index d3b4142..dced597 100644 --- a/cics-java-liberty-springboot-transactions-app/.project +++ b/cics-java-liberty-springboot-transactions-app/.project @@ -2,37 +2,41 @@ cics-java-liberty-springboot-transactions-app - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature - org.eclipse.m2e.core.maven2Nature - + + org.eclipse.jdt.core.javabuilder - + + org.eclipse.wst.common.project.facet.core.builder - + + org.eclipse.wst.validation.validationbuilder - + + org.eclipse.buildship.core.gradleprojectbuilder - + + org.eclipse.m2e.core.maven2Builder - + + - - + + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.buildship.core.gradleprojectnature + org.eclipse.m2e.core.maven2Nature + diff --git a/cics-java-liberty-springboot-transactions-app/build.gradle b/cics-java-liberty-springboot-transactions-app/build.gradle index 6f9289f..f124378 100644 --- a/cics-java-liberty-springboot-transactions-app/build.gradle +++ b/cics-java-liberty-springboot-transactions-app/build.gradle @@ -63,7 +63,7 @@ repositories dependencies { // CICS BOM (as of Sept 2024) - compileOnly enforcedPlatform('com.ibm.cics:com.ibm.cics.ts.bom:6.1-20250812133513-PH63856') + compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${cicsBomVersion}") // Don't include JCICS in the final build (no need for version because we have BOM) compileOnly("com.ibm.cics:com.ibm.cics.server") diff --git a/gradle.properties b/gradle.properties index 0ae2a21..1413043 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,3 +12,6 @@ org.gradle.java.installations.auto-download=true # Configuration cache disabled - CICS Bundle Plugin 1.0.8 not compatible # org.gradle.configuration-cache=true + +# CICS TS BOM version +cicsBomVersion=6.1-20250812133513-PH63856 From 763851393b9e07da488d7e981378dce7b7778a1e Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 15:41:05 +0100 Subject: [PATCH 3/6] Rename cleanup-old-runs.yml to .yaml for consistency --- .github/workflows/{cleanup-old-runs.yml => cleanup-old-runs.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{cleanup-old-runs.yml => cleanup-old-runs.yaml} (100%) diff --git a/.github/workflows/cleanup-old-runs.yml b/.github/workflows/cleanup-old-runs.yaml similarity index 100% rename from .github/workflows/cleanup-old-runs.yml rename to .github/workflows/cleanup-old-runs.yaml From c07b9f314b43e9c5788f49b44ec7b6ed7eaa7d91 Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 15:48:05 +0100 Subject: [PATCH 4/6] Fix cleanup workflow permissions: actions:write at job level only --- .github/workflows/cleanup-old-runs.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cleanup-old-runs.yaml b/.github/workflows/cleanup-old-runs.yaml index 0ea8903..684e91d 100644 --- a/.github/workflows/cleanup-old-runs.yaml +++ b/.github/workflows/cleanup-old-runs.yaml @@ -1,7 +1,6 @@ name: Cleanup Old Workflow Runs permissions: - actions: write contents: read on: @@ -12,11 +11,13 @@ on: jobs: cleanup: runs-on: ubuntu-latest + permissions: + actions: write steps: - - name: Delete old workflow runs (including this workflow) + - name: Delete old workflow runs uses: Mattraks/delete-workflow-runs@v2 with: token: ${{ github.token }} repository: ${{ github.repository }} retain_days: 30 - keep_minimum_runs: 3 # Keep at least 3 recent runs of each workflow + keep_minimum_runs: 6 From c73a6d6850cbc95c16ba5629842c70b43c735d92 Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 15:57:13 +0100 Subject: [PATCH 5/6] Rename cicsBomVersion to cics.bom.version for consistency with Maven property name --- cics-java-liberty-springboot-transactions-app/build.gradle | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cics-java-liberty-springboot-transactions-app/build.gradle b/cics-java-liberty-springboot-transactions-app/build.gradle index f124378..34e4392 100644 --- a/cics-java-liberty-springboot-transactions-app/build.gradle +++ b/cics-java-liberty-springboot-transactions-app/build.gradle @@ -63,7 +63,7 @@ repositories dependencies { // CICS BOM (as of Sept 2024) - compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${cicsBomVersion}") + compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${project.property('cics.bom.version')}") // Don't include JCICS in the final build (no need for version because we have BOM) compileOnly("com.ibm.cics:com.ibm.cics.server") diff --git a/gradle.properties b/gradle.properties index 1413043..f45f611 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,4 +14,4 @@ org.gradle.java.installations.auto-download=true # org.gradle.configuration-cache=true # CICS TS BOM version -cicsBomVersion=6.1-20250812133513-PH63856 +cics.bom.version=6.1-20250812133513-PH63856 From 9c1eb04b516c4793fa6a14142188e167b9bcea8f Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 16:24:16 +0100 Subject: [PATCH 6/6] Add cics.bom.version property to root pom, use in BOM import, add src/main/resources wb-resource --- .../.settings/org.eclipse.wst.common.component | 1 + cics-java-liberty-springboot-transactions-app/pom.xml | 2 +- pom.xml | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cics-java-liberty-springboot-transactions-app/.settings/org.eclipse.wst.common.component b/cics-java-liberty-springboot-transactions-app/.settings/org.eclipse.wst.common.component index 6973e61..b8d0636 100644 --- a/cics-java-liberty-springboot-transactions-app/.settings/org.eclipse.wst.common.component +++ b/cics-java-liberty-springboot-transactions-app/.settings/org.eclipse.wst.common.component @@ -3,6 +3,7 @@ + diff --git a/cics-java-liberty-springboot-transactions-app/pom.xml b/cics-java-liberty-springboot-transactions-app/pom.xml index 29c11c9..9f5de92 100644 --- a/cics-java-liberty-springboot-transactions-app/pom.xml +++ b/cics-java-liberty-springboot-transactions-app/pom.xml @@ -28,7 +28,7 @@ com.ibm.cics com.ibm.cics.ts.bom - 6.1-20250812133513-PH63856 + ${cics.bom.version} pom import diff --git a/pom.xml b/pom.xml index b3fe9e4..6980cce 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ 17 UTF-8 DFHWLP + 6.1-20250812133513-PH63856 @@ -33,7 +34,7 @@ com.ibm.cics com.ibm.cics.ts.bom - 6.1-20250812133513-PH63856 + ${cics.bom.version} pom import