Merge pull request #10 from cicsdev/manvi/samples

several changes needed for updating build

Author: Manvi-55

.github/workflows/java.yaml

@@ -15,12 +15,9 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental }}
     strategy:
+  strategy:
       matrix:
-        jdk: [8, 11]
-        experimental: [false]
-        include:
-          - jdk: 17
-            experimental: true
+         jdk: [17]
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.jdk }}

README.md

@@ -11,9 +11,9 @@ The artifact built from this project is a WAR file that can be deployed into CIC
 
 ## Prerequisites
 
-- CICS TS V5.3 or later
+- CICS TS V6.1 or later
 - A configured Liberty JVM server in CICS
-- Java SE 1.8 or later on the workstation
+- Requires Java 17 or later. on the workstation
 - An Eclipse development environment on the workstation (optional)
 - Either Gradle or Apache Maven on the workstation (optional if using Wrappers)
 - A CICS TSMODEL resource with the attribute `Recovery(ON)` for the TSQ called `EXAMPLE`.
@@ -78,12 +78,12 @@ Run the following in a local command prompt:
 On Linux or Mac:
 
 ```shell
-./gradlew clean bootWar
+./gradlew clean build
 ```
 On Windows:
 
 ```shell
-gradlew.bat clean bootWar
+gradlew.bat clean build
 ```
 
 This creates a WAR file inside the `build/libs` directory.
@@ -109,7 +109,7 @@ This creates a WAR file inside the `target` directory.
 
 ## Deploying
 
-Ensure you have the `jsp-2.3` feature (which itself contains `servlet`) configured in `server.xml`:
+Ensure you have the `pages-3.1` feature (which itself contains `servlet`) configured in `server.xml`:
 
 Either:    
 1. Create a CICS bundle project and copy the WAR file into it.
@@ -141,6 +141,7 @@ Or:
 1. With the application installed, the root URL for the sample application can be found in messages.log e.g. `http://myzos.mycompany.com:32000/cics-java-liberty-springboot-transactions-0.1.0/`.
 
 2. Visit the URL from the browser to review the 'Usage' guide.
+   Note: The trailing "/" is required to display the Usage Guide.
 
 3. To demonstrate the `@Transactional` container managed transaction, drive the `/transactionalCommit` end-point. You should see *hello CICS from transactionalCommit()* at the browser and a corresponding entry in the TSQ 'EXAMPLE'. You can browse the contents of the TSQ using the CEBR transaction in CICS.
 

build.gradle

@@ -1,6 +1,6 @@
 plugins
 {
-	id 'org.springframework.boot' version '2.7.0' 
+	id 'org.springframework.boot' version '3.5.9' 
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id 'java'
 	id 'eclipse'
@@ -23,25 +23,23 @@ eclipse
 }
 
 
+
 repositories
 {
 	mavenCentral()
 }
 
-java
-{
-    toolchain
-    {
+java {
+    toolchain {
         languageVersion = JavaLanguageVersion.of(java_version)
-        vendor = JvmVendorSpec.IBM
-        implementation = JvmImplementation.J9
     }
 }
 
+
 dependencies
 {    
     // CICS BOM (as of May 2020)
-    compileOnly enforcedPlatform('com.ibm.cics:com.ibm.cics.ts.bom:5.5-20200519131930-PH25409')
+    compileOnly enforcedPlatform('com.ibm.cics:com.ibm.cics.ts.bom:6.1-20250812133513-PH63856')
 
     // Don't include JCICS in the final build (no need for version because we have BOM)
     compileOnly("com.ibm.cics:com.ibm.cics.server")   
@@ -51,15 +49,15 @@ dependencies
 
     // Don't include TomCat in the runtime build
     providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
-    
-    // Java Transaction API (this is newer and covers up to jta-1.3) - don't include in the final build
-    compileOnly ("javax.transaction:javax.transaction-api")
-    
+  
+    // Java Transaction API - don't include in the final build
+    compileOnly 'jakarta.transaction:jakarta.transaction-api'
     // Spring's Transactional API
     implementation ("org.springframework:spring-tx")           
 }
 
-
+//Don't generate a FAT bootWar, we don't need to run standalone
+bootWar { enabled = false }
 
 publishing {
     publications {

gradle.properties

@@ -14,4 +14,4 @@
 # For example: gradle build publish.
 publish_repo_releases_url = 'default-value-for-publish_repo_releases_url'
 publish_repo_releases_name = 'default-value-for-publish_repo_releases_name'
-java_version = 8
+java_version = 17

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

pom.xml

@@ -7,31 +7,33 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.0</version>
+    <version>3.5.9</version>
     <relativePath/>
   </parent>
 
+  
   <!--  Application properties -->
   <groupId>com.ibm.cicsdev</groupId>
   <artifactId>cics-java-liberty-springboot-transactions</artifactId>
   <version>0.1.0</version>  
   <name>com.ibm.cicsdev.springboot.transactions</name>
   <description>Demo project for Spring and Liberty transactions</description>
+  
   <properties>
-    <java.version>1.8</java.version>
-
+    <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.source>${java.version}</maven.compiler.source>    
+    <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
   </properties>
 
-  <!-- CICS BOM (as of May 2020) -->
+  <!-- CICS TS V6.1 BOM (as of Sept 2024) -->
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>com.ibm.cics</groupId>
         <artifactId>com.ibm.cics.ts.bom</artifactId>
-        <version>5.5-20200519131930-PH25409</version>
+        <version>6.1-20250812133513-PH63856</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -66,8 +68,8 @@
 
     <!-- Compile against, but don't include javax.transaction API -->
     <dependency>
-      <groupId>javax.transaction</groupId>
-      <artifactId>javax.transaction-api</artifactId>
+      <groupId>jakarta.transaction</groupId>
+      <artifactId>jakarta.transaction-api</artifactId>
       <scope>provided</scope>
     </dependency>	  
 

src/main/java/com/ibm/cicsdev/springboot/transactions/JEEUserTransaction.java

@@ -12,7 +12,8 @@
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.transaction.UserTransaction;
+
+import jakarta.transaction.UserTransaction;
 import org.springframework.stereotype.Component;
 import com.ibm.cics.server.TSQ;
 

src/main/webapp/WEB-INF/web.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd"
-	version="3.1">
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
     <display-name>cics-java-liberty-springboot-transactions</display-name>  
     <login-config>
         <auth-method>BASIC</auth-method>