From 83e0337587c38d51e1cef9e1317ffe4bec3cc4da Mon Sep 17 00:00:00 2001 From: Cas Donoghue Date: Thu, 9 Jul 2026 09:53:46 -0700 Subject: [PATCH 1/2] Bump jackson and jrjackson dependencies (#19249) * Bump jackson and jrjackson dependencies * Update jackson and jrjackson versions in NOTICE.TXT * finalized version * take up 0.5.2 (cherry picked from commit bb92531e39aa87394c38cfad6dbd0b7ae55dd545) # Conflicts: # NOTICE.TXT --- NOTICE.TXT | 15 +++++++++++---- versions.yml | 6 +++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/NOTICE.TXT b/NOTICE.TXT index 53917bb751..8b7fd07b78 100644 --- a/NOTICE.TXT +++ b/NOTICE.TXT @@ -3383,7 +3383,7 @@ http://www.apache.org/licenses/LICENSE-2.0 limitations under the License. ========== -Notice for: com.fasterxml.jackson.core:jackson-core-2.21.2 +Notice for: com.fasterxml.jackson.core:jackson-core-2.21.4 ---------- # Jackson JSON processor @@ -3610,7 +3610,7 @@ from the source code management (SCM) system project uses. See the License for the specific language governing permissions and limitations under the License. ========== -Notice for: com.fasterxml.jackson.core:jackson-databind-2.21.2 +Notice for: com.fasterxml.jackson.core:jackson-databind-2.21.4 ---------- # Jackson JSON processor @@ -3846,7 +3846,7 @@ http://www.apache.org/licenses/LICENSE-2.0 See the License for the specific language governing permissions and limitations under the License. ========== -Notice for: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor-2.21.2 +Notice for: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor-2.21.4 ---------- This copy of Jackson JSON processor databind module is licensed under the @@ -4061,7 +4061,7 @@ http://www.apache.org/licenses/LICENSE-2.0 See the License for the specific language governing permissions and limitations under the License. ========== -Notice for: com.fasterxml.jackson.module:jackson-module-afterburner-2.21.2 +Notice for: com.fasterxml.jackson.module:jackson-module-afterburner-2.21.4 ---------- This copy of Jackson JSON processor databind module is licensed under the @@ -7212,6 +7212,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ========== +<<<<<<< HEAD Notice for: jls-grok-0.11.5 ---------- @@ -7626,6 +7627,12 @@ Notice for: jrjackson-0.5.0 ---------- https://github.com/guyboertje/jrjackson/blob/v0.4.6/README.md +======= +Notice for: jrjackson-0.5.2 +---------- + +https://github.com/guyboertje/jrjackson/blob/v0.5.2/README.md +>>>>>>> bb92531e3 (Bump jackson and jrjackson dependencies (#19249)) LICENSE applicable to this library: diff --git a/versions.yml b/versions.yml index 0ea7989d60..f8469f6274 100644 --- a/versions.yml +++ b/versions.yml @@ -27,7 +27,7 @@ jruby: # Note: this file is copied to the root of logstash-core because its gemspec needs it when # bundler evaluates the gemspec via bin/logstash # Ensure Jackson version here is kept in sync with version used by jrjackson gem -jrjackson: 0.5.0 -jackson: 2.21.2 -jackson-databind: 2.21.2 +jrjackson: 0.5.2 +jackson: 2.21.4 +jackson-databind: 2.21.4 jackson-annotations: 2.21 # standalone release without a patch version From 6e3b25be93bc899c6ab6bfa40838fa6b5c5d08ed Mon Sep 17 00:00:00 2001 From: donoghuc Date: Thu, 9 Jul 2026 12:53:13 -0700 Subject: [PATCH 2/2] fix mergeconflict and update lockfile --- Gemfile.jruby-3.1.lock.release | 4 ++-- NOTICE.TXT | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Gemfile.jruby-3.1.lock.release b/Gemfile.jruby-3.1.lock.release index 0cc5e6dfe1..97638caf74 100644 --- a/Gemfile.jruby-3.1.lock.release +++ b/Gemfile.jruby-3.1.lock.release @@ -15,7 +15,7 @@ PATH filesize (~> 0.2) gems (~> 1) i18n (~> 1) - jrjackson (= 0.5.0) + jrjackson (= 0.5.2) manticore (~> 0.6) minitar (~> 1) pry (~> 0.12) @@ -175,7 +175,7 @@ GEM jls-lumberjack (0.0.26) concurrent-ruby jmespath (1.6.2) - jrjackson (0.5.0-java) + jrjackson (0.5.2-java) bigdecimal jruby-jms (1.3.0-java) gene_pool diff --git a/NOTICE.TXT b/NOTICE.TXT index 8b7fd07b78..4c9706e8a3 100644 --- a/NOTICE.TXT +++ b/NOTICE.TXT @@ -7212,7 +7212,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ========== -<<<<<<< HEAD Notice for: jls-grok-0.11.5 ---------- @@ -7623,16 +7622,10 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION of your accepting any such warranty or additional liability. ========== -Notice for: jrjackson-0.5.0 ----------- - -https://github.com/guyboertje/jrjackson/blob/v0.4.6/README.md -======= Notice for: jrjackson-0.5.2 ---------- https://github.com/guyboertje/jrjackson/blob/v0.5.2/README.md ->>>>>>> bb92531e3 (Bump jackson and jrjackson dependencies (#19249)) LICENSE applicable to this library: