From 5d4dce3f04d5c9babc3396bbd565fcb2ed63027e Mon Sep 17 00:00:00 2001 From: Andrea Santurbano Date: Fri, 22 Apr 2022 14:14:18 +0200 Subject: [PATCH] updated packages passing dependecy-check --- build.gradle | 2 +- core/build.gradle | 22 +++++++++++++++------- full/build.gradle | 6 +++--- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 4a01de5700..800e7f6217 100644 --- a/build.gradle +++ b/build.gradle @@ -109,7 +109,7 @@ subprojects { ext { // NB: due to version.json generation by parsing this file, the next line must not have any if/then/else logic - neo4jVersion = "4.4.1" + neo4jVersion = "4.4.5" // instead we apply the override logic here neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion testContainersVersion = '1.15.1' diff --git a/core/build.gradle b/core/build.gradle index 48d059eecf..9a88403c1d 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -43,7 +43,7 @@ dependencies { apt group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective compile group: 'commons-codec', name: 'commons-codec', version: '1.14' compile group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0' - compile group: 'net.minidev', name: 'json-smart', version: '2.4.2' + compile group: 'net.minidev', name: 'json-smart', version: '2.4.8' compile group: 'org.hdrhistogram', name: 'HdrHistogram', version: '2.1.9' antlr "org.antlr:antlr4:4.7.2", { @@ -98,7 +98,6 @@ dependencies { compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.11.683' testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.11.683' - testCompile group: 'org.codehaus.jackson', name: 'jackson-mapper-asl', version: '1.9.7' compile group: 'com.opencsv', name: 'opencsv', version: '4.6' compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4' compileOnly group: 'org.ow2.asm', name: 'asm', version: '5.0.2' @@ -119,7 +118,7 @@ dependencies { testCompile group: 'org.xmlunit', name: 'xmlunit-core', version: '2.2.1' testCompile group: 'com.github.adejanovski', name: 'cassandra-jdbc-wrapper', version: '3.1.0' - testCompile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-csv', version: '2.9.7' + testCompile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-csv', version: '2.13.2' testCompile group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0' testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.2' @@ -132,10 +131,19 @@ dependencies { compile group: 'xerces', name: 'xercesImpl', version: '2.12.1' - compile group: 'org.apache.arrow', name: 'arrow-vector', version: '6.0.0' - compile group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '6.0.0' - testCompile group: 'org.apache.arrow', name: 'arrow-vector', version: '6.0.0' - testCompile group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '6.0.0' + compile group: 'org.apache.arrow', name: 'arrow-vector', version: '7.0.0', { + exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core' + exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations' + exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind' + exclude group: 'io.netty', module: 'netty-common' + } + compile group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '7.0.0', { + exclude group: 'com.google.guava', module: 'guava' + exclude group: 'io.netty', module: 'netty-common' + exclude group: 'io.netty', module: 'netty-buffer' + } + testCompile group: 'org.apache.arrow', name: 'arrow-vector', version: '7.0.0' + testCompile group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '7.0.0' configurations.all { exclude group: 'org.slf4j', module: 'slf4j-nop' diff --git a/full/build.gradle b/full/build.gradle index 0e5772a57f..2f4c1185b1 100644 --- a/full/build.gradle +++ b/full/build.gradle @@ -106,10 +106,10 @@ dependencies { compileOnly group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective - compileOnly group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: '2.13.1' + compileOnly group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: '2.13.2' compileOnly 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0' - testCompile group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: '2.13.1' + testCompile group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: '2.13.2' testCompile 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0' testCompile 'org.mock-server:mockserver-netty:5.6.0' @@ -135,7 +135,7 @@ dependencies { testCompile group: 'com.github.adejanovski', name: 'cassandra-jdbc-wrapper', version: '3.1.0' - testCompile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-csv', version: '2.9.7' + testCompile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-csv', version: '2.13.2' testCompile group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0' testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.2'