From 4f3ae7d1e481a69927a6afdfe860b8e7137269ea Mon Sep 17 00:00:00 2001 From: Gemma Lamont Date: Mon, 16 Dec 2024 15:55:57 +0100 Subject: [PATCH 1/2] Version bump --- build.gradle | 8 ++++---- readme.adoc | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 60750608e..1b916b09a 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ downloadLicenses { allprojects { group = 'org.neo4j.procedure' - version = System.getenv('APOC_VERSION') ? System.getenv('APOC_VERSION') : '2024.12.0' + version = System.getenv('APOC_VERSION') ? System.getenv('APOC_VERSION') : '2025.01.0' archivesBaseName = 'apoc' description = """neo4j-apoc-procedures""" } @@ -100,8 +100,8 @@ subprojects { // neo4jDockerImage system property is used in TestContainerUtil systemProperties 'user.language': 'en', 'user.country': 'US', - 'neo4jDockerImage': project.hasProperty("neo4jDockerEeOverride") ? project.getProperty("neo4jDockerEeOverride") : 'neo4j:2024.12.0-enterprise-debian', - 'neo4jCommunityDockerImage': project.hasProperty("neo4jDockerCeOverride") ? project.getProperty("neo4jDockerCeOverride") : 'neo4j:2024.12.0-debian', + 'neo4jDockerImage': project.hasProperty("neo4jDockerEeOverride") ? project.getProperty("neo4jDockerEeOverride") : 'neo4j:2025.01.0-enterprise-debian', + 'neo4jCommunityDockerImage': project.hasProperty("neo4jDockerCeOverride") ? project.getProperty("neo4jDockerCeOverride") : 'neo4j:2025.01.0-debian', 'coreDir': 'core', 'testDockerBundle': project.hasProperty("testDockerBundle"), 'org.neo4j.io.pagecache.tracing.cursor.DefaultPageCursorTracer.CHECK_REPORTED_COUNTERS': 'true' // Extra assertions in kernel @@ -170,7 +170,7 @@ apply from: "licenses-source-header.gradle" ext { publicDir = "${project.rootDir}" - neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : "2024.12.0" + neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : "2025.01.0" testContainersVersion = '1.20.2' apacheArrowVersion = '15.0.0' } diff --git a/readme.adoc b/readme.adoc index e93909ec9..230f6e2d6 100644 --- a/readme.adoc +++ b/readme.adoc @@ -1,8 +1,8 @@ :readme: -:branch: 2024.12.0 +:branch: 2025.01.0 :docs: https://neo4j.com/docs/apoc/current -:apoc-release: 2024.12.0 -:neo4j-version: 2024.12.0 +:apoc-release: 2025.01.0 +:neo4j-version: 2025.01.0 :img: https://raw.githubusercontent.com/neo4j/apoc/dev/images https://community.neo4j.com[image:https://img.shields.io/discourse/users?logo=discourse&server=https%3A%2F%2Fcommunity.neo4j.com[Discourse users]] From 581fb60984d7b6f3b89f5f9a6a9146e68030f043 Mon Sep 17 00:00:00 2001 From: Gemma Lamont Date: Tue, 17 Dec 2024 08:35:32 +0100 Subject: [PATCH 2/2] Fix broken test as well --- LICENSES.txt | 94 ++++++++++----------- NOTICE.txt | 94 ++++++++++----------- core/src/main/java/apoc/help/HelpUtil.java | 18 ++++ core/src/main/java/apoc/schema/Schemas.java | 17 +++- 4 files changed, 126 insertions(+), 97 deletions(-) diff --git a/LICENSES.txt b/LICENSES.txt index d48fefbb4..7e33fd625 100644 --- a/LICENSES.txt +++ b/LICENSES.txt @@ -12,11 +12,11 @@ Apache-2.0 aircompressor-0.27.jar annotations-17.0.0.jar annotations-4.1.1.4.jar - arrow-format-17.0.0.jar - arrow-memory-core-17.0.0.jar - arrow-memory-netty-17.0.0.jar - arrow-memory-netty-buffer-patch-17.0.0.jar - arrow-vector-17.0.0.jar + arrow-format-18.0.0.jar + arrow-memory-core-18.0.0.jar + arrow-memory-netty-18.0.0.jar + arrow-memory-netty-buffer-patch-18.0.0.jar + arrow-vector-18.0.0.jar assertj-core-3.26.3.jar audience-annotations-0.12.0.jar avro-1.9.2.jar @@ -24,8 +24,8 @@ Apache-2.0 aws-java-sdk-core-1.12.643.jar aws-java-sdk-kms-1.12.643.jar aws-java-sdk-s3-1.12.643.jar - byte-buddy-1.15.3.jar - byte-buddy-agent-1.15.3.jar + byte-buddy-1.15.4.jar + byte-buddy-agent-1.15.4.jar caffeine-3.1.8.jar cassandra-driver-core-3.10.0.jar commons-beanutils-1.9.4.jar @@ -55,20 +55,20 @@ Apache-2.0 error_prone_annotations-2.28.0.jar failureaccess-1.0.2.jar flatbuffers-java-24.3.25.jar - flight-core-17.0.0.jar + flight-core-18.0.0.jar fst-2.50.jar geronimo-jcache_1.0_spec-1.0-alpha-1.jar gradle-tooling-api-7.3.jar - grpc-api-1.68.0.jar - grpc-context-1.68.0.jar - grpc-core-1.68.0.jar - grpc-netty-1.68.0.jar - grpc-protobuf-1.68.0.jar - grpc-protobuf-lite-1.68.0.jar - grpc-stub-1.68.0.jar - grpc-util-1.68.0.jar + grpc-api-1.68.1.jar + grpc-context-1.68.1.jar + grpc-core-1.68.1.jar + grpc-netty-1.68.1.jar + grpc-protobuf-1.68.1.jar + grpc-protobuf-lite-1.68.1.jar + grpc-stub-1.68.1.jar + grpc-util-1.68.1.jar gson-2.11.0.jar - guava-33.2.1-jre.jar + guava-33.3.1-jre.jar guice-4.2.3.jar guice-servlet-4.2.3.jar hadoop-annotations-3.4.0.jar @@ -105,18 +105,19 @@ Apache-2.0 httpclient-4.5.13.jar httpcore-4.4.13.jar ipaddress-5.5.1.jar + j2objc-annotations-3.0.0.jar jPowerShell-3.0.jar jProcesses-1.6.5.jar - jackson-annotations-2.18.0.jar - jackson-core-2.18.0.jar - jackson-databind-2.18.0.jar - jackson-dataformat-cbor-2.18.0.jar - jackson-dataformat-csv-2.18.0.jar - jackson-datatype-jdk8-2.18.0.jar - jackson-datatype-jsr310-2.18.0.jar - jackson-jaxrs-base-2.18.0.jar - jackson-jaxrs-json-provider-2.18.0.jar - jackson-module-jaxb-annotations-2.18.0.jar + jackson-annotations-2.18.1.jar + jackson-core-2.18.1.jar + jackson-databind-2.18.1.jar + jackson-dataformat-cbor-2.18.1.jar + jackson-dataformat-csv-2.18.1.jar + jackson-datatype-jdk8-2.18.1.jar + jackson-datatype-jsr310-2.18.1.jar + jackson-jaxrs-base-2.18.1.jar + jackson-jaxrs-json-provider-2.18.1.jar + jackson-module-jaxb-annotations-2.18.1.jar jakarta.validation-api-2.0.2.jar javapoet-1.13.0.jar javassist-3.30.2-GA.jar @@ -195,7 +196,7 @@ Apache-2.0 netty-resolver-dns-classes-macos-4.1.101.Final.jar netty-resolver-dns-native-macos-4.1.101.Final-osx-aarch_64.jar netty-resolver-dns-native-macos-4.1.101.Final-osx-x86_64.jar - netty-tcnative-classes-2.0.66.Final.jar + netty-tcnative-classes-2.0.69.Final.jar netty-transport-4.1.101.Final.jar netty-transport-classes-epoll-4.1.101.Final.jar netty-transport-classes-kqueue-4.1.101.Final.jar @@ -222,7 +223,7 @@ Apache-2.0 perfmark-api-0.27.0.jar picocli-4.7.6.jar proto-google-common-protos-2.41.0.jar - reactor-core-3.6.10.jar + reactor-core-3.6.12.jar reload4j-1.2.22.jar scala-collection-contrib_2.13-0.3.0.jar scala-library-2.13.11.jar @@ -456,7 +457,7 @@ BSD-2-Clause jline-3.22.0.jar jsch-0.1.55.jar stax2-api-4.2.1.jar - zstd-jni-1.5.6-6.jar + zstd-jni-1.5.6-7.jar ------------------------------------------------------------------------------ Copyright @@ -609,8 +610,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------ BSD-3-Clause - protobuf-java-3.25.3.jar - protobuf-java-util-3.25.1.jar + protobuf-java-3.25.5.jar + protobuf-java-util-3.25.4.jar ------------------------------------------------------------------------------ Copyright (c) , @@ -2205,14 +2206,14 @@ Eclipse Public License - v 2.0 jersey-container-servlet-core-2.43.jar jersey-hk2-2.43.jar jersey-server-2.43.jar - junit-jupiter-5.11.2.jar - junit-jupiter-api-5.11.2.jar - junit-jupiter-engine-5.11.2.jar - junit-jupiter-params-5.11.2.jar - junit-platform-commons-1.11.2.jar - junit-platform-engine-1.11.2.jar - junit-platform-launcher-1.11.2.jar - junit-platform-testkit-1.11.2.jar + junit-jupiter-5.11.3.jar + junit-jupiter-api-5.11.3.jar + junit-jupiter-engine-5.11.3.jar + junit-jupiter-params-5.11.3.jar + junit-platform-commons-1.11.3.jar + junit-platform-engine-1.11.3.jar + junit-platform-launcher-1.11.3.jar + junit-platform-testkit-1.11.3.jar osgi-resource-locator-1.0.3.jar ------------------------------------------------------------------------------ @@ -2892,15 +2893,14 @@ and/or involve the use of third party software. ------------------------------------------------------------------------------ MIT - animal-sniffer-annotations-1.24.jar bcpkix-jdk15on-1.70.jar - bcpkix-jdk18on-1.78.1.jar + bcpkix-jdk18on-1.79.jar bcprov-jdk15on-1.70.jar - bcprov-jdk18on-1.78.1.jar + bcprov-jdk18on-1.79.jar bcutil-jdk15on-1.70.jar - bcutil-jdk18on-1.78.1.jar + bcutil-jdk18on-1.79.jar cassandra-1.20.2.jar - checker-qual-3.42.0.jar + checker-qual-3.43.0.jar couchbase-1.20.2.jar database-commons-1.20.2.jar duct-tape-1.0.8.jar @@ -2912,14 +2912,14 @@ MIT jersey-hk2-2.43.jar jnr-x86asm-1.0.2.jar localstack-1.20.2.jar - mockito-core-5.14.1.jar + mockito-core-5.14.2.jar mssql-jdbc-6.2.1.jre7.jar mysql-1.20.2.jar neo4j-1.20.2.jar postgresql-1.20.2.jar reactive-streams-1.0.4.jar slf4j-api-2.0.11.jar - slf4j-api-2.0.13.jar + slf4j-api-2.0.16.jar testcontainers-1.20.2.jar ------------------------------------------------------------------------------ diff --git a/NOTICE.txt b/NOTICE.txt index 0eefb72ec..4338e9585 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -42,11 +42,11 @@ Apache-2.0 aircompressor-0.27.jar annotations-17.0.0.jar annotations-4.1.1.4.jar - arrow-format-17.0.0.jar - arrow-memory-core-17.0.0.jar - arrow-memory-netty-17.0.0.jar - arrow-memory-netty-buffer-patch-17.0.0.jar - arrow-vector-17.0.0.jar + arrow-format-18.0.0.jar + arrow-memory-core-18.0.0.jar + arrow-memory-netty-18.0.0.jar + arrow-memory-netty-buffer-patch-18.0.0.jar + arrow-vector-18.0.0.jar assertj-core-3.26.3.jar audience-annotations-0.12.0.jar avro-1.9.2.jar @@ -54,8 +54,8 @@ Apache-2.0 aws-java-sdk-core-1.12.643.jar aws-java-sdk-kms-1.12.643.jar aws-java-sdk-s3-1.12.643.jar - byte-buddy-1.15.3.jar - byte-buddy-agent-1.15.3.jar + byte-buddy-1.15.4.jar + byte-buddy-agent-1.15.4.jar caffeine-3.1.8.jar cassandra-driver-core-3.10.0.jar commons-beanutils-1.9.4.jar @@ -85,20 +85,20 @@ Apache-2.0 error_prone_annotations-2.28.0.jar failureaccess-1.0.2.jar flatbuffers-java-24.3.25.jar - flight-core-17.0.0.jar + flight-core-18.0.0.jar fst-2.50.jar geronimo-jcache_1.0_spec-1.0-alpha-1.jar gradle-tooling-api-7.3.jar - grpc-api-1.68.0.jar - grpc-context-1.68.0.jar - grpc-core-1.68.0.jar - grpc-netty-1.68.0.jar - grpc-protobuf-1.68.0.jar - grpc-protobuf-lite-1.68.0.jar - grpc-stub-1.68.0.jar - grpc-util-1.68.0.jar + grpc-api-1.68.1.jar + grpc-context-1.68.1.jar + grpc-core-1.68.1.jar + grpc-netty-1.68.1.jar + grpc-protobuf-1.68.1.jar + grpc-protobuf-lite-1.68.1.jar + grpc-stub-1.68.1.jar + grpc-util-1.68.1.jar gson-2.11.0.jar - guava-33.2.1-jre.jar + guava-33.3.1-jre.jar guice-4.2.3.jar guice-servlet-4.2.3.jar hadoop-annotations-3.4.0.jar @@ -135,18 +135,19 @@ Apache-2.0 httpclient-4.5.13.jar httpcore-4.4.13.jar ipaddress-5.5.1.jar + j2objc-annotations-3.0.0.jar jPowerShell-3.0.jar jProcesses-1.6.5.jar - jackson-annotations-2.18.0.jar - jackson-core-2.18.0.jar - jackson-databind-2.18.0.jar - jackson-dataformat-cbor-2.18.0.jar - jackson-dataformat-csv-2.18.0.jar - jackson-datatype-jdk8-2.18.0.jar - jackson-datatype-jsr310-2.18.0.jar - jackson-jaxrs-base-2.18.0.jar - jackson-jaxrs-json-provider-2.18.0.jar - jackson-module-jaxb-annotations-2.18.0.jar + jackson-annotations-2.18.1.jar + jackson-core-2.18.1.jar + jackson-databind-2.18.1.jar + jackson-dataformat-cbor-2.18.1.jar + jackson-dataformat-csv-2.18.1.jar + jackson-datatype-jdk8-2.18.1.jar + jackson-datatype-jsr310-2.18.1.jar + jackson-jaxrs-base-2.18.1.jar + jackson-jaxrs-json-provider-2.18.1.jar + jackson-module-jaxb-annotations-2.18.1.jar jakarta.validation-api-2.0.2.jar javapoet-1.13.0.jar javassist-3.30.2-GA.jar @@ -225,7 +226,7 @@ Apache-2.0 netty-resolver-dns-classes-macos-4.1.101.Final.jar netty-resolver-dns-native-macos-4.1.101.Final-osx-aarch_64.jar netty-resolver-dns-native-macos-4.1.101.Final-osx-x86_64.jar - netty-tcnative-classes-2.0.66.Final.jar + netty-tcnative-classes-2.0.69.Final.jar netty-transport-4.1.101.Final.jar netty-transport-classes-epoll-4.1.101.Final.jar netty-transport-classes-kqueue-4.1.101.Final.jar @@ -252,7 +253,7 @@ Apache-2.0 perfmark-api-0.27.0.jar picocli-4.7.6.jar proto-google-common-protos-2.41.0.jar - reactor-core-3.6.10.jar + reactor-core-3.6.12.jar reload4j-1.2.22.jar scala-collection-contrib_2.13-0.3.0.jar scala-library-2.13.11.jar @@ -288,7 +289,7 @@ BSD-2-Clause jline-3.22.0.jar jsch-0.1.55.jar stax2-api-4.2.1.jar - zstd-jni-1.5.6-6.jar + zstd-jni-1.5.6-7.jar BSD-2-Clause dnsjava-3.4.0.jar @@ -310,8 +311,8 @@ BSD-3-Clause antlr4-runtime-4.13.2.jar BSD-3-Clause - protobuf-java-3.25.3.jar - protobuf-java-util-3.25.1.jar + protobuf-java-3.25.5.jar + protobuf-java-util-3.25.4.jar Common Development and Distribution License Version 1.1 codemodel-2.6.jar @@ -399,14 +400,14 @@ Eclipse Public License - v 2.0 jersey-container-servlet-core-2.43.jar jersey-hk2-2.43.jar jersey-server-2.43.jar - junit-jupiter-5.11.2.jar - junit-jupiter-api-5.11.2.jar - junit-jupiter-engine-5.11.2.jar - junit-jupiter-params-5.11.2.jar - junit-platform-commons-1.11.2.jar - junit-platform-engine-1.11.2.jar - junit-platform-launcher-1.11.2.jar - junit-platform-testkit-1.11.2.jar + junit-jupiter-5.11.3.jar + junit-jupiter-api-5.11.3.jar + junit-jupiter-engine-5.11.3.jar + junit-jupiter-params-5.11.3.jar + junit-platform-commons-1.11.3.jar + junit-platform-engine-1.11.3.jar + junit-platform-launcher-1.11.3.jar + junit-platform-testkit-1.11.3.jar osgi-resource-locator-1.0.3.jar GNU General Public License (GPL), version 2, with the Classpath exception @@ -451,15 +452,14 @@ LGPL-2.1-or-later jna-5.15.0.jar MIT - animal-sniffer-annotations-1.24.jar bcpkix-jdk15on-1.70.jar - bcpkix-jdk18on-1.78.1.jar + bcpkix-jdk18on-1.79.jar bcprov-jdk15on-1.70.jar - bcprov-jdk18on-1.78.1.jar + bcprov-jdk18on-1.79.jar bcutil-jdk15on-1.70.jar - bcutil-jdk18on-1.78.1.jar + bcutil-jdk18on-1.79.jar cassandra-1.20.2.jar - checker-qual-3.42.0.jar + checker-qual-3.43.0.jar couchbase-1.20.2.jar database-commons-1.20.2.jar duct-tape-1.0.8.jar @@ -471,14 +471,14 @@ MIT jersey-hk2-2.43.jar jnr-x86asm-1.0.2.jar localstack-1.20.2.jar - mockito-core-5.14.1.jar + mockito-core-5.14.2.jar mssql-jdbc-6.2.1.jre7.jar mysql-1.20.2.jar neo4j-1.20.2.jar postgresql-1.20.2.jar reactive-streams-1.0.4.jar slf4j-api-2.0.11.jar - slf4j-api-2.0.13.jar + slf4j-api-2.0.16.jar testcontainers-1.20.2.jar MPL 1.1 diff --git a/core/src/main/java/apoc/help/HelpUtil.java b/core/src/main/java/apoc/help/HelpUtil.java index 5dbba52fe..f6e2d6789 100644 --- a/core/src/main/java/apoc/help/HelpUtil.java +++ b/core/src/main/java/apoc/help/HelpUtil.java @@ -1,3 +1,21 @@ +/* + * Copyright (c) "Neo4j" + * Neo4j Sweden AB [http://neo4j.com] + * + * This file is part of Neo4j. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package apoc.help; import java.util.Set; diff --git a/core/src/main/java/apoc/schema/Schemas.java b/core/src/main/java/apoc/schema/Schemas.java index cf2fd53af..2b3529dbd 100644 --- a/core/src/main/java/apoc/schema/Schemas.java +++ b/core/src/main/java/apoc/schema/Schemas.java @@ -657,9 +657,20 @@ private IndexConstraintNodeInfo nodeInfoFromConstraintDefinition( 0, 0, 0, - ktx.schemaRead() - .constraintGetForName(constraintDefinition.getName()) - .userDescription(tokens)); + nodeConstraintCypher5Compatibility( + ktx.schemaRead() + .constraintGetForName(constraintDefinition.getName()) + .userDescription(tokens), + useStoredName)); + } + + private String nodeConstraintCypher5Compatibility(String userDescription, Boolean useStoredName) { + if (useStoredName) { + return userDescription; + } else { + // Revert to old description on Cypher 5 for backwards compatibility. + return userDescription.replace("'NODE PROPERTY UNIQUENESS'", "'UNIQUENESS'"); + } } /**