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
1 change: 0 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ jobs:
with:
java-version: ${{ matrix.jdk }}
distribution: "semeru"
cache: maven
- name: Build with Maven
run: mvn --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} verify

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/cleanup-old-runs.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Cleanup old workflow runs

permissions:
contents: read

on:
schedule:
- cron: '0 0 * * 0' # Run weekly on Sunday at midnight UTC
Expand Down
21 changes: 1 addition & 20 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="cics-java-liberty-springboot-link-app">
<wb-module deploy-name="cics-java-liberty-springboot-link">
<property name="context-root" value="cics-java-liberty-springboot-link"/>
<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>
Expand Down
8 changes: 3 additions & 5 deletions cics-java-liberty-springboot-link-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,9 @@ dependencies
// Don't include TomCat in the runtime build, but put it in lib-provided so it can run standalone as well as embedded
providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")

// CICS TS V6.1 Maven BOM (as of Sept 2024)
def bom = "com.ibm.cics:com.ibm.cics.ts.bom:6.1-20250812133513-PH63856"

compileOnly enforcedPlatform(bom)
annotationProcessor enforcedPlatform(bom)
// CICS TS Maven BOM (version from gradle.properties)
compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${project.property('cics.bom.version')}")
annotationProcessor enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${project.property('cics.bom.version')}")

annotationProcessor("com.ibm.cics:com.ibm.cics.server.invocation")

Expand Down
5 changes: 3 additions & 2 deletions cics-java-liberty-springboot-link-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
</properties>

<!-- CICS TS V6.1 BOM (as of Sept 2024) -->
<!-- CICS TS BOM (version from root pom.xml property) -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ibm.cics</groupId>
<artifactId>com.ibm.cics.ts.bom</artifactId>
<version>6.1-20250812133513-PH63856</version>
<version>${cics.bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -86,6 +86,7 @@

<!-- Build with Maven and CICS annotation processor -->
<build>
<finalName>cics-java-liberty-springboot-link</finalName>
<plugins>
<!-- Spring Boot plugin for Maven -->
<plugin>
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Centralized Java version for Gradle toolchain and Maven compiler
java_version = 17
cics.bom.version=6.1-20250812133513-PH63856

# Gradle daemon improves build performance
org.gradle.daemon=true
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cics.jvmserver>DFHWLP</cics.jvmserver>
<cics.bom.version>6.1-20250812133513-PH63856</cics.bom.version>
</properties>

<!-- Dependency Management -->
Expand All @@ -33,7 +34,7 @@
<dependency>
<groupId>com.ibm.cics</groupId>
<artifactId>com.ibm.cics.ts.bom</artifactId>
<version>6.1-20250812133513-PH63856</version>
<version>${cics.bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Loading