From 85814c3f5fff5f74b048b6b70485e4a832c9d3d2 Mon Sep 17 00:00:00 2001
From: Ivan Hargreaves <ivanh@uk.ibm.com>
Date: Fri, 24 Jul 2026 17:19:20 +0100
Subject: [PATCH] Standards fixes: BOM property, root .project,
 wst.common.component src/main/resources, build/cleanup workflows

---
 .github/workflows/build.yaml                  |  1 -
 .github/workflows/cleanup-old-runs.yaml       |  3 +++
 .project                                      | 21 +------------------
 .../org.eclipse.wst.common.component          |  3 ++-
 .../build.gradle                              |  8 +++----
 cics-java-liberty-springboot-link-app/pom.xml |  5 +++--
 gradle.properties                             |  1 +
 pom.xml                                       |  3 ++-
 8 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 90d5103..0ddced1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,7 +42,6 @@ jobs:
         with:
           java-version: ${{ matrix.jdk }}
           distribution: "semeru"
-          cache: maven
       - name: Build with Maven
         run: mvn --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} verify
 
diff --git a/.github/workflows/cleanup-old-runs.yaml b/.github/workflows/cleanup-old-runs.yaml
index 384754d..496882e 100644
--- a/.github/workflows/cleanup-old-runs.yaml
+++ b/.github/workflows/cleanup-old-runs.yaml
@@ -1,5 +1,8 @@
 name: Cleanup old workflow runs
 
+permissions:
+  contents: read
+
 on:
   schedule:
     - cron: '0 0 * * 0'  # Run weekly on Sunday at midnight UTC
diff --git a/.project b/.project
index 952ff54..99e20bb 100644
--- a/.project
+++ b/.project
@@ -10,21 +10,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -32,11 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/cics-java-liberty-springboot-link-app/.settings/org.eclipse.wst.common.component b/cics-java-liberty-springboot-link-app/.settings/org.eclipse.wst.common.component
index a5ee06a..51348ce 100644
--- a/cics-java-liberty-springboot-link-app/.settings/org.eclipse.wst.common.component
+++ b/cics-java-liberty-springboot-link-app/.settings/org.eclipse.wst.common.component
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-modules id="moduleCoreId" project-version="1.5.0">
-	<wb-module deploy-name="cics-java-liberty-springboot-link-app">
+	<wb-module deploy-name="cics-java-liberty-springboot-link">
 		<property name="context-root" value="cics-java-liberty-springboot-link"/>
+		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
 		<wb-resource deploy-path="/" source-path="src/main/webapp"/>
 	</wb-module>
diff --git a/cics-java-liberty-springboot-link-app/build.gradle b/cics-java-liberty-springboot-link-app/build.gradle
index 7c833e9..01b301c 100644
--- a/cics-java-liberty-springboot-link-app/build.gradle
+++ b/cics-java-liberty-springboot-link-app/build.gradle
@@ -72,11 +72,9 @@ dependencies
     // Don't include TomCat in the runtime build, but put it in lib-provided so it can run standalone as well as embedded
     providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
 
-	// CICS TS V6.1 Maven BOM (as of Sept 2024)
-	   def bom = "com.ibm.cics:com.ibm.cics.ts.bom:6.1-20250812133513-PH63856"
-
-    compileOnly enforcedPlatform(bom)
-    annotationProcessor enforcedPlatform(bom)
+	// CICS TS Maven BOM (version from gradle.properties)
+	   compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${project.property('cics.bom.version')}")
+	   annotationProcessor enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${project.property('cics.bom.version')}")
     
     annotationProcessor("com.ibm.cics:com.ibm.cics.server.invocation")  
 
diff --git a/cics-java-liberty-springboot-link-app/pom.xml b/cics-java-liberty-springboot-link-app/pom.xml
index 5f1dc50..b6d07bf 100644
--- a/cics-java-liberty-springboot-link-app/pom.xml
+++ b/cics-java-liberty-springboot-link-app/pom.xml
@@ -20,13 +20,13 @@
     <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
   </properties>
   
-  <!-- CICS TS V6.1 BOM (as of Sept 2024) -->
+  <!-- CICS TS BOM (version from root pom.xml property) -->
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>com.ibm.cics</groupId>
         <artifactId>com.ibm.cics.ts.bom</artifactId>
-        <version>6.1-20250812133513-PH63856</version>
+        <version>${cics.bom.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -86,6 +86,7 @@
 
   <!-- Build with Maven and CICS annotation processor -->
   <build>
+    <finalName>cics-java-liberty-springboot-link</finalName>
     <plugins>
       <!-- Spring Boot plugin for Maven -->
       <plugin>
diff --git a/gradle.properties b/gradle.properties
index 6bbd3c4..5bb8537 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,6 @@
 # Centralized Java version for Gradle toolchain and Maven compiler
 java_version = 17
+cics.bom.version=6.1-20250812133513-PH63856
 
 # Gradle daemon improves build performance
 org.gradle.daemon=true
diff --git a/pom.xml b/pom.xml
index 6ab9336..c040963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
     <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <cics.jvmserver>DFHWLP</cics.jvmserver>
+    <cics.bom.version>6.1-20250812133513-PH63856</cics.bom.version>
   </properties>
   
   <!-- Dependency Management -->
@@ -33,7 +34,7 @@
       <dependency>
         <groupId>com.ibm.cics</groupId>
         <artifactId>com.ibm.cics.ts.bom</artifactId>
-        <version>6.1-20250812133513-PH63856</version>
+        <version>${cics.bom.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>