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

[eRGoCYQI] Upgrades dependencies #3340

Merged
merged 2 commits into from
Dec 7, 2022
Merged

[eRGoCYQI] Upgrades dependencies #3340

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
6b92416
[eRGoCYQI] Upgrades dependencies
ncordon Nov 25, 2022
678258c
[eRGoCYQI] Missing dependency updates
Lojjs Nov 29, 2022
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 @@ -120,7 +120,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.12"
neo4jVersion = "4.4.13"
// instead we apply the override logic here
neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion
testContainersVersion = '1.15.1'
Expand Down
33 changes: 17 additions & 16 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,16 @@ dependencies {

testCompile 'net.sourceforge.jexcelapi:jxl:2.6.12'

compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.270'
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.270'
compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.349'
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.349'

testCompile group: 'org.reflections', name: 'reflections', version: '0.9.12'
testCompile group: 'junit', name: 'junit', version: '4.13.1'
testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3'
testCompile group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'
testCompile group: 'org.neo4j.test', name: 'neo4j-harness', version: neo4jVersionEffective
testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.22.v20170606'
testCompile group: 'org.apache.derby', name: 'derby', version: '10.12.1.1'
testCompile group: 'org.apache.derby', name: 'derby', version: '10.14.2.0'

testCompile group: 'org.neo4j', name: 'neo4j-common', version: neo4jVersionEffective, classifier: "tests"
testCompile group: 'org.neo4j.community', name: 'it-test-support', version: neo4jVersionEffective // , classifier: "tests"
Expand All @@ -115,8 +116,8 @@ dependencies {

compileOnly group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective

testCompile 'org.mock-server:mockserver-netty:5.6.0'
testCompile 'org.mock-server:mockserver-client-java:5.6.0'
testCompile 'org.mock-server:mockserver-netty:5.13.0'
testCompile 'org.mock-server:mockserver-client-java:5.13.0'

compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.214' , withoutJacksons
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.214' , withoutJacksons
Expand All @@ -127,8 +128,8 @@ dependencies {

testCompile group: 'org.apache.hive', name: 'hive-jdbc', version: '1.2.2', withoutServers

compileOnly group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: '3.3.2', withoutServers
compileOnly group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.3.2', withoutServers
compileOnly group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: '3.3.4', withoutServers
compileOnly group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.3.4', withoutServers

compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
// explicit update comomns.io version
Expand All @@ -142,32 +143,32 @@ 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.13.2'
testCompile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-csv', version: '2.14.0'
testCompile group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0'
testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.2'

compileOnly group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.6.1'
testCompile group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.6.1', {
compileOnly group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.6.2'
testCompile group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.6.2', {
exclude group: 'com.google.guava', module: 'guava'
}

compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'

compile group: 'xerces', name: 'xercesImpl', version: '2.12.1'
compile group: 'xerces', name: 'xercesImpl', version: '2.12.2'

compile group: 'org.apache.arrow', name: 'arrow-vector', version: '7.0.0', {
compile group: 'org.apache.arrow', name: 'arrow-vector', version: '10.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', {
compile group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '10.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'
testCompile group: 'org.apache.arrow', name: 'arrow-vector', version: '10.0.0'
testCompile group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '10.0.0'

configurations.all {
exclude group: 'org.slf4j', module: 'slf4j-nop'
Expand Down
4 changes: 2 additions & 2 deletions extra-dependencies/hadoop/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def commonExclusions = {
}

dependencies {
compile group: 'org.apache.hadoop', name: 'hadoop-hdfs-client', version: '3.3.2', commonExclusions
compile group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.3.2', commonExclusions
compile group: 'org.apache.hadoop', name: 'hadoop-hdfs-client', version: '3.3.4', commonExclusions
compile group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.3.4', commonExclusions
}


Expand Down
24 changes: 12 additions & 12 deletions full/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,16 @@ dependencies {

testCompile 'net.sourceforge.jexcelapi:jxl:2.6.12'

compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.270'
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.270'
compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.349'
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.349'

testCompile group: 'org.reflections', name: 'reflections', version: '0.9.12'

testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3'
testCompile group: 'org.neo4j.test', name: 'neo4j-harness', version: neo4jVersionEffective
testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.22.v20170606'
testCompile group: 'org.apache.derby', name: 'derby', version: '10.12.1.1'
testCompile group: 'org.apache.derby', name: 'derby', version: '10.14.2.0'

testCompile group: 'org.postgresql', name: 'postgresql', version: '42.1.4'
testCompile group: 'org.postgresql', name: 'postgresql', version: '42.3.3'

def withoutServers = {
exclude group: 'org.eclipse.jetty'
Expand Down Expand Up @@ -135,8 +134,8 @@ dependencies {
testCompile group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: '2.13.2', withoutJacksons
testCompile 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0'

testCompile 'org.mock-server:mockserver-netty:5.6.0'
testCompile 'org.mock-server:mockserver-client-java:5.6.0'
testCompile 'org.mock-server:mockserver-netty:5.13.0'
testCompile 'org.mock-server:mockserver-client-java:5.13.0'

compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.214' , withoutJacksons
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.214' , withoutJacksons
Expand All @@ -148,22 +147,23 @@ dependencies {

// schemacrawler
compile group: 'us.fatehi', name: 'schemacrawler', version: '15.04.01'
testCompile group: 'us.fatehi', name: 'schemacrawler-mysql', version: '15.04.01'
testCompile group: 'us.fatehi', name: 'schemacrawler-mysql', version: '16.19.2'

testCompile group: 'org.apache.hive', name: 'hive-jdbc', version: '1.2.2', withoutServers

compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'

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: 'org.hamcrest', name: 'hamcrest', version: '2.2'
testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'


testCompile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-csv', version: '2.13.2'
testCompile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-csv', version: '2.14.0'
testCompile group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0'
testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.2'

compileOnly group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.6.1'
testCompile group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.6.1', {
compileOnly group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.6.2'
testCompile group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.6.2', {
exclude group: 'com.google.guava', module: 'guava'
}

Expand Down
10 changes: 5 additions & 5 deletions test-utils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ dependencies {
exclude group: 'org.apache.hive', module: 'hive-service'
}

compile group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: '3.3.2', withoutServers
compile group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.3.2', withoutServers
compile group: 'org.apache.hadoop', name: 'hadoop-minicluster', version: '3.3.2', withoutServers
compile group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: '3.3.4', withoutServers
compile group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.3.4', withoutServers
compile group: 'org.apache.hadoop', name: 'hadoop-minicluster', version: '3.3.4', withoutServers

compile group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: '4.4.9'
compile group: 'org.jetbrains', name: 'annotations', version: "17.0.0"
Expand All @@ -36,6 +36,6 @@ dependencies {
compile group: 'org.testcontainers', name: 'postgresql', version: testContainersVersion
compile group: 'org.testcontainers', name: 'cassandra', version: testContainersVersion
compile group: 'org.testcontainers', name: 'localstack', version: testContainersVersion
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'
compile group: 'org.apache.arrow', name: 'arrow-vector', version: '10.0.0'
compile group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '10.0.0'
}