From 73907679435d82df45ecd1b4e140e0e1b811101c Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Thu, 1 May 2025 13:43:13 -0700 Subject: [PATCH 1/2] Update CI settings --- .github/workflows/main.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dc1395d4..e48ea140 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,35 +1,28 @@ name: Build and Deploy Snapshot on: push: - branches: - - master - - "3.0" - - "2.18" + branches: [2.*] paths-ignore: - "README.md" - "release-notes/*" pull_request: - branches: - - master - - "3.0" - - "2.18" + branches: [2.*] paths-ignore: - "README.md" - "release-notes/*" jobs: build: - runs-on: ${{ matrix.os }} + runs-on: 'ubuntu-latest' strategy: fail-fast: false matrix: java_version: ['8', '11', '17'] - os: ['ubuntu-20.04'] env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ matrix.java_version }} @@ -57,7 +50,7 @@ jobs: run: ./mvnw -B -q -ff -ntp test - name: Publish code coverage if: github.event_name != 'pull_request' && matrix.java_version == '8' - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} file: ./target/site/jacoco/jacoco.xml From 76a6255a4f0b13832d1f1fb427caa0975b329513 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Thu, 1 May 2025 13:47:52 -0700 Subject: [PATCH 2/2] JSTEP-14: generate SBOMs --- jakarta-jsonp/pom.xml | 5 +++++ jakarta-mail/pom.xml | 5 +++++ javax-money/pom.xml | 5 +++++ joda-money/pom.xml | 5 +++++ json-org/pom.xml | 5 +++++ jsr-353/pom.xml | 5 +++++ moneta/pom.xml | 5 +++++ pom.xml | 10 ---------- release-notes/VERSION-2.x | 2 +- 9 files changed, 36 insertions(+), 11 deletions(-) diff --git a/jakarta-jsonp/pom.xml b/jakarta-jsonp/pom.xml index 6774f532..335cb64a 100644 --- a/jakarta-jsonp/pom.xml +++ b/jakarta-jsonp/pom.xml @@ -56,6 +56,11 @@ working with JSON-P (JSON Processing) node types (new Jakarta flavor) via data-b com.google.code.maven-replacer-plugin replacer + + + org.cyclonedx + cyclonedx-maven-plugin + org.moditect moditect-maven-plugin diff --git a/jakarta-mail/pom.xml b/jakarta-mail/pom.xml index 886ad94b..e5cef285 100644 --- a/jakarta-mail/pom.xml +++ b/jakarta-mail/pom.xml @@ -45,6 +45,11 @@ working with Jakarta Mail types com.google.code.maven-replacer-plugin replacer + + + org.cyclonedx + cyclonedx-maven-plugin + org.moditect moditect-maven-plugin diff --git a/javax-money/pom.xml b/javax-money/pom.xml index 6a2ed745..4bb6b4f0 100644 --- a/javax-money/pom.xml +++ b/javax-money/pom.xml @@ -91,6 +91,11 @@ com.google.code.maven-replacer-plugin replacer + + + org.cyclonedx + cyclonedx-maven-plugin + org.moditect moditect-maven-plugin diff --git a/joda-money/pom.xml b/joda-money/pom.xml index daa1201d..0c1cedd6 100644 --- a/joda-money/pom.xml +++ b/joda-money/pom.xml @@ -45,6 +45,11 @@ com.google.code.maven-replacer-plugin replacer + + + org.cyclonedx + cyclonedx-maven-plugin + org.moditect moditect-maven-plugin diff --git a/json-org/pom.xml b/json-org/pom.xml index 5afecda0..2310c837 100644 --- a/json-org/pom.xml +++ b/json-org/pom.xml @@ -46,6 +46,11 @@ mainly to make it easier to upgrade code to Jackson, using automated conversions com.google.code.maven-replacer-plugin replacer + + + org.cyclonedx + cyclonedx-maven-plugin + diff --git a/jsr-353/pom.xml b/jsr-353/pom.xml index c5fd6a72..a557ffda 100644 --- a/jsr-353/pom.xml +++ b/jsr-353/pom.xml @@ -56,6 +56,11 @@ working with JSR-353 (JSON-P) node types via data-binding com.google.code.maven-replacer-plugin replacer + + + org.cyclonedx + cyclonedx-maven-plugin + org.moditect moditect-maven-plugin diff --git a/moneta/pom.xml b/moneta/pom.xml index fe23f6b7..c4a7809c 100644 --- a/moneta/pom.xml +++ b/moneta/pom.xml @@ -95,6 +95,11 @@ com.google.code.maven-replacer-plugin replacer + + + org.cyclonedx + cyclonedx-maven-plugin + org.moditect moditect-maven-plugin diff --git a/pom.xml b/pom.xml index 513e30bd..a0186875 100644 --- a/pom.xml +++ b/pom.xml @@ -100,16 +100,6 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - - - com/fasterxml/jackson/**/failing/*.java - - - diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index 4111831a..ba916bb8 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -13,7 +13,7 @@ Modules: 2.20.0 (not yet released) -- +- Generate SBOMs [JSTEP-14] 2.19.0 (24-Apr-2025)