Merge pull request #3 from cicsdev/aj-6.1

Aj 6.1

Author: AaronJhaj

.classpath

@@ -1,4 +1,4 @@
 <?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-1.8/"/>	
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>	
 </classpath>

.github/workflows/java.yaml

@@ -2,9 +2,9 @@ name: Build
 
 on:
   push:
-    branches: ["cicsts/v5.5"]
+    branches: ["cicsts/v6.1"]
   pull_request:
-    branches: ["cicsts/v5.5"]
+    branches: ["cicsts/v6.1"]
   schedule:
     - cron: '0 0 * * *'
 
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [8, 11, 17, 21]
+        jdk: [17, 21]
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.jdk }}
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [8, 11, 17, 21]
+        jdk: [17, 21]
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK ${{ matrix.jdk }}

MAINTAINERS.md

@@ -1,8 +1,5 @@
 # Maintainers
 
-- Ivan D. Hargreaves [@IvanHargreaves](https://github.com/IvanHargreaves)
-- Alex Brown [@AlexBrown](https://github.com/SoftlySplinter)
-- Phil Wakelin [@PhilWakelin](https://github.com/PhilWakelin)
 - Aaron Jhaj [@AaronJhaj](https://github.com/AaronJhaj)
 
-*Last reviewed:* April 2025
+*Last reviewed:* June 2025

README.md

@@ -11,8 +11,8 @@ This sample demonstrates a Java EE web application running on a Liberty JVM serv
 - [etc/config/liberty/server.xml](./etc/config/liberty/server.xml) - A template `server.xml` demonstrating the minimum configuration required to run the sample.
 
 ## Prerequisites
-- CICS TS V5.5 or later
-- Java SE 1.8 or later on the workstation
+- CICS TS V6.1 or later
+- Java SE 17 or later on the workstation
 - One of the following on your workstation:
     - Eclipse with the IBM CICS SDK for Java EE, Jakarta EE and Liberty
     - An IDE of your choice that supports Gradle or Maven (or can run the Wrappers)
@@ -21,7 +21,7 @@ This sample demonstrates a Java EE web application running on a Liberty JVM serv
 ## Downloading
 
 - Clone the repository using your IDEs support, such as the Eclipse Git plugin
-- **or**, download the sample as a [ZIP](https://github.com/cicsdev/cics-java-liberty-tsq/archive/main.zip) and unzip onto the workstation
+- **or**, download the sample as a [ZIP](https://github.com/cicsdev/cics-java-liberty-tsq/archive/cicsts/v6.1.zip) and unzip onto the workstation
 
 > [!TIP]
 > Eclipse Git provides an 'Import existing Projects' check-box when cloning a repository.
@@ -61,7 +61,7 @@ You can build the sample in a variety of ways:
 
 
 > [!IMPORTANT]
-> The sample comes pre-configured for use with a JDK 1.8 and CICS TS V5.5 Libraries for Java EE 8. When you initially import the project to your IDE, if your IDE is not configured for a JDK 1.8, or does not have CICS Explorer SDK installed, you might experience local project compile errors. To resolve issues you should configure the Project's build-path to add/remove your preferred combination of CICS TS, JDK, and Liberty's Enterprise Java libraries (Java EE or Jakarta EE). Resolving errors might also depend on how you wish to build and deploy the sample. If you are building and deploying through CICS Explorer SDK and 'Export to zFS' you should edit the tsq-app's Project properties. Select 'Java Build Path', on the Libraries tab select 'Classpath', click 'Add Library', select 'CICS with Enterprise Java and Liberty' Library, and choose the appropriate CICS and Enterprise Java versions.
+> The sample comes pre-configured for use with a JDK 17 and CICS TS V6.1 Libraries for Jakarta EE 9. When you initially import the project to your IDE, if your IDE is not configured for a JDK 17, or does not have CICS Explorer SDK installed, you might experience local project compile errors. To resolve issues you should configure the Project's build-path to add/remove your preferred combination of CICS TS, JDK, and Liberty's Enterprise Java libraries (Java EE or Jakarta EE). Resolving errors might also depend on how you wish to build and deploy the sample. If you are building and deploying through CICS Explorer SDK and 'Export to zFS' you should edit the tsq-app's Project properties. Select 'Java Build Path', on the Libraries tab select 'Classpath', click 'Add Library', select 'CICS with Enterprise Java and Liberty' Library, and choose the appropriate CICS and Enterprise Java versions.
 If you are building and deploying with Gradle or Maven then you don't necessarily need to fix the local errors, but to do so, you can do as above, or you can run a tooling refresh on the tsq-app project. For example, in Eclipse: right-click on "Project", select "Gradle -> Refresh Gradle Project", **or** right-click on "Project", select "Maven -> Update Project...".
 
 > [!TIP]
@@ -127,7 +127,7 @@ mvn clean verify -Dcics.jvmserver=MYJVM
 ## Deploying to a Liberty JVM server
 
 Ensure you have the following features defined in your Liberty server.xml:
-* `<feature>servlet-4.0</feature>`
+* `<feature>servlet-5.0</feature>`
 
 A template server.xml is provided [here](./etc/config/liberty/server.xml).
 

bin

@@ -6,7 +6,11 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
 		<attributes>
@@ -18,6 +22,6 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="com.ibm.cics.explorer.sdk.web.LIBERTY_LIBRARIES/L./V.55/JE.8"/>
+	<classpathentry kind="con" path="com.ibm.cics.explorer.sdk.web.LIBERTY_LIBRARIES/L./V.61/JE.JEE_V9_R1"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

cics-java-liberty-tsq-app/.classpath

@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+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
@@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.processAnnotations=enabled
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=17

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <installed facet="jst.web" version="5.0"/>
-  <installed facet="java" version="1.8"/>
+  <installed facet="java" version="17"/>
 </faceted-project>

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

@@ -12,8 +12,8 @@ version = '1.0.0'
 
 java
 {
-	sourceCompatibility = JavaVersion.VERSION_1_8
-	targetCompatibility = JavaVersion.VERSION_1_8
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
 }
 
 // If in Eclipse, add Javadoc to the local project classpath
@@ -32,11 +32,11 @@ repositories
 
 dependencies 
 {
-    compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:5.5-20200519131930-PH25409") // CICS TS V5.5 Maven BOM 
+    compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:6.1-20220617120000") // CICS TS V6.1 Maven BOM 
 
     // Don't include JCICS in the final build (no need for version because we have BOM)
     compileOnly("com.ibm.cics:com.ibm.cics.server")
 
-    compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
-    compileOnly 'javax.annotation:javax.annotation-api:1.3'
+    compileOnly 'jakarta.servlet:jakarta.servlet-api:5.0.0'
+    compileOnly 'jakarta.annotation:jakarta.annotation-api:2.0.0'
 }

cics-java-liberty-tsq-app/build.gradle

@@ -22,15 +22,15 @@
       <artifactId>com.ibm.cics.server</artifactId>
     </dependency>
     <dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>4.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <version>1.3</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>5.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>2.0.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>