Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump jackson-dataformat-yaml from 2.13.5 to 2.15.2 #603

Merged
merged 2 commits into from
Oct 20, 2023
Merged

Bump jackson-dataformat-yaml from 2.13.5 to 2.15.2 #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fd7b2c
Bump jackson-dataformat-yaml from 2.13.5 to 2.15.2
masokol Oct 20, 2023
99d29ec
Merge branch 'master' into bumpJacksonDataformatYAML
masokol Oct 20, 2023
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Version 5.0.0 (Not yet released)

* Bump jackson-dataformat-yaml from 2.13.5 to 2.15.2 - Issue #602
* Make locks dynamic based on TTL of lock table - Issue #543
* Add new repair type parallel_vnode - Issue #554
* Add validation of repair interval and alarms - Issue #560
Expand Down
5 changes: 5 additions & 0 deletions application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@
<artifactId>jackson-databind</artifactId>
</dependency>

<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>

<!-- Test -->
<dependency>
<groupId>org.junit.vintage</groupId>
Expand Down
6 changes: 3 additions & 3 deletions karaf-feature/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<bundle>mvn:com.datastax.oss/java-driver-shaded-guava/${cassandra.driver.shaded.guava.version}</bundle>
<bundle>mvn:com.typesafe/config/${com.typesafe.config.version}</bundle>
<bundle>mvn:org.hdrhistogram/HdrHistogram/${org.hdrhistogram.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/${com.fasterxml.jackson.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${com.fasterxml.jackson.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${com.fasterxml.jackson.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/${com.fasterxml.jackson.core.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${com.fasterxml.jackson.core.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${com.fasterxml.jackson.core.version}</bundle>
<bundle>mvn:jakarta.validation/jakarta.validation-api/${jakarta.validation-api.version}</bundle>
</feature>
</features>
23 changes: 18 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@
<assertj.version>3.16.1</assertj.version>
<junit.version>5.7.0</junit.version>
<org.apache.commons.io.version>2.7</org.apache.commons.io.version>
<com.fasterxml.jackson.version>2.15.2</com.fasterxml.jackson.version>
<com.fasterxml.jackson-databind.version>2.15.2</com.fasterxml.jackson-databind.version>
<com.fasterxml.jackson.core.version>2.15.2</com.fasterxml.jackson.core.version>
<com.fasterxml.jackson.dataformat.version>2.15.2</com.fasterxml.jackson.dataformat.version>
<org.yaml.snakeyaml.version>1.33</org.yaml.snakeyaml.version>

<pax-exam.version>4.13.4</pax-exam.version>
<pax-logging-logback.version>1.8.4</pax-logging-logback.version>
Expand Down Expand Up @@ -191,19 +192,31 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${com.fasterxml.jackson.version}</version>
<version>${com.fasterxml.jackson.core.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${com.fasterxml.jackson.version}</version>
<version>${com.fasterxml.jackson.core.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${com.fasterxml.jackson-databind.version}</version>
<version>${com.fasterxml.jackson.core.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${com.fasterxml.jackson.dataformat.version}</version>
</dependency>

<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${org.yaml.snakeyaml.version}</version>
</dependency>

<!-- Metrics -->
Expand Down