Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile.jruby-3.1.lock.release
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions NOTICE.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -7622,10 +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
Notice for: jrjackson-0.5.2
----------

https://github.com/guyboertje/jrjackson/blob/v0.4.6/README.md
https://github.com/guyboertje/jrjackson/blob/v0.5.2/README.md

LICENSE applicable to this library:

Expand Down
6 changes: 3 additions & 3 deletions versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading