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

Jackson 2.15.3; consistent Jackson, JUnit, Mockito usage #3802

Merged
merged 1 commit into from
Dec 6, 2023
Merged

Jackson 2.15.3; consistent Jackson, JUnit, Mockito usage #3802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ subprojects {
}
}
dependencies {
implementation platform('com.fasterxml.jackson:jackson-bom:2.15.0')
implementation platform('com.fasterxml.jackson:jackson-bom:2.15.3')
implementation platform('org.eclipse.jetty:jetty-bom:9.4.53.v20231009')
implementation platform('io.micrometer:micrometer-bom:1.10.5')
implementation libs.guava.core
Expand Down
2 changes: 1 addition & 1 deletion data-prepper-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {
implementation 'io.micrometer:micrometer-core'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.3'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
implementation 'org.apache.parquet:parquet-common:1.13.1'
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
implementation libs.commons.lang3
Expand Down
2 changes: 0 additions & 2 deletions data-prepper-plugins/avro-codecs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ dependencies {
implementation 'org.apache.parquet:parquet-common:1.13.1'
implementation 'software.amazon.awssdk:s3'
implementation 'software.amazon.awssdk:apache-client'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
testImplementation 'org.json:json:20230227'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
testImplementation project(':data-prepper-plugins:common')
}

Expand Down
2 changes: 0 additions & 2 deletions data-prepper-plugins/buffer-common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ plugins {

dependencies {
implementation project(path: ':data-prepper-api')
testImplementation platform('org.junit:junit-bom:5.9.1')
testImplementation 'org.junit.jupiter:junit-jupiter'
}

test {
Expand Down
1 change: 0 additions & 1 deletion data-prepper-plugins/cloudwatch-logs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ dependencies {
implementation 'org.hibernate.validator:hibernate-validator:8.0.0.Final'
testImplementation project(path: ':data-prepper-test-common')
testImplementation testLibs.mockito.inline
testImplementation 'org.junit.jupiter:junit-jupiter'
compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'
}
Expand Down
2 changes: 1 addition & 1 deletion data-prepper-plugins/dissect-processor/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {

dependencies {
implementation project(':data-prepper-api')
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.0'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
implementation 'io.micrometer:micrometer-core'
implementation project(path: ':data-prepper-api')
implementation project(path: ':data-prepper-plugins:mutate-event-processors')
Expand Down
2 changes: 0 additions & 2 deletions data-prepper-plugins/dynamodb-source-coordination-store/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ dependencies {
implementation project(':data-prepper-api')
implementation project(':data-prepper-plugins:common')
implementation 'com.fasterxml.jackson.core:jackson-databind'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
implementation 'software.amazon.awssdk:arns'
implementation 'software.amazon.awssdk:dynamodb'
implementation 'software.amazon.awssdk:dynamodb-enhanced'
Expand Down
2 changes: 0 additions & 2 deletions data-prepper-plugins/dynamodb-source/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ dependencies {
implementation project(path: ':data-prepper-plugins:buffer-common')


testImplementation platform('org.junit:junit-bom:5.9.1')
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation testLibs.mockito.inline
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
}
Expand Down
2 changes: 0 additions & 2 deletions data-prepper-plugins/in-memory-source-coordination-store/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ plugins {

dependencies {
implementation project(':data-prepper-api')
testImplementation platform('org.junit:junit-bom:5.9.1')
testImplementation 'org.junit.jupiter:junit-jupiter'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion data-prepper-plugins/kafka-connect-plugins/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies {
testImplementation project(':data-prepper-test-common')
testImplementation project(':data-prepper-core')
testImplementation 'org.yaml:snakeyaml:2.0'
testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2'
testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
testImplementation testLibs.mockito.inline
}

Expand Down
6 changes: 3 additions & 3 deletions data-prepper-plugins/kafka-plugins/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ dependencies {
implementation 'software.amazon.awssdk:s3'
implementation 'software.amazon.awssdk:apache-client'

testImplementation 'org.mockito:mockito-inline:4.1.0'
testImplementation testLibs.mockito.inline
testImplementation 'org.yaml:snakeyaml:2.0'
testImplementation testLibs.spring.test
testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2'
testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
testImplementation project(':data-prepper-test-common')
testImplementation project(':data-prepper-plugins:blocking-buffer')
testImplementation project(':data-prepper-core')
testImplementation 'org.mockito:mockito-inline:4.1.0'
testImplementation testLibs.mockito.inline
testImplementation 'org.apache.kafka:kafka_2.13:3.4.0'
testImplementation 'org.apache.kafka:kafka_2.13:3.4.0:test'
testImplementation 'org.apache.curator:curator-test:5.5.0'
Expand Down
2 changes: 1 addition & 1 deletion data-prepper-plugins/mapdb-processor-state/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation 'org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21'
testImplementation testLibs.junit.vintage
testImplementation project(':data-prepper-plugins:common').sourceSets.test.output
testImplementation 'junit:junit:4.13.2'
testImplementation testLibs.junit.vintage
}

jacocoTestCoverageVerification {
Expand Down
2 changes: 1 addition & 1 deletion data-prepper-plugins/opensearch/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
implementation libs.opensearch.java
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.0'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
implementation 'software.amazon.awssdk:auth'
implementation 'software.amazon.awssdk:http-client-spi'
Expand Down
2 changes: 1 addition & 1 deletion data-prepper-plugins/s3-source/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
implementation 'joda-time:joda-time:2.11.1'
implementation 'org.hibernate.validator:hibernate-validator:7.0.5.Final'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
implementation 'org.xerial.snappy:snappy-java:1.1.10.1'
implementation 'org.apache.parquet:parquet-common:1.13.1'
implementation 'dev.failsafe:failsafe:3.3.2'
Expand Down
2 changes: 1 addition & 1 deletion data-prepper-plugins/sqs-source/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
implementation 'software.amazon.awssdk:sts'
implementation 'io.micrometer:micrometer-core'
implementation 'com.fasterxml.jackson.core:jackson-annotations'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
testImplementation project(':data-prepper-plugins:blocking-buffer')
}
Expand Down
2 changes: 1 addition & 1 deletion data-prepper-plugins/translate-processor/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {

dependencies {
implementation project(':data-prepper-api')
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.0'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
implementation 'com.amazonaws:aws-java-sdk-s3:1.12.395'
implementation 'com.amazonaws:aws-java-sdk-sts:1.12.395'
implementation 'io.micrometer:micrometer-core'
Expand Down
Loading