Skip to content

Commit c41f2dd

Browse files
authored
Merge branch '3.x' into feature/record-with-jacksonxmltext
2 parents 8d2e14c + 9d61cc9 commit c41f2dd

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: Build and Deploy Snapshot
22
on:
33
push:
4-
branches: [3.*]
4+
branches: ['3.*']
55
paths-ignore:
66
- "README.md"
77
- "release-notes/*"
88
pull_request:
9-
branches: [3.*]
9+
branches:
1010
paths-ignore:
1111
- "README.md"
1212
- "release-notes/*"

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<parent>
1010
<groupId>tools.jackson</groupId>
1111
<artifactId>jackson-base</artifactId>
12-
<version>3.0.0-rc4-SNAPSHOT</version>
12+
<version>3.0.0-rc5-SNAPSHOT</version>
1313
</parent>
1414

1515
<groupId>tools.jackson.dataformat</groupId>
1616
<artifactId>jackson-dataformat-xml</artifactId>
17-
<version>3.0.0-rc4-SNAPSHOT</version>
17+
<version>3.0.0-rc5-SNAPSHOT</version>
1818
<name>Jackson-dataformat-XML</name>
1919
<packaging>jar</packaging>
2020
<description>Data format extension for Jackson to offer
@@ -32,7 +32,7 @@ alternative support for serializing POJOs as XML and deserializing XML as POJOs.
3232
<packageVersion.package>${project.groupId}.xml</packageVersion.package>
3333

3434
<!-- for Reproducible Builds -->
35-
<project.build.outputTimestamp>2025-04-14T02:36:24Z</project.build.outputTimestamp>
35+
<project.build.outputTimestamp>2025-05-10T23:56:11Z</project.build.outputTimestamp>
3636
</properties>
3737

3838
<dependencies>

release-notes/VERSION

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ Version: 3.x (for earlier see VERSION-2.x)
55
=== Releases ===
66
------------------------------------------------------------------------
77

8+
3.0.0-rc4 (10-May-2025)
9+
10+
No changes since rc3.
11+
812
3.0.0-rc3 (13-Apr-2025)
913

1014
- Branch rename "master" -> "3.x" [JSTEP-12]

release-notes/VERSION-2.x

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Project: jackson-dataformat-xml
88

99
- Generate SBOMs [JSTEP-14]
1010

11-
2.19.0-rc2 (24-Apr-2025)
11+
2.19.0 (24-Apr-2025)
1212

1313
#508: `XmlMapper` is unable to deserialise into an empty record
1414
(reported by @protazy)
@@ -20,6 +20,7 @@ Project: jackson-dataformat-xml
2020
(contributed by @duoduobingbing)
2121
- Upgrade Woodstox to 7.1.0
2222

23+
2.18.4 (06-May-2025)
2324
2.18.3 (28-Feb-2025)
2425

2526
No changes since 2.18.2

0 commit comments

Comments
 (0)