Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins
{
id 'org.springframework.boot' version '2.7.0'
id 'org.springframework.boot' version '3.5.9'
Comment thread
IvanHargreaves marked this conversation as resolved.
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'java'
id 'eclipse'
Expand All @@ -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)
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Comment thread
IvanHargreaves marked this conversation as resolved.
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
17 changes: 10 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,24 @@
<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) -->
Expand All @@ -31,7 +33,7 @@
<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>
Expand Down Expand Up @@ -66,8 +68,9 @@

<!-- 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>
<version>1.3</version>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The javax.transaction-api dependency needs to be changed to jakarta, similar to the Gradle change.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no version 1.3 of jakarta.transaction-api so this doesn't build.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed to jakarta

<scope>provided</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading