diff --git a/LICENSES.txt b/LICENSES.txt index 125a90ddcc..87c81332f3 100644 --- a/LICENSES.txt +++ b/LICENSES.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/NOTICE.txt b/NOTICE.txt index ddeb867f07..086d74a15e 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/core-it/build.gradle b/core-it/build.gradle index 48b83c2105..7dea8359a4 100644 --- a/core-it/build.gradle +++ b/core-it/build.gradle @@ -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 { diff --git a/core/build.gradle b/core/build.gradle index f20e307dd5..77f0e65aac 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -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" @@ -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' @@ -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' diff --git a/extra-dependencies/aws/build.gradle b/extra-dependencies/aws/build.gradle index 002be6fe5d..c2f91a71cc 100644 --- a/extra-dependencies/aws/build.gradle +++ b/extra-dependencies/aws/build.gradle @@ -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' } diff --git a/extra-dependencies/nlp/build.gradle b/extra-dependencies/nlp/build.gradle index ef47462e6f..16b2f725e4 100644 --- a/extra-dependencies/nlp/build.gradle +++ b/extra-dependencies/nlp/build.gradle @@ -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' } diff --git a/full-it/build.gradle b/full-it/build.gradle index b7ca13312a..f24db475d9 100644 --- a/full-it/build.gradle +++ b/full-it/build.gradle @@ -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 { diff --git a/full/build.gradle b/full/build.gradle index 23a65d8561..6a9145878a 100644 --- a/full/build.gradle +++ b/full/build.gradle @@ -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' @@ -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' diff --git a/full/src/test/kotlin/apoc/nlp/aws/AWSProceduresAPIWithDummyClientTest.kt b/full/src/test/kotlin/apoc/nlp/aws/AWSProceduresAPIWithDummyClientTest.kt index f97ed36bed..a350c88999 100644 --- a/full/src/test/kotlin/apoc/nlp/aws/AWSProceduresAPIWithDummyClientTest.kt +++ b/full/src/test/kotlin/apoc/nlp/aws/AWSProceduresAPIWithDummyClientTest.kt @@ -80,8 +80,8 @@ 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()) @@ -89,8 +89,8 @@ class AWSProceduresAPIWithDummyClientTest { 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))) } } @@ -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))) } } diff --git a/full/src/test/kotlin/apoc/nlp/aws/AWSProceduresTest.kt b/full/src/test/kotlin/apoc/nlp/aws/AWSProceduresTest.kt index 5c6e744404..92904512e0 100644 --- a/full/src/test/kotlin/apoc/nlp/aws/AWSProceduresTest.kt +++ b/full/src/test/kotlin/apoc/nlp/aws/AWSProceduresTest.kt @@ -44,7 +44,7 @@ class AWSProceduresTest { assertEquals(0L, transformedResults.value["index"]) val entities = transformedResults.value["entities"] as List> - 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 @@ -89,7 +89,7 @@ class AWSProceduresTest { assertEquals(1L, result2.value["index"]) val entities = result2.value["entities"] as List> - 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 diff --git a/test-utils/build.gradle b/test-utils/build.gradle index ef2a6303a9..a515c8234a 100644 --- a/test-utils/build.gradle +++ b/test-utils/build.gradle @@ -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'