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
31 changes: 29 additions & 2 deletions .github/workflows/java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
schedule:
- cron: '0 0 * * *'

permissions:
contents: read

jobs:
build-maven:
name: Build Maven
Expand All @@ -31,7 +34,7 @@ jobs:
cache: maven
- name: Build with Maven
run: mvn --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} package
- run: mkdir staging && cp target/*.war staging
- run: mkdir staging && cp cics-java-liberty-springboot-jdbc-app/target/*.war staging
- uses: actions/upload-artifact@v4
with:
name: cics-java-liberty-sprintboot-jdbc (Maven, Java ${{ matrix.jdk }})
Expand Down Expand Up @@ -80,6 +83,30 @@ jobs:
java-version: ${{ matrix.jdk }}
distribution: 'semeru'
- name: Build with Gradle
uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25
with:
arguments: bootWar -Pjava_version=${{ matrix.jdk }}

build-gradlew:
name: Build Gradle wrapper

runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
jdk: [17, 21]
experimental: [false]
include:
- jdk: 25
experimental: true
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.jdk }}
distribution: 'semeru'
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
- name: Build with Gradle
run: ./gradlew build bootWar -Pjava_version=${{ matrix.jdk }}
22 changes: 14 additions & 8 deletions .settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="com.ibm.cicsdev.springboot.jdbc">
<property name="context-root" value="cics-java-liberty-springboot-jdbc"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
<wb-resource deploy-path="/" source-path="src/main/webapp"/>
</wb-module>
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

<wb-module deploy-name="com.ibm.cicsdev.springboot.jdbc">

<property name="context-root" value="cics-java-liberty-springboot-jdbc"/>

<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>

<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>

<wb-resource deploy-path="/" source-path="src/main/webapp"/>

</wb-module>

</project-modules>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<manifest xmlns="http://www.ibm.com/xmlns/prod/cics/bundle" bundleMajorVer="0" bundleMicroVer="0" bundleMinorVer="1" bundleRelease="0" bundleVersion="1" id="cics-java-liberty-springboot-jdbc-cicsbundle">
<manifest xmlns="http://www.ibm.com/xmlns/prod/cics/bundle" bundleMajorVer="1" bundleMicroVer="0" bundleMinorVer="0" bundleRelease="0" bundleVersion="1" id="cics-java-liberty-springboot-jdbc-cicsbundle">
<meta_directives>
<timestamp>2026-04-30T06:27:31.459931Z</timestamp>
<timestamp>2026-05-05T16:01:06.431684Z</timestamp>
</meta_directives>
<define name="cics-java-liberty-springboot-jdbc" path="cics-java-liberty-springboot-jdbc.warbundle" type="http://www.ibm.com/xmlns/prod/cics/bundle/WARBUNDLE"/>
</manifest>
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
12 changes: 7 additions & 5 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading