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: 1 addition & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
check-copyright:
runs-on: ubuntu-latest
name: Check Copyright
if: ${{ !startsWith(github.head_ref, 'create-pull-request/') }}
permissions:
contents: write # needed to push the copyright fix commit
pull-requests: write # needed to open the fix PR
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# cics-java-liberty-springboot-kafka

[![Build](https://github.com/cicsdev/cics-java-liberty-springboot-kafka/actions/workflows/build.yaml/badge.svg)](https://github.com/cicsdev/cics-java-liberty-springboot-kafka/actions/workflows/build.yaml)
[![License](https://img.shields.io/badge/License-EPL%202.0-green.svg)](https://opensource.org/licenses/EPL-2.0)
[![Build](https://github.com/cicsdev/cics-java-liberty-springboot-kafka/actions/workflows/build.yaml/badge.svg?branch=main)](https://github.com/cicsdev/cics-java-liberty-springboot-kafka/actions/workflows/build.yaml)
[![License](https://img.shields.io/badge/License-EPL%202.0-green.svg)](https://www.eclipse.org/legal/epl-2.0/)

## Overview

Expand Down
50 changes: 29 additions & 21 deletions cics-java-liberty-springboot-kafka-app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
plugins
plugins
{
id 'org.springframework.boot' version '3.5.16'
id 'io.spring.dependency-management' version '1.1.7'
id 'java'
id 'eclipse'
id 'war'
id 'idea'
id 'idea'
}

group = 'com.ibm.cicsdev.springboot'
Expand All @@ -14,16 +14,19 @@ version = '1.0.0'
// ============================================================================
// Java Configuration
// ============================================================================
java {
toolchain {
java
{
toolchain
{
languageVersion = JavaLanguageVersion.of(java_version)
}
}

// ============================================================================
// WAR Configuration
// ============================================================================
war {
war
{
archiveFileName = 'cics-java-liberty-springboot-kafka.war'
}

Expand All @@ -41,37 +44,42 @@ eclipse
}
wtp
{
facet { facet name: 'jst.web', version: '6.0' }
component { contextPath = 'cics-java-liberty-springboot-kafka' }
facet
{
facet name: 'jst.web', version: '6.0'
}
component
{
contextPath = 'cics-java-liberty-springboot-kafka'
}
}
}

repositories
{
mavenCentral()
mavenCentral()
}

dependencies
dependencies
{

// BOM: CICS TS V6.1
compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${project.property('cics.bom.version')}")

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

// Don't include Tomcat in the runtime build, but do put it in WEB-INF so it can be run standalone as well as embedded
providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
// Spring Boot Kafka client - with optimised removals
implementation("org.springframework.kafka:spring-kafka")
// Jakarta EE 10 version of ManagedExecutorService we compiler against
providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")

// Spring Boot Kafka client
implementation("org.springframework.kafka:spring-kafka")

// Jakarta EE 10 version of ManagedExecutorService we compile against
compileOnly("jakarta.platform:jakarta.jakartaee-api:${jakartaVersion}")

// Liberty developer SPI/APIs - WSSubject, WSCallbackHandler (JAAS), AuthData
compileOnly("net.wasdev.maven.tools.targets:liberty-apis:${libertyApisVersion}")
compileOnly("net.wasdev.maven.tools.targets:liberty-apis:${libertyApisVersion}")

// Compile against, but don't include JCICS in the final build (no need for version because we have BOM)
compileOnly("com.ibm.cics:com.ibm.cics.server")
compileOnly("com.ibm.cics:com.ibm.cics.server")
}
2 changes: 1 addition & 1 deletion cics-java-liberty-springboot-kafka-app/pom.xml
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
12 changes: 8 additions & 4 deletions cics-java-liberty-springboot-kafka-cicsbundle/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// ============================================================================
// Plugins
// ============================================================================
plugins {
plugins
{
id 'com.ibm.cics.bundle' version '1.0.8'
}

Expand All @@ -14,16 +15,19 @@ version = '1.0.0'
// ============================================================================
// Dependencies
// ============================================================================
dependencies {
dependencies
{
// Application WAR from sibling project
cicsBundlePart project(path: ':cics-java-liberty-springboot-kafka-app', configuration: 'archives')
}

// ============================================================================
// CICS Bundle Configuration
// ============================================================================
cicsBundle {
build {
cicsBundle
{
build
{
defaultJVMServer = project.findProperty('cics.jvmserver') ?: 'DFHWLP'
}
}
2 changes: 1 addition & 1 deletion cics-java-liberty-springboot-kafka-cicsbundle/pom.xml
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

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<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>

<!-- Inherit defaults from Spring Boot Parent -->
Expand Down
Loading