Skip to content

Commit 623516c

Browse files
committed
Merge branch '2.x' into 3.x
2 parents 414e149 + ca9c2a8 commit 623516c

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.github/workflows/dep_build_v2.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010

1111
jobs:
1212
build:
13-
runs-on: 'ubuntu-22.04'
13+
runs-on: ubuntu-latest
1414
strategy:
1515
fail-fast: false
1616
matrix:
@@ -19,6 +19,8 @@ jobs:
1919
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2020
steps:
2121
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
22+
with:
23+
ref: 2.x
2224
- name: Set up JDK
2325
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
2426
with:

.github/workflows/main.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
name: Build and Deploy Snapshot
22
on:
33
push:
4-
branches:
5-
- 3.x
4+
branches: [3.*]
65
paths-ignore:
76
- "README.md"
87
- "release-notes/*"
98
pull_request:
10-
branches:
11-
- 3.x
9+
branches: [3.*]
1210
paths-ignore:
1311
- "README.md"
1412
- "release-notes/*"
@@ -18,7 +16,7 @@ permissions:
1816

1917
jobs:
2018
build:
21-
runs-on: 'ubuntu-22.04'
19+
runs-on: 'ubuntu-24.04'
2220
strategy:
2321
fail-fast: false
2422
matrix:

release-notes/VERSION-2.x

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ Modules:
88
=== Releases ===
99
------------------------------------------------------------------------
1010

11-
2.19.0-rc2 (07-Apr-2025)
11+
2.20.0 (not yet released)
12+
13+
-
14+
15+
2.19.0 (24-Apr-2025)
1216

1317
#336: Optimize `InstantDeserializer` `addInColonToOffsetIfMissing()`
1418
(contributed by David S)

0 commit comments

Comments
 (0)