From 170fa4cee11329bcef5d2b42ef2c0916642c3bf3 Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Mon, 7 Sep 2026 18:09:16 +0100 Subject: [PATCH] Deep scan fixes: gradle-wrapper, pom https XSD, bracket style, build badge, license link, copyright if guard, remove etc/cics_bundle_project --- .github/workflows/build.yaml | 1 + README.md | 4 +- .../build.gradle | 50 +++++++++++-------- .../pom.xml | 2 +- .../build.gradle | 12 +++-- .../pom.xml | 2 +- .../KAFK.transaction | 2 - .../META-INF/cics.xml | 8 --- ...cs-java-liberty-springboot-kafka.warbundle | 2 - gradle/wrapper/gradle-wrapper.properties | 2 - pom.xml | 2 +- 11 files changed, 43 insertions(+), 44 deletions(-) delete mode 100644 etc/config/cics_bundle_project/cics-java-liberty-springboot-kafka-cicsbundle-1.0.0/KAFK.transaction delete mode 100644 etc/config/cics_bundle_project/cics-java-liberty-springboot-kafka-cicsbundle-1.0.0/META-INF/cics.xml delete mode 100644 etc/config/cics_bundle_project/cics-java-liberty-springboot-kafka-cicsbundle-1.0.0/cics-java-liberty-springboot-kafka.warbundle diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a7436d7..7828c55 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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 diff --git a/README.md b/README.md index d3bbd01..f56cc75 100755 --- a/README.md +++ b/README.md @@ -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 diff --git a/cics-java-liberty-springboot-kafka-app/build.gradle b/cics-java-liberty-springboot-kafka-app/build.gradle index d8300ee..e346f4b 100755 --- a/cics-java-liberty-springboot-kafka-app/build.gradle +++ b/cics-java-liberty-springboot-kafka-app/build.gradle @@ -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' @@ -14,8 +14,10 @@ version = '1.0.0' // ============================================================================ // Java Configuration // ============================================================================ -java { - toolchain { +java +{ + toolchain + { languageVersion = JavaLanguageVersion.of(java_version) } } @@ -23,7 +25,8 @@ java { // ============================================================================ // WAR Configuration // ============================================================================ -war { +war +{ archiveFileName = 'cics-java-liberty-springboot-kafka.war' } @@ -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") } diff --git a/cics-java-liberty-springboot-kafka-app/pom.xml b/cics-java-liberty-springboot-kafka-app/pom.xml index b4ab91d..a51eeab 100755 --- a/cics-java-liberty-springboot-kafka-app/pom.xml +++ b/cics-java-liberty-springboot-kafka-app/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/cics-java-liberty-springboot-kafka-cicsbundle/build.gradle b/cics-java-liberty-springboot-kafka-cicsbundle/build.gradle index 7bfe4be..40d292a 100644 --- a/cics-java-liberty-springboot-kafka-cicsbundle/build.gradle +++ b/cics-java-liberty-springboot-kafka-cicsbundle/build.gradle @@ -1,7 +1,8 @@ // ============================================================================ // Plugins // ============================================================================ -plugins { +plugins +{ id 'com.ibm.cics.bundle' version '1.0.8' } @@ -14,7 +15,8 @@ version = '1.0.0' // ============================================================================ // Dependencies // ============================================================================ -dependencies { +dependencies +{ // Application WAR from sibling project cicsBundlePart project(path: ':cics-java-liberty-springboot-kafka-app', configuration: 'archives') } @@ -22,8 +24,10 @@ dependencies { // ============================================================================ // CICS Bundle Configuration // ============================================================================ -cicsBundle { - build { +cicsBundle +{ + build + { defaultJVMServer = project.findProperty('cics.jvmserver') ?: 'DFHWLP' } } diff --git a/cics-java-liberty-springboot-kafka-cicsbundle/pom.xml b/cics-java-liberty-springboot-kafka-cicsbundle/pom.xml index 1adce7d..10f4da0 100644 --- a/cics-java-liberty-springboot-kafka-cicsbundle/pom.xml +++ b/cics-java-liberty-springboot-kafka-cicsbundle/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/etc/config/cics_bundle_project/cics-java-liberty-springboot-kafka-cicsbundle-1.0.0/KAFK.transaction b/etc/config/cics_bundle_project/cics-java-liberty-springboot-kafka-cicsbundle-1.0.0/KAFK.transaction deleted file mode 100644 index fcf56b2..0000000 --- a/etc/config/cics_bundle_project/cics-java-liberty-springboot-kafka-cicsbundle-1.0.0/KAFK.transaction +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/etc/config/cics_bundle_project/cics-java-liberty-springboot-kafka-cicsbundle-1.0.0/META-INF/cics.xml b/etc/config/cics_bundle_project/cics-java-liberty-springboot-kafka-cicsbundle-1.0.0/META-INF/cics.xml deleted file mode 100644 index b10f7c1..0000000 --- a/etc/config/cics_bundle_project/cics-java-liberty-springboot-kafka-cicsbundle-1.0.0/META-INF/cics.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - 2026-03-17T12:06:14.389297Z - - - - diff --git a/etc/config/cics_bundle_project/cics-java-liberty-springboot-kafka-cicsbundle-1.0.0/cics-java-liberty-springboot-kafka.warbundle b/etc/config/cics_bundle_project/cics-java-liberty-springboot-kafka-cicsbundle-1.0.0/cics-java-liberty-springboot-kafka.warbundle deleted file mode 100644 index 9e1bb25..0000000 --- a/etc/config/cics_bundle_project/cics-java-liberty-springboot-kafka-cicsbundle-1.0.0/cics-java-liberty-springboot-kafka.warbundle +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aaaabb3..03b32a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/pom.xml b/pom.xml index 2217e84..28eb731 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0