From 1be69b9f395843821e7b327d4adf2e174a906b52 Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 15:08:37 +0100 Subject: [PATCH 1/6] Trim root jdt.core.prefs to standard form; fix Buildship and M2e classpath attributes --- .settings/org.eclipse.jdt.core.prefs | 5 ----- .../.classpath | 7 ++++++- .../.settings/org.eclipse.buildship.core.prefs | 11 ----------- 3 files changed, 6 insertions(+), 17 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-asynchronous-app/.classpath b/cics-java-liberty-springboot-asynchronous-app/.classpath index 816f63d..bea4734 100644 --- a/cics-java-liberty-springboot-asynchronous-app/.classpath +++ b/cics-java-liberty-springboot-asynchronous-app/.classpath @@ -13,6 +13,11 @@ - + + + + + + diff --git a/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.buildship.core.prefs b/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.buildship.core.prefs index 258eb47..b1886ad 100644 --- a/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.buildship.core.prefs +++ b/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.buildship.core.prefs @@ -1,13 +1,2 @@ -arguments= -auto.sync=false -build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir=.. eclipse.preferences.version=1 -gradle.user.home= -java.home= -jvm.arguments= -offline.mode=false -override.workspace.settings=false -show.console.view=false -show.executions.view=false From 472d2a6037e1f40ab3f3b3b83b0a77cfde1b85a1 Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 15:16:46 +0100 Subject: [PATCH 2/6] Fix root .project WTP natures; extract BOM version to gradle.properties; tidy ibm-web-ext.xml --- .project | 21 +------------------ .../build.gradle | 2 +- .../src/main/webapp/WEB-INF/ibm-web-ext.xml | 5 +---- gradle.properties | 5 ++++- 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/.project b/.project index 9541560..f4e439f 100644 --- a/.project +++ b/.project @@ -10,21 +10,6 @@ - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - org.eclipse.m2e.core.maven2Builder @@ -32,11 +17,7 @@ - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature org.eclipse.buildship.core.gradleprojectnature + org.eclipse.m2e.core.maven2Nature diff --git a/cics-java-liberty-springboot-asynchronous-app/build.gradle b/cics-java-liberty-springboot-asynchronous-app/build.gradle index 343185f..f46bba3 100644 --- a/cics-java-liberty-springboot-asynchronous-app/build.gradle +++ b/cics-java-liberty-springboot-asynchronous-app/build.gradle @@ -63,7 +63,7 @@ dependencies // Use correct BOM version for CICS TS (6.1 is the minimum supported release for this sample) // If you are running on a higher CICS TS version, you may replace this with a newer BOM) - 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}")) // JCICS API (version inherited from BOM) compileOnly("com.ibm.cics:com.ibm.cics.server") diff --git a/cics-java-liberty-springboot-asynchronous-app/src/main/webapp/WEB-INF/ibm-web-ext.xml b/cics-java-liberty-springboot-asynchronous-app/src/main/webapp/WEB-INF/ibm-web-ext.xml index 67b05e8..d04a6ab 100644 --- a/cics-java-liberty-springboot-asynchronous-app/src/main/webapp/WEB-INF/ibm-web-ext.xml +++ b/cics-java-liberty-springboot-asynchronous-app/src/main/webapp/WEB-INF/ibm-web-ext.xml @@ -5,8 +5,5 @@ xsi:schemaLocation="http://websphere.ibm.com/xml/ns/javaee http://websphere.ibm.com/xml/ns/javaee/ibm-web-ext_1_0.xsd" version="1.0"> - - - - + diff --git a/gradle.properties b/gradle.properties index ebe8699..535deb4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,7 @@ org.gradle.java.installations.auto-detect=true org.gradle.java.installations.auto-download=true # Configuration cache disabled due to CICS Bundle Plugin 1.0.8 incompatibility -# org.gradle.configuration-cache=true \ No newline at end of file +# org.gradle.configuration-cache=true + +# CICS TS BOM version +cicsBomVersion=6.1-20250812133513-PH63856 \ No newline at end of file From be602d51ba746a36b994d074f93ef684f9d0e041 Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 15:41:04 +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 4d5ca6fcf14187fe8a831ae0bc5b3e983a501294 Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 15:48:00 +0100 Subject: [PATCH 4/6] Fix cleanup workflow permissions: actions:write at job level only --- .github/workflows/cleanup-old-runs.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cleanup-old-runs.yaml b/.github/workflows/cleanup-old-runs.yaml index e72e8df..b176fd5 100644 --- a/.github/workflows/cleanup-old-runs.yaml +++ b/.github/workflows/cleanup-old-runs.yaml @@ -1,17 +1,18 @@ name: Cleanup Old Workflow Runs +permissions: + contents: read + on: schedule: - cron: '0 0 * * 0' # Run weekly on Sunday at midnight UTC workflow_dispatch: # Allow manual triggering -permissions: - actions: write - contents: read - jobs: cleanup: runs-on: ubuntu-latest + permissions: + actions: write steps: - name: Delete old workflow runs uses: Mattraks/delete-workflow-runs@v2 @@ -20,4 +21,3 @@ jobs: repository: ${{ github.repository }} retain_days: 30 keep_minimum_runs: 6 - From 576469ed558fc52aed118674260d54b232d621c7 Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 15:57:18 +0100 Subject: [PATCH 5/6] Rename cicsBomVersion to cics.bom.version for consistency with Maven property name --- cics-java-liberty-springboot-asynchronous-app/build.gradle | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cics-java-liberty-springboot-asynchronous-app/build.gradle b/cics-java-liberty-springboot-asynchronous-app/build.gradle index f46bba3..8f9de42 100644 --- a/cics-java-liberty-springboot-asynchronous-app/build.gradle +++ b/cics-java-liberty-springboot-asynchronous-app/build.gradle @@ -63,7 +63,7 @@ dependencies // Use correct BOM version for CICS TS (6.1 is the minimum supported release for this sample) // If you are running on a higher CICS TS version, you may replace this with a newer BOM) - 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')}")) // JCICS API (version inherited from BOM) compileOnly("com.ibm.cics:com.ibm.cics.server") diff --git a/gradle.properties b/gradle.properties index 535deb4..9007fbf 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 \ No newline at end of file +cics.bom.version=6.1-20250812133513-PH63856 \ No newline at end of file From 1492b89f565f6aaf55c83b89e86409568f5b52c9 Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 16:24:21 +0100 Subject: [PATCH 6/6] Add cics.bom.version property to root pom, use in BOM import, add src/main/resources wb-resource and wst.validation.prefs --- .../.settings/org.eclipse.wst.common.component | 1 + cics-java-liberty-springboot-asynchronous-app/pom.xml | 2 +- pom.xml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.wst.common.component b/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.wst.common.component index a3a0305..811df99 100644 --- a/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.wst.common.component +++ b/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.wst.common.component @@ -3,6 +3,7 @@ + diff --git a/cics-java-liberty-springboot-asynchronous-app/pom.xml b/cics-java-liberty-springboot-asynchronous-app/pom.xml index 2d53aad..f9931b1 100644 --- a/cics-java-liberty-springboot-asynchronous-app/pom.xml +++ b/cics-java-liberty-springboot-asynchronous-app/pom.xml @@ -31,7 +31,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 b15dc84..878eb5c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ 17 UTF-8 DFHWLP + 6.1-20250812133513-PH63856