Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
23 changes: 12 additions & 11 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ jobs:
check-copyright:
runs-on: ubuntu-latest
name: Check Copyright
if: ${{ !startsWith(github.head_ref, 'create-pull-request/') }}
permissions:
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
fetch-depth: 0
- id: copyright-action
Expand All @@ -37,9 +38,9 @@ jobs:
matrix:
jdk: [21, 25]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: ${{ matrix.jdk }}
distribution: "semeru"
Expand All @@ -55,9 +56,9 @@ jobs:
matrix:
jdk: [21, 25]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: ${{ matrix.jdk }}
distribution: "semeru"
Expand All @@ -72,16 +73,16 @@ jobs:
matrix:
jdk: [21, 25]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: ${{ matrix.jdk }}
distribution: 'semeru'
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v6
with:
gradle-version: 8.14.4
gradle-version: 8.14.7
- name: Build with Gradle
run: gradle clean build -Pjava_version=${{ matrix.jdk }}

Expand All @@ -93,9 +94,9 @@ jobs:
matrix:
jdk: [21, 25]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: ${{ matrix.jdk }}
distribution: 'semeru'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ jobs:
name: Analyze (java)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7

- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: '21'
distribution: 'semeru'
cache: maven

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@v4
with:
languages: java

- name: Build with Maven
run: mvn --batch-mode --update-snapshots --file pom.xml verify

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v4
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
distributionType=only-script
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
14 changes: 5 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@
> **Version note:** This branch targets Spring Boot 4.x (Jakarta EE 11, Java 21+).
> For Spring Boot 3.x see the [springboot/v3](../../tree/springboot/v3) branch.
> **Pre-publish actions required:**
> 1. **CICS Explorer SDK classpath entry** in
> `cics-java-liberty-springboot-transactions-app/.classpath` references
> `JE.JEE_V11_R0` (Jakarta EE 11). This token is not yet present in CICS Explorer
> SDK. Once the SDK ships Jakarta EE 11 support, verify the entry resolves correctly.
> 2. **`web.xml` descriptor version** is temporarily set to `6.0` (Servlet 6.0 XSD)
> because WTP does not yet recognise `version="6.1"` and throws an error on project
> refresh. Once WTP supports Servlet 6.1, update `web.xml` to use
> `web-app_6_1.xsd` and `version="6.1"`, and remove this notice.
> **Pre-publish action required:**
> **CICS Explorer SDK classpath entry** in
> `cics-java-liberty-springboot-transactions-app/.classpath` references
> `JE.JEE_V11_R0` (Jakarta EE 11). Verify the entry resolves in your installed
> CICS Explorer SDK, then remove this notice.
## Overview

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<fixed facet="jst.java"/>
<fixed facet="jst.web"/>
<installed facet="jst.java" version="21"/>
<installed facet="jst.web" version="6.0"/>
<installed facet="jst.web" version="6.1"/>
</faceted-project>
6 changes: 3 additions & 3 deletions cics-java-liberty-springboot-transactions-app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins
{
id 'org.springframework.boot' version '4.1.0'
id 'org.springframework.boot' version '4.1.2'
id 'io.spring.dependency-management' version '1.1.7'
id 'java'
id 'eclipse'
Expand Down Expand Up @@ -45,7 +45,7 @@ eclipse
{
facet
{
facet name: 'jst.web', version: '6.0'
facet name: 'jst.web', version: '6.1'
}
component
{
Expand All @@ -69,7 +69,7 @@ dependencies
compileOnly("com.ibm.cics:com.ibm.cics.server")

// Spring Boot web support
implementation ("org.springframework.boot:spring-boot-starter-web")
implementation ("org.springframework.boot:spring-boot-starter-webmvc")

// Exclude only the Tomcat embedded container jars from the WAR — Liberty provides the servlet container.
// In Spring Boot 4.x, spring-boot-starter-tomcat pulls in spring-boot-starter (and thus all core
Expand Down
2 changes: 1 addition & 1 deletion cics-java-liberty-springboot-transactions-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<!-- Spring Boot web support -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<artifactId>spring-boot-starter-webmvc</artifactId>
</dependency>

<!-- Exclude only the Tomcat embedded container jars from the WAR — Liberty provides the servlet container.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"
version="6.1">
<display-name>cics-java-liberty-springboot-transactions</display-name>
<login-config>
<auth-method>BASIC</auth-method>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// ============================================================================
plugins
{
id 'com.ibm.cics.bundle' version '1.0.8'
id 'com.ibm.cics.bundle' version '1.0.13'
}

// ============================================================================
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<!-- ================================================================ -->
Expand Down Expand Up @@ -43,7 +43,7 @@
<plugin>
<groupId>com.ibm.cics</groupId>
<artifactId>cics-bundle-maven-plugin</artifactId>
<version>1.0.8</version>
<version>2.0.5</version>
<extensions>true</extensions>
<configuration>
<defaultjvmserver>${cics.jvmserver}</defaultjvmserver>
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ org.gradle.parallel=true
org.gradle.java.installations.auto-detect=true
org.gradle.java.installations.auto-download=true

# Configuration cache disabled due to CICS Bundle Plugin 1.0.8 incompatibility
# Configuration cache disabled due to CICS Bundle Plugin incompatibility
# org.gradle.configuration-cache=true
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-8.14.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading