Skip to content

Commit 2f2fdcc

Browse files
cowtowncodercowtowncoder
committed
Merge branch '2.x' of github.com:FasterXML/jackson-datatypes-misc into 2.x
2 parents bdfb6d5 + a66d1ed commit 2f2fdcc

File tree

12 files changed

+42
-17
lines changed

12 files changed

+42
-17
lines changed

‎.github/workflows/dep_build_v2.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
env:
2020
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2121
steps:
22-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
with:
2424
ref: 2.x
2525
- name: Set up JDK
26-
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
26+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2727
with:
2828
distribution: 'temurin'
2929
java-version: ${{ matrix.java_version }}

‎.github/workflows/dep_build_v3.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
env:
2020
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2121
steps:
22-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
with:
2424
ref: 3.x
2525
- name: Set up JDK
26-
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
26+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2727
with:
2828
distribution: 'temurin'
2929
java-version: ${{ matrix.java_version }}

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424
- name: Set up JDK
25-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
25+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2626
with:
2727
distribution: 'temurin'
2828
java-version: ${{ matrix.java_version }}
@@ -50,7 +50,7 @@ jobs:
5050
run: ./mvnw -B -q -ff -ntp test
5151
- name: Publish code coverage
5252
if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' }}
53-
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
53+
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
5454
with:
5555
token: ${{ secrets.CODECOV_TOKEN }}
5656
files: ./target/site/jacoco/jacoco.xml

‎jakarta-jsonp/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ working with JSON-P (JSON Processing) node types (new Jakarta flavor) via data-b
5656
<groupId>com.google.code.maven-replacer-plugin</groupId>
5757
<artifactId>replacer</artifactId>
5858
</plugin>
59+
<!-- 29-Apr-2025, tatu: SBOM generation [JSTEP-14] -->
60+
<plugin>
61+
<groupId>org.cyclonedx</groupId>
62+
<artifactId>cyclonedx-maven-plugin</artifactId>
63+
</plugin>
5964
<plugin>
6065
<groupId>org.moditect</groupId>
6166
<artifactId>moditect-maven-plugin</artifactId>

‎jakarta-mail/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ working with Jakarta Mail types
4545
<groupId>com.google.code.maven-replacer-plugin</groupId>
4646
<artifactId>replacer</artifactId>
4747
</plugin>
48+
<!-- 29-Apr-2025, tatu: SBOM generation [JSTEP-14] -->
49+
<plugin>
50+
<groupId>org.cyclonedx</groupId>
51+
<artifactId>cyclonedx-maven-plugin</artifactId>
52+
</plugin>
4853
<plugin>
4954
<groupId>org.moditect</groupId>
5055
<artifactId>moditect-maven-plugin</artifactId>

‎javax-money/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@
9191
<groupId>com.google.code.maven-replacer-plugin</groupId>
9292
<artifactId>replacer</artifactId>
9393
</plugin>
94+
<!-- 29-Apr-2025, tatu: SBOM generation [JSTEP-14] -->
95+
<plugin>
96+
<groupId>org.cyclonedx</groupId>
97+
<artifactId>cyclonedx-maven-plugin</artifactId>
98+
</plugin>
9499
<plugin>
95100
<groupId>org.moditect</groupId>
96101
<artifactId>moditect-maven-plugin</artifactId>

‎joda-money/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
<groupId>com.google.code.maven-replacer-plugin</groupId>
4646
<artifactId>replacer</artifactId>
4747
</plugin>
48+
<!-- 29-Apr-2025, tatu: SBOM generation [JSTEP-14] -->
49+
<plugin>
50+
<groupId>org.cyclonedx</groupId>
51+
<artifactId>cyclonedx-maven-plugin</artifactId>
52+
</plugin>
4853
<plugin>
4954
<groupId>org.moditect</groupId>
5055
<artifactId>moditect-maven-plugin</artifactId>

‎json-org/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ mainly to make it easier to upgrade code to Jackson, using automated conversions
4646
<groupId>com.google.code.maven-replacer-plugin</groupId>
4747
<artifactId>replacer</artifactId>
4848
</plugin>
49+
<!-- 29-Apr-2025, tatu: SBOM generation [JSTEP-14] -->
50+
<plugin>
51+
<groupId>org.cyclonedx</groupId>
52+
<artifactId>cyclonedx-maven-plugin</artifactId>
53+
</plugin>
4954
<!-- 19-Mar-2019, tatu: Add rudimentary JDK9+ module info. To build with JDK 8
5055
will have to use `moduleInfoFile` as anything else requires JDK 9+
5156
-->

‎jsr-353/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ working with JSR-353 (JSON-P) node types via data-binding
5656
<groupId>com.google.code.maven-replacer-plugin</groupId>
5757
<artifactId>replacer</artifactId>
5858
</plugin>
59+
<!-- 29-Apr-2025, tatu: SBOM generation [JSTEP-14] -->
60+
<plugin>
61+
<groupId>org.cyclonedx</groupId>
62+
<artifactId>cyclonedx-maven-plugin</artifactId>
63+
</plugin>
5964
<plugin>
6065
<groupId>org.moditect</groupId>
6166
<artifactId>moditect-maven-plugin</artifactId>

‎moneta/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@
9595
<groupId>com.google.code.maven-replacer-plugin</groupId>
9696
<artifactId>replacer</artifactId>
9797
</plugin>
98+
<!-- 29-Apr-2025, tatu: SBOM generation [JSTEP-14] -->
99+
<plugin>
100+
<groupId>org.cyclonedx</groupId>
101+
<artifactId>cyclonedx-maven-plugin</artifactId>
102+
</plugin>
98103
<plugin>
99104
<groupId>org.moditect</groupId>
100105
<artifactId>moditect-maven-plugin</artifactId>

0 commit comments

Comments
 (0)