Skip to content

Commit c459639

Browse files
committed
Merge branch '2.x' into 3.x
2 parents 36b7291 + a8c52bd commit c459639

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
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
build:
1313
# Do we want wide matrix build? For now, limited
14-
runs-on: 'ubuntu-22.04'
14+
runs-on: ubuntu-latest
1515
strategy:
1616
fail-fast: false
1717
matrix:
@@ -20,6 +20,8 @@ jobs:
2020
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2121
steps:
2222
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
23+
with:
24+
ref: 2.x
2325
- name: Set up JDK
2426
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
2527
with:

.github/workflows/main.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
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/*"
1513
jobs:
1614
build:
17-
runs-on: 'ubuntu-22.04'
15+
runs-on: 'ubuntu-24.04'
1816
strategy:
1917
fail-fast: false
2018
matrix:

release-notes/VERSION-2.x

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ Modules:
1111
=== Releases ===
1212
------------------------------------------------------------------------
1313

14-
2.19.0-rc2 (07-Apr-2025)
14+
2.20.0 (not yet released)
15+
16+
-
17+
18+
2.19.0 (24-Apr-2025)
1519

1620
#48: Add new "javax.money" (JSR-354) and "moneta" (JSR-354 ref impl) modules
1721
#51: Unify testing structure/tools to JUnit5 [JSTEP-10]

0 commit comments

Comments
 (0)