[NOID] Cherry picks from 5.3 (#3423)

* [NOID] Removed neo4jVersionOverride from apoc gradle version (#3398) * [NOID] Removed unnecessary bolt-dependencies (#3377) (#3380)
neo4j-contrib · Apr 28, 2023 · d6bfd18 · d6bfd18
1 parent 2b5e835
commit d6bfd18
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 351 deletions.
diff --git a/apoc-core b/apoc-core
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ downloadLicenses {
 
 allprojects {
     group = 'org.neo4j.procedure'
-    version = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : '5.5.0'
+    version = '5.5.0'
     archivesBaseName = 'apoc'
     description = """neo4j-apoc-procedures"""
 }

diff --git a/docs/asciidoc/modules/ROOT/pages/database-integration/bolt-neo4j.adoc b/docs/asciidoc/modules/ROOT/pages/database-integration/bolt-neo4j.adoc
@@ -74,15 +74,6 @@ In addition, the `apoc.bolt.load.fromLocal` can have:
 * `readOnly`: default false. To execute or not, read-only statements.  
 * `localParams`: to put optional parameters to local cypher statement
 
-== Install Dependencies
-
-The Bolt procedures have dependencies on a client library that is not included in the APOC Extended library.
-
-You can download it from https://repo1.maven.org/maven2/org/neo4j/driver/neo4j-java-driver-slim/4.4.5/neo4j-java-driver-slim-4.4.5.jar[mvnrepository]
-or https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-bolt-dependencies-{apoc-release}.jar[apoc repository].
-Once that file is downloaded, it should be placed in the `plugins` directory and the Neo4j Server restarted.
-
-
 
 == Driver configuration
 

diff --git a/docs/asciidoc/modules/ROOT/pages/database-integration/couchbase.adoc b/docs/asciidoc/modules/ROOT/pages/database-integration/couchbase.adoc
@@ -25,7 +25,7 @@ include::example$generated-documentation/apoc.couchbase.query.adoc[]
 (Tested with CB Enterprise 5.5.3)
 
 The Couchbase procedures have dependencies on a client library that is not included in the APOC Extended library.
-This dependency is included in https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-couchbase-dependencies-{apoc-release}.jar[apoc-couchbase-dependencies-{apoc-release}.jar^], which can be downloaded from the https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/tag/{apoc-release}[releases page^].
+This dependency is included in https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-couchbase-dependencies-{apoc-release}-all.jar[apoc-couchbase-dependencies-{apoc-release}-all.jar^], which can be downloaded from the https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/tag/{apoc-release}[releases page^].
 Once that file is downloaded, it should be placed in the `plugins` directory and the Neo4j Server restarted.
 
 

diff --git a/docs/asciidoc/modules/ROOT/pages/database-integration/redis.adoc b/docs/asciidoc/modules/ROOT/pages/database-integration/redis.adoc
@@ -45,7 +45,7 @@ Here is a list of all available Redis procedures:
 
 The Redis procedures have dependencies on a client library that is not included in the APOC Extended library.
 You can download it from https://github.com/lettuce-io/lettuce-core/releases/tag/6.1.1.RELEASE[the lettuce-core repository](except for `netty` jars because they are already included within neo4j)
-or https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-redis-dependencies-{apoc-release}.jar[apoc repository]
+or https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-redis-dependencies-{apoc-release}-all.jar[apoc repository]
 Once that file is downloaded, it should be placed in the `plugins` directory and the Neo4j Server restarted.
 
 [[redis-uri]]

diff --git a/docs/asciidoc/modules/ROOT/pages/import/web-apis.adoc b/docs/asciidoc/modules/ROOT/pages/import/web-apis.adoc
@@ -38,7 +38,7 @@ include::partial$s3-protocol.adoc[]
 == Using hdfs protocol
 
 To use the hdfs protocol we need to download and copy the additional jars not included in the APOC Extended library.
-We can download it from https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-redis-dependencies-{apoc-release}.jar[this link] or locally downloading the apoc repository:
+We can download it from https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-hadoop-dependencies-{apoc-release}-all.jar[this link] or locally downloading the apoc repository:
 ----
 git clone http://github.com/neo4j-contrib/neo4j-apoc-procedures
 cd neo4j-apoc-procedures/extra-dependencies

diff --git a/docs/asciidoc/modules/ROOT/partials/email-dependencies.adoc b/docs/asciidoc/modules/ROOT/partials/email-dependencies.adoc
@@ -1,4 +1,4 @@
 This procedure has a dependency on an email library that is not included in the APOC Extended library.
 
-The dependency is included in https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-email-dependencies-{apoc-release}.jar[apoc-email-dependencies-{apoc-release}.jar^], which can be downloaded from the https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/tag/{apoc-release}[releases page^].
+The dependency is included in https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-email-dependencies-{apoc-release}-all.jar[apoc-email-dependencies-{apoc-release}-all.jar^], which can be downloaded from the https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/tag/{apoc-release}[releases page^].
 Once that file is downloaded, it should be placed in the `plugins` directory and the Neo4j Server restarted.
diff --git a/docs/asciidoc/modules/ROOT/partials/html/runtime.adoc b/docs/asciidoc/modules/ROOT/partials/html/runtime.adoc
@@ -25,4 +25,4 @@ If we have a `test.html` file with a jQuery script like:
 
 we can read the generated js through the `browser` config.
 Note that to use the `browser` config (except with `"NONE"` value), you have to install additional dependencies
-which can be downloaded  https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-selenium-dependencies-{apoc-release}.jar[from this link].
+which can be downloaded  https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-selenium-dependencies-{apoc-release}-all.jar[from this link].
diff --git a/docs/asciidoc/modules/ROOT/partials/mongodb-dependencies.adoc b/docs/asciidoc/modules/ROOT/partials/mongodb-dependencies.adoc
@@ -1,6 +1,6 @@
 The Mongo procedures have dependencies on a client library that is not included in the APOC Extended library.
 
-This dependency is included in https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-mongodb-dependencies-{apoc-release}.jar[apoc-mongodb-dependencies-{apoc-release}.jar^], which can be downloaded from the https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/tag/{apoc-release}[releases page^].
+This dependency is included in https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-mongodb-dependencies-{apoc-release}-all.jar[apoc-mongodb-dependencies-{apoc-release}-all.jar^], which can be downloaded from the https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/tag/{apoc-release}[releases page^].
 Once that file is downloaded, it should be placed in the `plugins` directory and the Neo4j Server restarted.
 
 

diff --git a/docs/asciidoc/modules/ROOT/partials/nlp-dependencies.adoc b/docs/asciidoc/modules/ROOT/partials/nlp-dependencies.adoc
@@ -1,4 +1,4 @@
 The NLP procedures have dependencies on Kotlin and client libraries that are not included in the APOC Extended library.
 
-These dependencies are included in https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-nlp-dependencies-{apoc-release}.jar[apoc-nlp-dependencies-{apoc-release}.jar^], which can be downloaded from the https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/tag/{apoc-release}[releases page^].
+These dependencies are included in https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-nlp-dependencies-{apoc-release}-all.jar[apoc-nlp-dependencies-{apoc-release}-all.jar^], which can be downloaded from the https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/tag/{apoc-release}[releases page^].
 Once that file is downloaded, it should be placed in the `plugins` directory and the Neo4j Server restarted.
diff --git a/docs/asciidoc/modules/ROOT/partials/xls-dependencies.adoc b/docs/asciidoc/modules/ROOT/partials/xls-dependencies.adoc
@@ -1,7 +1,7 @@
 For loading XLS we're using the Apache POI library, which works well with old and new Excel formats, but is quite large.
 That's why we decided not to include it into the apoc jar, but make it an optional dependency.
 
-These dependencies are included in https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-xls-dependencies-{apoc-release}.jar[apoc-xls-dependencies-{apoc-release}.jar^], which can be downloaded from the https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/tag/{apoc-release}[releases page^].
+These dependencies are included in https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-xls-dependencies-{apoc-release}-all.jar[apoc-xls-dependencies-{apoc-release}-all.jar^], which can be downloaded from the https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/tag/{apoc-release}[releases page^].
 Once that file is downloaded, it should be placed in the `plugins` directory and the Neo4j Server restarted.
 
 Alternatively, you can download these jars from Maven Repository (putting them into `plugins` directory as well):

diff --git a/extra-dependencies/bolt/build.gradle b/extra-dependencies/bolt/build.gradle
diff --git a/extra-dependencies/bolt/gradle/wrapper/gradle-wrapper.jar b/extra-dependencies/bolt/gradle/wrapper/gradle-wrapper.jar
diff --git a/extra-dependencies/bolt/gradle/wrapper/gradle-wrapper.properties b/extra-dependencies/bolt/gradle/wrapper/gradle-wrapper.properties
diff --git a/extra-dependencies/bolt/gradlew b/extra-dependencies/bolt/gradlew
+1 −0		common/build.gradle
+17 −10		common/src/main/java/apoc/export/cypher/FileManagerFactory.java
+1 −1		core/src/main/java/apoc/export/json/JsonImporter.java
+13 −12		core/src/main/java/apoc/trigger/TriggerNewProcedures.java
+83 −37		core/src/test/java/apoc/export/csv/ExportCsvNeo4jAdminTest.java
+16 −0		core/src/test/java/apoc/export/csv/ExportCsvTest.java
+123 −25		core/src/test/java/apoc/meta/MetaTest.java
+34 −0		core/src/test/java/apoc/nodes/GroupingTest.java
+65 −0		core/src/test/java/apoc/trigger/TriggerNewProceduresTest.java
+2 −2		test-utils/src/main/java/apoc/periodic/PeriodicTestUtils.java
+20 −7		test-utils/src/main/java/apoc/util/s3/S3TestUtil.java