Skip to content

Commit

Permalink
[NOID] Update snyk recommended dependencies (#3935)
Browse files Browse the repository at this point in the history
  • Loading branch information
gem-neo4j authored Feb 1, 2024
1 parent 1e0f6b4 commit 40d2fe7
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 38 deletions.
16 changes: 8 additions & 8 deletions LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Apache-2.0
HikariCP-java7-2.4.12.jar
RoaringBitmap-0.7.17.jar
WMI4Java-1.6.3.jar
accessors-smart-2.4.9.jar
accessors-smart-2.5.0.jar
annotations-17.0.0.jar
apiguardian-api-1.1.0.jar
arrow-format-12.0.1.jar
Expand All @@ -19,9 +19,9 @@ Apache-2.0
audience-annotations-0.5.0.jar
avro-1.7.7.jar
awaitility-4.1.0.jar
aws-java-sdk-core-1.12.425.jar
aws-java-sdk-kms-1.12.425.jar
aws-java-sdk-s3-1.12.425.jar
aws-java-sdk-core-1.12.646.jar
aws-java-sdk-kms-1.12.646.jar
aws-java-sdk-s3-1.12.646.jar
byte-buddy-1.11.13.jar
byte-buddy-agent-1.11.13.jar
caffeine-3.0.3.jar
Expand Down Expand Up @@ -91,7 +91,6 @@ Apache-2.0
hadoop-yarn-server-web-proxy-3.3.6.jar
httpclient-4.5.13.jar
httpcore-4.4.13.jar
ion-java-1.0.2.jar
ipaddress-5.3.3.jar
j2objc-annotations-2.8.jar
jPowerShell-3.0.jar
Expand Down Expand Up @@ -130,14 +129,14 @@ Apache-2.0
jetty-xml-9.4.53.v20231009.jar
jffi-1.2.16-native.jar
jffi-1.2.16.jar
jmespath-java-1.12.425.jar
jmespath-java-1.12.646.jar
jna-5.9.0.jar
jnr-constants-0.9.9.jar
jnr-ffi-2.1.7.jar
joda-time-2.8.1.jar
json-io-2.5.1.jar
json-path-2.8.0.jar
json-smart-2.4.10.jar
json-path-2.9.0.jar
json-smart-2.5.0.jar
jsr305-3.0.2.jar
kerb-admin-1.0.1.jar
kerb-client-1.0.1.jar
Expand Down Expand Up @@ -2827,6 +2826,7 @@ MIT
neo4j-1.17.6.jar
postgresql-1.17.6.jar
slf4j-api-1.7.36.jar
slf4j-api-2.0.11.jar
slf4j-log4j12-1.7.25.jar
slf4j-nop-1.7.30.jar
slf4j-reload4j-1.7.36.jar
Expand Down
16 changes: 8 additions & 8 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Apache-2.0
HikariCP-java7-2.4.12.jar
RoaringBitmap-0.7.17.jar
WMI4Java-1.6.3.jar
accessors-smart-2.4.9.jar
accessors-smart-2.5.0.jar
annotations-17.0.0.jar
apiguardian-api-1.1.0.jar
arrow-format-12.0.1.jar
Expand All @@ -49,9 +49,9 @@ Apache-2.0
audience-annotations-0.5.0.jar
avro-1.7.7.jar
awaitility-4.1.0.jar
aws-java-sdk-core-1.12.425.jar
aws-java-sdk-kms-1.12.425.jar
aws-java-sdk-s3-1.12.425.jar
aws-java-sdk-core-1.12.646.jar
aws-java-sdk-kms-1.12.646.jar
aws-java-sdk-s3-1.12.646.jar
byte-buddy-1.11.13.jar
byte-buddy-agent-1.11.13.jar
caffeine-3.0.3.jar
Expand Down Expand Up @@ -121,7 +121,6 @@ Apache-2.0
hadoop-yarn-server-web-proxy-3.3.6.jar
httpclient-4.5.13.jar
httpcore-4.4.13.jar
ion-java-1.0.2.jar
ipaddress-5.3.3.jar
j2objc-annotations-2.8.jar
jPowerShell-3.0.jar
Expand Down Expand Up @@ -160,14 +159,14 @@ Apache-2.0
jetty-xml-9.4.53.v20231009.jar
jffi-1.2.16-native.jar
jffi-1.2.16.jar
jmespath-java-1.12.425.jar
jmespath-java-1.12.646.jar
jna-5.9.0.jar
jnr-constants-0.9.9.jar
jnr-ffi-2.1.7.jar
joda-time-2.8.1.jar
json-io-2.5.1.jar
json-path-2.8.0.jar
json-smart-2.4.10.jar
json-path-2.9.0.jar
json-smart-2.5.0.jar
jsr305-3.0.2.jar
kerb-admin-1.0.1.jar
kerb-client-1.0.1.jar
Expand Down Expand Up @@ -456,6 +455,7 @@ MIT
neo4j-1.17.6.jar
postgresql-1.17.6.jar
slf4j-api-1.7.36.jar
slf4j-api-2.0.11.jar
slf4j-log4j12-1.7.25.jar
slf4j-nop-1.7.30.jar
slf4j-reload4j-1.7.36.jar
Expand Down
2 changes: 1 addition & 1 deletion core-it/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
testImplementation project(':test-utils')
testImplementation project(':core').sourceSets.test.output

testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.425'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.646'
testImplementation group: 'org.xmlunit', name: 'xmlunit-core', version: '2.9.1'

configurations.all {
Expand Down
8 changes: 4 additions & 4 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {
apt group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective
implementation group: 'commons-codec', name: 'commons-codec', version: '1.14'
// when json-path is changed, it have to be changed in json-path-version version in antora.yml as well.
implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.8.0'
implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.9.0'
implementation group: 'org.hdrhistogram', name: 'HdrHistogram', version: '2.1.9'

// compileOnly "org.antlr:antlr4-runtime:4.7.2"
Expand All @@ -62,7 +62,7 @@ dependencies {

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

compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.425'
compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.646'

testImplementation group: 'org.reflections', name: 'reflections', version: '0.9.12'
testImplementation group: 'junit', name: 'junit', version: '4.13.1'
Expand Down Expand Up @@ -98,8 +98,8 @@ dependencies {
testImplementation 'org.mock-server:mockserver-netty:5.15.0'
testImplementation 'org.mock-server:mockserver-client-java:5.15.0'

compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.353' , withoutJacksons
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.353' , withoutJacksons
compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.646' , withoutJacksons
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.646' , withoutJacksons

implementation group: 'com.opencsv', name: 'opencsv', version: '5.7.1'
implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
Expand Down
4 changes: 2 additions & 2 deletions extra-dependencies/aws/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ jar {
}

dependencies {
implementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.425'
implementation group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: '1.12.425'
implementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.646'
implementation group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: '1.12.646'
}
2 changes: 1 addition & 1 deletion extra-dependencies/nlp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def withoutJacksons = {
}

dependencies {
implementation group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.353' , withoutJacksons
implementation group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.646' , withoutJacksons
implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: '2.14.0', withoutJacksons
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0'
}
Expand Down
2 changes: 1 addition & 1 deletion full-it/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
testImplementation project(':core').sourceSets.test.output
testImplementation project(':full').sourceSets.test.output

testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.425'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.646'
testImplementation group: 'org.xmlunit', name: 'xmlunit-core', version: '2.9.1'

configurations.all {
Expand Down
8 changes: 4 additions & 4 deletions full/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ dependencies {

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

compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.425'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.425'
compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.646'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.646'

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

Expand Down Expand Up @@ -134,8 +134,8 @@ dependencies {
testImplementation 'org.mock-server:mockserver-netty:5.15.0'
testImplementation 'org.mock-server:mockserver-client-java:5.15.0'

compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.353' , withoutJacksons
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.353' , withoutJacksons
compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.646' , withoutJacksons
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.646' , withoutJacksons

implementation group: 'com.opencsv', name: 'opencsv', version: '5.7.1'
implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,17 @@ class AWSProceduresAPIWithDummyClientTest {
val value = row1["value"] as Map<*, *>
val entities = value["entities"] as List<*>

assertThat(entities, hasItem(mapOf("beginOffset" to null, "endOffset" to null, "score" to 0.5F, "text" to "token-1-index-0-batch-0", "type" to "COMMERCIAL_ITEM")))
assertThat(entities, hasItem(mapOf("beginOffset" to null, "endOffset" to null, "score" to 0.7F, "text" to "token-2-index-0-batch-0", "type" to "ORGANIZATION")))
assertThat(entities, hasItem(mapOf("beginOffset" to null, "endOffset" to null, "score" to 0.5F, "text" to "token-1-index-0-batch-0", "type" to "COMMERCIAL_ITEM", "blockReferences" to null)))
assertThat(entities, hasItem(mapOf("beginOffset" to null, "endOffset" to null, "score" to 0.7F, "text" to "token-2-index-0-batch-0", "type" to "ORGANIZATION", "blockReferences" to null)))

assertTrue(it.hasNext())

val row2 = it.next()
val value2 = row2["value"] as Map<*, *>
val entities2 = value2["entities"] as List<*>

assertThat(entities2, hasItem(mapOf("beginOffset" to null, "endOffset" to null, "score" to 0.5F, "text" to "token-1-index-1-batch-0", "type" to "COMMERCIAL_ITEM")))
assertThat(entities2, hasItem(mapOf("beginOffset" to null, "endOffset" to null, "score" to 0.7F, "text" to "token-2-index-1-batch-0", "type" to "ORGANIZATION")))
assertThat(entities2, hasItem(mapOf("beginOffset" to null, "endOffset" to null, "score" to 0.5F, "text" to "token-1-index-1-batch-0", "type" to "COMMERCIAL_ITEM", "blockReferences" to null)))
assertThat(entities2, hasItem(mapOf("beginOffset" to null, "endOffset" to null, "score" to 0.7F, "text" to "token-2-index-1-batch-0", "type" to "ORGANIZATION", "blockReferences" to null)))
}
}

Expand All @@ -117,8 +117,8 @@ class AWSProceduresAPIWithDummyClientTest {
val allEntities = value.stream().flatMap { v -> ((v as Map<*, *>)["entities"] as List<*>).stream() }.collect(Collectors.toList())

// assert that we have entries from the 2nd batch
assertThat(allEntities, hasItem(mapOf("beginOffset" to null, "endOffset" to null, "score" to 0.5F, "text" to "token-1-index-0-batch-1", "type" to "COMMERCIAL_ITEM")))
assertThat(allEntities, hasItem(mapOf("beginOffset" to null, "endOffset" to null, "score" to 0.7F, "text" to "token-2-index-0-batch-1", "type" to "ORGANIZATION")))
assertThat(allEntities, hasItem(mapOf("beginOffset" to null, "endOffset" to null, "score" to 0.5F, "text" to "token-1-index-0-batch-1", "type" to "COMMERCIAL_ITEM", "blockReferences" to null)))
assertThat(allEntities, hasItem(mapOf("beginOffset" to null, "endOffset" to null, "score" to 0.7F, "text" to "token-2-index-0-batch-1", "type" to "ORGANIZATION", "blockReferences" to null)))
}
}

Expand Down
4 changes: 2 additions & 2 deletions full/src/test/kotlin/apoc/nlp/aws/AWSProceduresTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class AWSProceduresTest {

assertEquals(0L, transformedResults.value["index"])
val entities = transformedResults.value["entities"] as List<Map<String, Object>>
assertEquals(mapOf("text" to "foo", "type" to "bar", "score" to 2.0F, "beginOffset" to 0L, "endOffset" to 3L), entities[0])
assertEquals(mapOf("text" to "foo", "type" to "bar", "score" to 2.0F, "beginOffset" to 0L, "endOffset" to 3L, "blockReferences" to null), entities[0])
}

@Test
Expand Down Expand Up @@ -89,7 +89,7 @@ class AWSProceduresTest {

assertEquals(1L, result2.value["index"])
val entities = result2.value["entities"] as List<Map<String, Object>>
assertEquals(mapOf("text" to "foo", "type" to "bar", "score" to 2.0F, "beginOffset" to 0L, "endOffset" to 3L), entities[0])
assertEquals(mapOf("text" to "foo", "type" to "bar", "score" to 2.0F, "beginOffset" to 0L, "endOffset" to 3L, "blockReferences" to null), entities[0])
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion test-utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {

api group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: '4.4.9'
api group: 'org.jetbrains', name: 'annotations', version: "17.0.0"
api group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.425'
api group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.646'

api group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-csv', version: '2.14.0'

Expand Down

0 comments on commit 40d2fe7

Please sign in to comment.