Skip to content
Open
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Build

permissions:
contents: read

on:
push:
branches: ["main"]
pull_request:
branches: ["main"]

permissions:
contents: read

jobs:
check-copyright:
runs-on: ubuntu-latest
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.gradle/
**/build/
!gradle/wrapper/gradle-wrapper.jar
!gradle/wrapper/gradle-wrapper.properties

# Maven
target/
Expand Down
19 changes: 0 additions & 19 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,6 @@
<projects>
</projects>
<buildSpec>
<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.buildship.core.gradleprojectbuilder</name>
<arguments>
Expand All @@ -32,10 +17,6 @@
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
Expand Down
5 changes: 0 additions & 5 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
Expand Down
7 changes: 6 additions & 1 deletion cics-java-liberty-springboot-jms-app/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin/default"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="cics-java-liberty-springboot-jms">
<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-module deploy-name="cics-java-liberty-springboot-jms-app">
<property name="context-root" value="cics-java-liberty-springboot-jms"/>
<property name="java-output-path" value="/bin/default"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
<wb-resource deploy-path="/" source-path="src/main/webapp"/>
</wb-module>
</project-modules>
4 changes: 1 addition & 3 deletions cics-java-liberty-springboot-jms-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ dependencies
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)
compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${project.property('cics.bom.version')}")

// Don't include JCICS components in the final build (no need for version because we have BOM)
compileOnly("com.ibm.cics:com.ibm.cics.server")
Expand Down
2 changes: 1 addition & 1 deletion cics-java-liberty-springboot-jms-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,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
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ org.gradle.java.installations.auto-download=true

# Configuration cache disabled due to CICS Bundle Plugin 1.0.8 incompatibility
# org.gradle.configuration-cache=true

# CICS TS BOM version
cics.bom.version=6.1-20250812133513-PH63856
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>

<!-- ================================================================ -->
Expand All @@ -35,7 +36,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