Skip to content

Commit

Permalink
[NOID] Cherry picks from 5.3 (#3423)
Browse files Browse the repository at this point in the history
* [NOID] Removed neo4jVersionOverride from apoc gradle version (#3398)

* [NOID] Removed unnecessary bolt-dependencies (#3377) (#3380)
  • Loading branch information
vga91 committed Apr 28, 2023
1 parent 2b5e835 commit d6bfd18
Show file tree
Hide file tree
Showing 18 changed files with 10 additions and 351 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"""
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
2 changes: 1 addition & 1 deletion docs/asciidoc/modules/ROOT/pages/import/web-apis.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion docs/asciidoc/modules/ROOT/partials/html/runtime.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Original file line number Diff line number Diff line change
@@ -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.


Expand Down
2 changes: 1 addition & 1 deletion docs/asciidoc/modules/ROOT/partials/nlp-dependencies.adoc
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion docs/asciidoc/modules/ROOT/partials/xls-dependencies.adoc
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
25 changes: 0 additions & 25 deletions extra-dependencies/bolt/build.gradle

This file was deleted.

Binary file not shown.

This file was deleted.

183 changes: 0 additions & 183 deletions extra-dependencies/bolt/gradlew

This file was deleted.

Loading

0 comments on commit d6bfd18

Please sign in to comment.