Merge branch '2.19'

FasterXML · Sep 27, 2024 · e930199 · e930199
2 parents 4ab6aca + 4c501d4
commit e930199
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/dep_build_v2.yml b/.github/workflows/dep_build_v2.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

diff --git a/.github/workflows/dep_build_v3.yml b/.github/workflows/dep_build_v3.yml
@@ -22,7 +22,7 @@ jobs:
       with:
         ref: master
     - name: Set up JDK
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,17 +4,15 @@ on:
     branches:
     - master
     - "3.0"
-    - "2.17"
-    - "2.18"
+    - "2.19"
     paths-ignore:
     - "README.md"
     - "release-notes/*"
   pull_request:
     branches:
     - master
     - "3.0"
-    - "2.17"
-    - "2.18"
+    - "2.19"
     paths-ignore:
     - "README.md"
     - "release-notes/*"
@@ -31,7 +29,7 @@ jobs:
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -10,7 +10,11 @@ Sub-modules:
 === Releases ===
 ------------------------------------------------------------------------
 
-2.18.0 (not yet released)
+2.19.0 (not yet released)
+
+-
+
+2.18.0 (26-Sep-2024)
 
 #192: Bring back code to support JAXRS v1 (revert #134 for 2.18)
  (contributed by @pjfanning)