From 23ccf08112d306785b42b3562a29d822dd110458 Mon Sep 17 00:00:00 2001 From: manvisingh55 Date: Tue, 31 Mar 2026 16:11:39 +0530 Subject: [PATCH 1/6] initial --- build.gradle | 20 +++++++++---------- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- pom.xml | 13 +++++++----- .../transactions/JEEUserTransaction.java | 2 +- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 9681729..080c7ca 100644 --- a/build.gradle +++ b/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,21 +23,19 @@ 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) @@ -52,14 +50,14 @@ 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 + implementation '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 { diff --git a/gradle.properties b/gradle.properties index 3538325..9fa633b 100644 --- a/gradle.properties +++ b/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 \ No newline at end of file +java_version = 17 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fcfb29d..48c0a02 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/pom.xml b/pom.xml index 96e5f96..80c6c1e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,22 +7,24 @@ org.springframework.boot spring-boot-starter-parent - 2.7.0 + 3.5.9 + com.ibm.cicsdev cics-java-liberty-springboot-transactions 0.1.0 com.ibm.cicsdev.springboot.transactions Demo project for Spring and Liberty transactions + - 1.8 - + 17 UTF-8 ${java.version} - ${java.version} + ${java.version} + true @@ -31,7 +33,7 @@ com.ibm.cics com.ibm.cics.ts.bom - 5.5-20200519131930-PH25409 + 6.1-20250812133513-PH63856 pom import @@ -68,6 +70,7 @@ javax.transaction javax.transaction-api + 1.3 provided diff --git a/src/main/java/com/ibm/cicsdev/springboot/transactions/JEEUserTransaction.java b/src/main/java/com/ibm/cicsdev/springboot/transactions/JEEUserTransaction.java index b97c595..40aa635 100644 --- a/src/main/java/com/ibm/cicsdev/springboot/transactions/JEEUserTransaction.java +++ b/src/main/java/com/ibm/cicsdev/springboot/transactions/JEEUserTransaction.java @@ -12,7 +12,7 @@ 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; From 308c6108c19ba7a8e8f2ba8860b52dbb92c255c7 Mon Sep 17 00:00:00 2001 From: manvisingh55 Date: Thu, 2 Apr 2026 14:55:03 +0530 Subject: [PATCH 2/6] java to jakarta edit --- build.gradle | 6 +++--- pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 080c7ca..e93acfd 100644 --- a/build.gradle +++ b/build.gradle @@ -49,9 +49,9 @@ dependencies // Don't include TomCat in the runtime build providedRuntime("org.springframework.boot:spring-boot-starter-tomcat") - - // Java Transaction API - don't include in the final build - implementation 'jakarta.transaction:jakarta.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") } diff --git a/pom.xml b/pom.xml index 80c6c1e..5f2daca 100644 --- a/pom.xml +++ b/pom.xml @@ -68,8 +68,8 @@ - javax.transaction - javax.transaction-api + jakarta.transaction + jakarta.transaction-api 1.3 provided From 3cc81b83fcf3e641ff0ff4c5fea9a2cbb80c3d40 Mon Sep 17 00:00:00 2001 From: manvisingh55 Date: Thu, 2 Apr 2026 15:59:16 +0530 Subject: [PATCH 3/6] cics bom version update and jakarta version removal --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5f2daca..5632bc8 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ true - + @@ -70,7 +70,6 @@ jakarta.transaction jakarta.transaction-api - 1.3 provided From a5c457db09ae5c25d6b70411792b3df92f5d4172 Mon Sep 17 00:00:00 2001 From: manvisingh55 Date: Thu, 2 Apr 2026 16:05:22 +0530 Subject: [PATCH 4/6] cics ts bom update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e93acfd..37d2254 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ java { 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") From e799d13e736893882645a738004f7e381a608219 Mon Sep 17 00:00:00 2001 From: manvisingh55 Date: Thu, 2 Apr 2026 16:09:00 +0530 Subject: [PATCH 5/6] readme version updated --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b0232ff..de32322 100644 --- a/README.md +++ b/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`. From 779fa89b5deb3d516f92c3ad9bf03c881126cde3 Mon Sep 17 00:00:00 2001 From: manvisingh55 Date: Fri, 10 Apr 2026 15:15:00 +0530 Subject: [PATCH 6/6] web.xml and java.yml changes --- .github/workflows/java.yaml | 7 ++----- .../springboot/transactions/JEEUserTransaction.java | 1 + src/main/webapp/WEB-INF/web.xml | 7 ++++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml index f021fbb..9afea0a 100644 --- a/.github/workflows/java.yaml +++ b/.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 }} diff --git a/src/main/java/com/ibm/cicsdev/springboot/transactions/JEEUserTransaction.java b/src/main/java/com/ibm/cicsdev/springboot/transactions/JEEUserTransaction.java index 40aa635..4d07306 100644 --- a/src/main/java/com/ibm/cicsdev/springboot/transactions/JEEUserTransaction.java +++ b/src/main/java/com/ibm/cicsdev/springboot/transactions/JEEUserTransaction.java @@ -12,6 +12,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; + import jakarta.transaction.UserTransaction; import org.springframework.stereotype.Component; import com.ibm.cics.server.TSQ; diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 31f268b..7514475 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,8 @@ - + cics-java-liberty-springboot-transactions BASIC