Validation fixes: build config, CI workflow, Eclipse config, server.xml, README

.classpath

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="bin/main" path="src/main/java">
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
+			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

.github/workflows/build.yaml

@@ -5,8 +5,6 @@ on:
     branches: ["main"]
   pull_request:
     branches: ["main"]
-  schedule:
-    - cron: '0 0 * * *'
 
 permissions:
   contents: read
@@ -25,9 +23,9 @@ jobs:
       - id: copyright-action
         uses: cicsdev/.github/.github/actions/samples-copyright-checker@4134522d8109169bb8c460db841f94167ec2802f
         with:
-          directory: './'
+          directory: './cics-java-liberty-springboot-jms-app/'
           file-extensions: '*.java'
-          base-copyright: 'Copyright IBM Corp. 2025'
+          base-copyright: 'Copyright IBM Corp. 2026'
           token: ${{ secrets.GITHUB_TOKEN }}
 
   build-maven:
@@ -63,12 +61,12 @@ jobs:
           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:
     name: Build Gradle
-    
+
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -81,13 +79,16 @@ jobs:
         java-version: ${{ matrix.jdk }}
         distribution: 'semeru'
     - name: Setup Gradle
+      # Use setup-gradle to install a specific Gradle version for direct 'gradle' command use
       uses: gradle/actions/setup-gradle@v4
+      with:
+        gradle-version: 8.14.4
     - name: Build with Gradle
-      run: ./gradlew clean build -Pjava_version=${{ matrix.jdk }}
-      
+      run: gradle clean build -Pjava_version=${{ matrix.jdk }}
+
   build-gradlew:
-    name: Build Gradle wrapper
-    
+    name: Build Gradle Wrapper
+
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -101,5 +102,3 @@ jobs:
         distribution: 'semeru'
     - name: Build with Gradle Wrapper
       run: ./gradlew clean build -Pjava_version=${{ matrix.jdk }}
-
-

.github/workflows/cleanup-old-runs.yaml

@@ -0,0 +1,20 @@
+name: Cleanup old workflow runs
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'  # Run weekly on Sunday at midnight UTC
+  workflow_dispatch:      # Allow manual triggering
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - name: Delete old workflow runs
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 30
+          keep_minimum_runs: 6

.gitignore

@@ -1,6 +1,6 @@
 # Gradle
 .gradle/
-build/
+**/build/
 !gradle/wrapper/gradle-wrapper.jar
 
 # Maven

.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip

.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,2 @@
 eclipse.preferences.version=1
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
+encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -1,13 +1,10 @@
-#
-#Tue Jun 16 15:59:47 BST 2026
 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
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17

MAINTAINERS.md

