From 8a0c4b81e2935cb0e0454f97d80ee1fd568bd4ef Mon Sep 17 00:00:00 2001 From: Ivan Hargreaves Date: Fri, 24 Jul 2026 16:49:42 +0100 Subject: [PATCH] Validation pass: add cics.bom.version, fix root .project/buildship.prefs, wtp block, classpath, jdt.core.prefs, wst.validation.prefs, facet version 4.0, ibm-web-ext noise, build.yaml schedule/cache, rename cleanup workflow, move server.xml to etc/config/liberty/ --- .github/workflows/build.yaml | 3 --- .github/workflows/cleanup-old-runs.yaml | 23 ++++++++++++++++++ .github/workflows/cleanup-old-runs.yml | 24 ------------------- .project | 17 ++----------- .settings/org.eclipse.buildship.core.prefs | 11 --------- cics-java-liberty-restapp-app/.classpath | 11 +++------ .../org.eclipse.buildship.core.prefs | 11 --------- .../.settings/org.eclipse.jdt.core.prefs | 8 ------- ....eclipse.wst.common.project.facet.core.xml | 2 +- .../org.eclipse.wst.validation.prefs | 10 ++++++++ cics-java-liberty-restapp-app/build.gradle | 14 ++++++++++- cics-java-liberty-restapp-app/pom.xml | 14 +++++++++++ .../src/main/webapp/WEB-INF/ibm-web-ext.xml | 6 +---- etc/config/{ => liberty}/server.xml | 0 gradle.properties | 4 ++++ pom.xml | 3 ++- 16 files changed, 73 insertions(+), 88 deletions(-) create mode 100644 .github/workflows/cleanup-old-runs.yaml delete mode 100644 .github/workflows/cleanup-old-runs.yml create mode 100644 cics-java-liberty-restapp-app/.settings/org.eclipse.wst.validation.prefs rename etc/config/{ => liberty}/server.xml (100%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6cd9dfc..92d990d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,8 +8,6 @@ on: branches: ["main"] pull_request: branches: ["main"] - schedule: - - cron: '0 0 * * *' jobs: check-copyright: @@ -66,7 +64,6 @@ jobs: with: java-version: ${{ matrix.jdk }} distribution: "semeru" - cache: maven - name: Build with Maven Wrapper run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=8 verify diff --git a/.github/workflows/cleanup-old-runs.yaml b/.github/workflows/cleanup-old-runs.yaml new file mode 100644 index 0000000..496882e --- /dev/null +++ b/.github/workflows/cleanup-old-runs.yaml @@ -0,0 +1,23 @@ +name: Cleanup old workflow runs + +permissions: + contents: read + +on: + schedule: + - cron: '0 0 * * 0' # Run weekly on Sunday at midnight UTC + workflow_dispatch: # Allow manual triggering + +jobs: + cleanup: + runs-on: ubuntu-latest + permissions: + actions: write + steps: + - name: Delete old workflow runs + uses: Mattraks/delete-workflow-runs@v2 + with: + token: ${{ github.token }} + repository: ${{ github.repository }} + retain_days: 30 + keep_minimum_runs: 6 diff --git a/.github/workflows/cleanup-old-runs.yml b/.github/workflows/cleanup-old-runs.yml deleted file mode 100644 index 8847b2c..0000000 --- a/.github/workflows/cleanup-old-runs.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Cleanup Old Workflow Runs - -permissions: - actions: write - contents: read - -on: - schedule: - - cron: '0 0 * * 0' # Run weekly on Sunday - workflow_dispatch: # Allow manual trigger - -jobs: - cleanup: - runs-on: ubuntu-latest - steps: - - name: Delete old workflow runs (including this workflow) - uses: Mattraks/delete-workflow-runs@v2 - with: - token: ${{ github.token }} - repository: ${{ github.repository }} - retain_days: 30 - keep_minimum_runs: 6 # Keep at least 6 recent runs of each workflow - -# Made with Bob diff --git a/.project b/.project index 0fe233f..adc5638 100644 --- a/.project +++ b/.project @@ -1,7 +1,7 @@ cics-java-liberty-restapp - Project cics-java-liberty-restapp created by Buildship. + @@ -10,16 +10,6 @@ - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - org.eclipse.m2e.core.maven2Builder @@ -27,10 +17,7 @@ - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature org.eclipse.buildship.core.gradleprojectnature + org.eclipse.m2e.core.maven2Nature diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs index e479558..e889521 100644 --- a/.settings/org.eclipse.buildship.core.prefs +++ b/.settings/org.eclipse.buildship.core.prefs @@ -1,13 +1,2 @@ -arguments= -auto.sync=false -build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir= eclipse.preferences.version=1 -gradle.user.home= -java.home= -jvm.arguments= -offline.mode=false -override.workspace.settings=false -show.console.view=false -show.executions.view=false diff --git a/cics-java-liberty-restapp-app/.classpath b/cics-java-liberty-restapp-app/.classpath index 7430eb8..ae8ae69 100644 --- a/cics-java-liberty-restapp-app/.classpath +++ b/cics-java-liberty-restapp-app/.classpath @@ -1,21 +1,16 @@ - - - - - - + - + - + diff --git a/cics-java-liberty-restapp-app/.settings/org.eclipse.buildship.core.prefs b/cics-java-liberty-restapp-app/.settings/org.eclipse.buildship.core.prefs index 258eb47..b1886ad 100644 --- a/cics-java-liberty-restapp-app/.settings/org.eclipse.buildship.core.prefs +++ b/cics-java-liberty-restapp-app/.settings/org.eclipse.buildship.core.prefs @@ -1,13 +1,2 @@ -arguments= -auto.sync=false -build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir=.. eclipse.preferences.version=1 -gradle.user.home= -java.home= -jvm.arguments= -offline.mode=false -override.workspace.settings=false -show.console.view=false -show.executions.view=false diff --git a/cics-java-liberty-restapp-app/.settings/org.eclipse.jdt.core.prefs b/cics-java-liberty-restapp-app/.settings/org.eclipse.jdt.core.prefs index e9d28d2..1d3fc37 100644 --- a/cics-java-liberty-restapp-app/.settings/org.eclipse.jdt.core.prefs +++ b/cics-java-liberty-restapp-app/.settings/org.eclipse.jdt.core.prefs @@ -1,16 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.8 -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 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/cics-java-liberty-restapp-app/.settings/org.eclipse.wst.common.project.facet.core.xml b/cics-java-liberty-restapp-app/.settings/org.eclipse.wst.common.project.facet.core.xml index cea524a..0568c47 100644 --- a/cics-java-liberty-restapp-app/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/cics-java-liberty-restapp-app/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,6 +2,6 @@ - + diff --git a/cics-java-liberty-restapp-app/.settings/org.eclipse.wst.validation.prefs b/cics-java-liberty-restapp-app/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 0000000..2e240e7 --- /dev/null +++ b/cics-java-liberty-restapp-app/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,10 @@ +DELEGATES_PREFERENCE=delegateValidatorList +USER_BUILD_PREFERENCE=enabledBuildValidatorList +USER_MANUAL_PREFERENCE=enabledManualValidatorList +USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.3.100.v202407180051 +disabled=06target +eclipse.preferences.version=1 +override=true +suspend=false +vals/org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator/global=FF +vf.version=3 diff --git a/cics-java-liberty-restapp-app/build.gradle b/cics-java-liberty-restapp-app/build.gradle index 2ae49d1..33d7401 100644 --- a/cics-java-liberty-restapp-app/build.gradle +++ b/cics-java-liberty-restapp-app/build.gradle @@ -28,6 +28,18 @@ eclipse { downloadJavadoc = true } + // Ensures Gradle Refresh sets the WTP context-root and web facet version correctly. + wtp + { + facet + { + facet name: 'jst.web', version: '4.0' + } + component + { + contextPath = 'cics-java-liberty-restapp' + } + } } @@ -40,7 +52,7 @@ repositories dependencies { // CICS TS V5.5 Maven BOM - compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:5.5-20250513205735-PH63882") + compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${project.property('cics.bom.version')}") // Don't include JCICS in the final build (no need for version because we have BOM) compileOnly("com.ibm.cics:com.ibm.cics.server") diff --git a/cics-java-liberty-restapp-app/pom.xml b/cics-java-liberty-restapp-app/pom.xml index 1020b55..c6b1960 100644 --- a/cics-java-liberty-restapp-app/pom.xml +++ b/cics-java-liberty-restapp-app/pom.xml @@ -15,6 +15,19 @@ CICS Enterprise Java Program - Application + + + + + com.ibm.cics + com.ibm.cics.ts.bom + ${cics.bom.version} + pom + import + + + + @@ -43,6 +56,7 @@ + cics-java-liberty-restapp diff --git a/cics-java-liberty-restapp-app/src/main/webapp/WEB-INF/ibm-web-ext.xml b/cics-java-liberty-restapp-app/src/main/webapp/WEB-INF/ibm-web-ext.xml index a735606..af27891 100644 --- a/cics-java-liberty-restapp-app/src/main/webapp/WEB-INF/ibm-web-ext.xml +++ b/cics-java-liberty-restapp-app/src/main/webapp/WEB-INF/ibm-web-ext.xml @@ -4,9 +4,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://websphere.ibm.com/xml/ns/javaee http://websphere.ibm.com/xml/ns/javaee/ibm-web-ext_1_0.xsd" version="1.0"> - - - - - + diff --git a/etc/config/server.xml b/etc/config/liberty/server.xml similarity index 100% rename from etc/config/server.xml rename to etc/config/liberty/server.xml diff --git a/gradle.properties b/gradle.properties index f0cb1ff..37ac299 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,9 @@ java_version = 8 +# CICS TS BOM version — dot-notation aligns with Maven property +# Referenced in build.gradle as: ${project.property('cics.bom.version')} +cics.bom.version=5.5-20250513205735-PH63882 + # Gradle daemon improves build performance org.gradle.daemon=true diff --git a/pom.xml b/pom.xml index 06bb267..40b6d79 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ 8 UTF-8 DFHWLP + 5.5-20250513205735-PH63882 @@ -29,7 +30,7 @@ com.ibm.cics com.ibm.cics.ts.bom - 5.5-20250513205735-PH63882 + ${cics.bom.version} pom import