@@ -4,4 +4,4 @@
 - Alex Brown [@AlexBrown](https://github.com/SoftlySplinter)
 - Phil Wakelin [@PhilWakelin](https://github.com/PhilWakelin)
 
-*Last reviewed:* November 2024
+*Last reviewed:* July 2026

README.md

@@ -9,7 +9,7 @@ For further details about the development of this sample refer to the IBM develo
 
 ## Prerequisites
 
-- CICS TS V5.5 or later
+- CICS TS V6.1 or later
 - A configured Liberty JVM server
 - Java SE 17 or later on the workstation
 - An Eclipse development environment on the workstation (optional)
@@ -145,9 +145,12 @@ In addition it is advisable to set the `BackoutThreshold` attribute on the queue
 The value of 10 on `maxPoolSize` is used as an example only. Set `maxPoolSize` to the maximum number of concurrent users of the connection factory.
 
 - Deployment option 1:
-    - Copy and paste the built WAR from your *cics-java-liberty-springboot-jms-app/target* or *cics-java-liberty-springboot-jms-app/build/libs* directory into a Eclipse CICS bundle project and create a new WAR bundlepart that references the WAR file. Then deploy the CICS bundle project from CICS Explorer using the **Export Bundle Project to z/OS UNIX File System** wizard.
+    - Build the CICS bundle using `./gradlew clean build` or `./mvnw clean verify`. This generates a ZIP file in the `cics-java-liberty-springboot-jms-cicsbundle/build/distributions` or `cics-java-liberty-springboot-jms-cicsbundle/target` directory. Upload the ZIP to zFS and deploy it as a CICS bundle.
 
 - Deployment option 2:
+    - Copy and paste the built WAR from your *cics-java-liberty-springboot-jms-app/target* or *cics-java-liberty-springboot-jms-app/build/libs* directory into an Eclipse CICS bundle project and create a new WAR bundlepart that references the WAR file. Then deploy the CICS bundle project from CICS Explorer using the **Export Bundle Project to z/OS UNIX File System** wizard.
+
+- Deployment option 3:
     - Manually upload the WAR file to zFS and add an `<application>` element to the Liberty server.xml to define the web application with access to all authenticated users. For example the following application element can be used to install a WAR, and grant access to all authenticated users if security is enabled.
 
     ``` XML

cics-java-liberty-springboot-jms-app/.classpath

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path=".apt_generated">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

cics-java-liberty-springboot-jms-app/.project

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cics-java-liberty-springboot-jms-app</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<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.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

cics-java-liberty-springboot-jms-app/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1

cics-java-liberty-springboot-jms-app/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

cics-java-liberty-springboot-jms-app/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,10 @@
+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.compliance=17
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17

cics-java-liberty-springboot-jms-app/.settings/org.eclipse.wst.common.component

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+	<wb-module deploy-name="cics-java-liberty-springboot-jms">
+		<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+		<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+		<property name="context-root" value="cics-java-liberty-springboot-jms"/>
+		<property name="java-output-path" value="/bin/default"/>
+	</wb-module>
+</project-modules>

cics-java-liberty-springboot-jms-app/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+	<fixed facet="jst.java"/>
+	<fixed facet="jst.web"/>
+	<installed facet="jst.web" version="2.4"/>
+	<installed facet="jst.java" version="17"/>
+</faceted-project>

cics-java-liberty-springboot-jms-app/build.gradle

@@ -1,6 +1,6 @@
 plugins
 {
-	id 'org.springframework.boot' version '3.5.9'
+	id 'org.springframework.boot' version '3.5.16'
 	id 'io.spring.dependency-management' version '1.1.7'
 	id 'java'
 	id 'eclipse'
@@ -25,7 +25,7 @@ java {
 // ============================================================================
 war
 {
-    archiveFileName = "cics-java-liberty-springboot-jms-app-${version}.war"
+    archiveFileName = 'cics-java-liberty-springboot-jms.war'
 }
 
 // Two versions of the WAR would be built, one for embedding into servers like Liberty (plain)

cics-java-liberty-springboot-jms-app/pom.xml

@@ -5,26 +5,23 @@
 
   <!-- Inherit from parent POM -->
   <parent>
-    <groupId>com.ibm.cicsdev</groupId>
+    <groupId>com.ibm.cicsdev.springboot</groupId>
     <artifactId>cics-java-liberty-springboot-jms</artifactId>
     <version>1.0.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <!--  Application module properties -->
   <artifactId>cics-java-liberty-springboot-jms-app</artifactId>
-  <name>com.ibm.cicsdev.springboot.jms.app</name>
+  <name>CICS Spring Boot JMS - Application</name>
   <description>Demo project for Spring Boot with CICS JMS - Application</description>
   <packaging>war</packaging>
 
   <properties>
-    <java.version>17</java.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.release>${java.version}</maven.compiler.release>
     <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
   </properties>
 
-  <!-- CICS TS V6.1 BOM (as of Sept 2024) -->
+  <!-- CICS TS V6.1 BOM repeated here to allow standalone build of this module -->
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -79,7 +76,7 @@
   </dependencies>
 
   <build>
-    <finalName>cics-java-liberty-springboot-jms-app-${project.version}</finalName>
+    <finalName>cics-java-liberty-springboot-jms</finalName>
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
@@ -89,4 +86,3 @@
   </build>
 
 </project>
-

cics-java-liberty-springboot-jms-cicsbundle/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cics-java-liberty-springboot-jms-cicsbundle</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

cics-java-liberty-springboot-jms-cicsbundle/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1

cics-java-liberty-springboot-jms-cicsbundle/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

cics-java-liberty-springboot-jms-cicsbundle/pom.xml

@@ -8,7 +8,7 @@
     <!-- Parent Project                                                   -->
     <!-- ================================================================ -->
     <parent>
-        <groupId>com.ibm.cicsdev</groupId>
+        <groupId>com.ibm.cicsdev.springboot</groupId>
         <artifactId>cics-java-liberty-springboot-jms</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
@@ -27,7 +27,7 @@
     <dependencies>
         <!-- Application WAR -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>com.ibm.cicsdev.springboot</groupId>
             <artifactId>cics-java-liberty-springboot-jms-app</artifactId>
             <version>${project.version}</version>
             <type>war</type>

etc/config/liberty/server.xml

@@ -4,9 +4,9 @@
     <!-- Enable features -->
     <featureManager>
         <feature>cicsts:core-1.0</feature>
-        <feature>servlet-3.1</feature>
-        <feature>concurrent-1.0</feature>
-        <feature>jms-2.0</feature>
+        <feature>servlet-6.0</feature>
+        <feature>concurrent-3.0</feature>
+        <feature>messaging-3.1</feature>
         <feature>wmqJmsClient-2.0</feature>
         <feature>jndi-1.0</feature>
     </featureManager>