Fix CI errors for 2026.02.0 release (#4530)

vga91 · web-flow · commit db7d72e7fb45 · 2026-03-10T13:07:38.000+01:00
* added missing gradle's ext variables

* changed neo4j version with current and correct one

* added org.neo4j.test.rule package to solve ImpermanentDbmsRule compile error

* Fix cannot find symbol matchesRegex compile error

* solve cannot find symbol getEndpointConfiguration() compile error

* excluded jupiter and added manually junit 4

* restored jupiter deps

* Created S3BaseTest with Before/AfterClass

* Fix sdk.services.s3.model.InvalidRequestException error

* add disableBinaryChecksumValidation

* Fix sdk.services.s3.model.InvalidRequestException error - part 2

* fix GexfTest with string comparison

* fix cassandra jdbc error

* cleanup

* Fix kotlin.jvm error during build with IntelliJ
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'maven-publish'
     id 'antlr'
     id "com.github.hierynomus.license-report" version"0.16.1"
-    id "org.jetbrains.kotlin.jvm" version "2.1.10" apply false
+    id "org.jetbrains.kotlin.jvm" version "2.1.0" apply false
 }
 
 downloadLicenses {
@@ -157,9 +157,11 @@ subprojects {
 
 ext {
     // NB: due to version.json generation by parsing this file, the next line must not have any if/then/else logic
-    neo4jVersion = "2026.02.1"
+    neo4jVersion = "2026.02.2"
     // instead we apply the override logic here
     neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion
     testContainersVersion = '2.0.2'
     apacheArrowVersion = '15.0.0'
+    guavaVersion = '33.5.0-jre'
+    awsSdkVersion = '2.34.0'
 }
diff --git a/extended-it/build.gradle b/extended-it/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'com.github.johnrengelman.shadow'
     id 'maven-publish'
     id 'antlr'
-    id "org.jetbrains.kotlin.jvm" version "2.1.10"
+    id "org.jetbrains.kotlin.jvm" version "2.1.0"
     id "com.diffplug.spotless" version "6.7.2"
 }
 
@@ -65,6 +65,8 @@ dependencies {
         exclude group: 'org.slf4j', module: 'slf4j-nop'
         exclude group: 'ch.qos.logback', module: 'logback-classic'
     }
+    testImplementation 'junit:junit:4.13.2'
+    implementation group: 'software.amazon.awssdk', name: 's3', version: awsSdkVersion
 }
 
 tasks.register('copyApocCoreJar', Copy) {
diff --git a/extended-it/src/test/java/apoc/azure/ArrowAzureStorageTest.java b/extended-it/src/test/java/apoc/azure/ArrowAzureStorageTest.java
@@ -1,7 +1,6 @@
 package apoc.azure;
 
 import apoc.export.arrow.ArrowTestUtil;
-import apoc.util.s3.S3BaseTest;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
diff --git a/extended-it/src/test/java/apoc/azure/LoadAzureStorageTest.java b/extended-it/src/test/java/apoc/azure/LoadAzureStorageTest.java
@@ -27,7 +27,6 @@
 import static apoc.util.ExtendedITUtil.testLoadXmlCommon;
 import static apoc.util.MapUtil.map;
 import static apoc.util.TestUtil.singleResultFirstColumn;
-import static apoc.util.s3.S3Util.putToS3AndGetUrl;
 import static org.junit.Assert.assertEquals;
 
 
diff --git a/extended-it/src/test/java/apoc/gc/ArrowGoogleCloudStorageTest.java b/extended-it/src/test/java/apoc/gc/ArrowGoogleCloudStorageTest.java
@@ -2,7 +2,6 @@
 
 import apoc.export.arrow.ArrowTestUtil;
 import apoc.util.GoogleCloudStorageContainerExtension;
-import apoc.util.s3.S3BaseTest;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
diff --git a/extended-it/src/test/java/apoc/s3/ArrowS3Test.java b/extended-it/src/test/java/apoc/s3/ArrowS3Test.java
@@ -1,7 +1,6 @@
 package apoc.s3;
 
 import apoc.export.arrow.ArrowTestUtil;
-import apoc.util.s3.S3BaseTest;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/extended-it/src/test/java/apoc/s3/ExtendedS3Container.java b/extended-it/src/test/java/apoc/s3/ExtendedS3Container.java
@@ -0,0 +1,78 @@
+package apoc.s3;
+
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
+
+import apoc.util.Util;
+import java.io.File;
+import java.net.URI;
+import org.testcontainers.containers.localstack.LocalStackContainer;
+import org.testcontainers.utility.DockerImageName;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+
+public class ExtendedS3Container implements AutoCloseable {
+    private static final String S3_BUCKET_NAME = "test-bucket";
+    private final LocalStackContainer localstack;
+    private final S3Client s3;
+
+    public ExtendedS3Container() {
+        localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:1.2.0")).withServices(S3);
+        localstack.addExposedPorts(4566);
+        localstack.start();
+
+        s3 = S3Client.builder()
+                .endpointOverride(localstack.getEndpoint())
+                .region(Region.of(localstack.getRegion()))
+                .credentialsProvider(getCredentialsProvider())
+                .forcePathStyle(true)
+                .serviceConfiguration(sc -> sc.checksumValidationEnabled(false))
+                .build();
+        s3.createBucket(CreateBucketRequest.builder().bucket(S3_BUCKET_NAME).build());
+    }
+
+    public void close() {
+        Util.close(localstack);
+    }
+
+    public URI getEndpoint() {
+        return localstack.getEndpoint();
+    }
+
+    public String getRegion() {
+        return localstack.getRegion();
+    }
+
+    public StaticCredentialsProvider getCredentialsProvider() {
+        return StaticCredentialsProvider.create(
+                AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey()));
+    }
+
+    public String getUrl(String key) {
+        AwsCredentials credentials = getCredentialsProvider().resolveCredentials();
+        return String.format(
+                "s3://%s.%s/%s/%s?accessKey=%s&secretKey=%s",
+                getRegion(),
+                getEndpoint().toString().replace("http://", ""),
+                S3_BUCKET_NAME,
+                key,
+                credentials.accessKeyId(),
+                credentials.secretAccessKey());
+    }
+
+    @SuppressWarnings("unused") // used from extended
+    public String putFile(String fileName) {
+        final File file = new File(fileName);
+        s3.putObject(
+                PutObjectRequest.builder()
+                        .bucket(S3_BUCKET_NAME)
+                        .key(file.getName())
+                        .build(),
+                file.toPath());
+        return getUrl(file.getName());
+    }
+}
diff --git a/extended-it/src/test/java/apoc/s3/ImportS3Test.java b/extended-it/src/test/java/apoc/s3/ImportS3Test.java
@@ -2,7 +2,6 @@
 
 import apoc.load.Gexf;
 import apoc.util.TestUtil;
-import apoc.util.s3.S3BaseTest;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
@@ -22,7 +21,7 @@
 import static apoc.export.arrow.ArrowTestUtil.testImportCommon;
 import static apoc.util.ExtendedITUtil.EXTENDED_RESOURCES_PATH;
 import static apoc.util.GexfTestUtil.testImportGexfCommon;
-import static apoc.util.s3.S3Util.putToS3AndGetUrl;
+import static apoc.s3.S3Util.putToS3AndGetUrl;
 
 public class ImportS3Test extends S3BaseTest {
     private static File directory = new File(ARROW_BASE_FOLDER);
diff --git a/extended-it/src/test/java/apoc/s3/LoadS3Test.java b/extended-it/src/test/java/apoc/s3/LoadS3Test.java
@@ -4,7 +4,6 @@
 import apoc.load.partial.LoadPartial;
 import apoc.load.xls.LoadXls;
 import apoc.util.TestUtil;
-import apoc.util.s3.S3BaseTest;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -25,10 +24,8 @@
 import static apoc.util.ExtendedITUtil.testLoadXmlCommon;
 import static apoc.util.MapUtil.map;
 import static apoc.util.TestUtil.singleResultFirstColumn;
-import static apoc.util.TestUtil.testResult;
-import static apoc.util.s3.S3Util.putToS3AndGetUrl;
+import static apoc.s3.S3Util.putToS3AndGetUrl;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 
 public class LoadS3Test extends S3BaseTest {
 
diff --git a/extended-it/src/test/java/apoc/s3/ParquetS3Test.java b/extended-it/src/test/java/apoc/s3/ParquetS3Test.java
@@ -2,7 +2,6 @@
 
 import apoc.export.parquet.ParquetTestUtil;
 import apoc.util.collection.Iterators;
-import apoc.util.s3.S3BaseTest;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -19,7 +18,7 @@
 import static apoc.export.parquet.ParquetTestUtil.beforeCommon;
 import static apoc.util.TestUtil.testCall;
 import static apoc.util.TestUtil.testResult;
-import static apoc.util.s3.S3Util.putToS3AndGetUrl;
+import static apoc.s3.S3Util.putToS3AndGetUrl;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/extended-it/src/test/java/apoc/s3/S3BaseTest.java b/extended-it/src/test/java/apoc/s3/S3BaseTest.java
@@ -0,0 +1,29 @@
+package apoc.s3;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+public abstract class S3BaseTest {
+    protected static ExtendedS3Container s3Container;
+
+    @BeforeClass
+    public static void baseBeforeClass() {
+        s3Container = new ExtendedS3Container();
+
+        // In test environment we skip the MD5 validation that can cause issues
+        System.setProperty("com.amazonaws.services.s3.disableGetObjectMD5Validation", "true");
+
+        // Used by S3ParamsExtractor to prepend http:// to endpoints for local testing
+        System.setProperty("com.amazonaws.sdk.disableCertChecking", "true");
+
+        // Disable checksum validation
+        System.setProperty("software.amazon.awssdk.sdk.disableBinaryChecksumValidation", "true");
+    }
+
+    @AfterClass
+    public static void tearDown() {
+        System.clearProperty("com.amazonaws.sdk.disableCertChecking");
+
+        s3Container.close();
+    }
+}
diff --git a/extended-it/src/test/java/apoc/s3/S3Util.java b/extended-it/src/test/java/apoc/s3/S3Util.java
@@ -0,0 +1,15 @@
+package apoc.s3;
+
+import java.net.URI;
+
+public class S3Util {
+    public static String removeRegionFromUrl(ExtendedS3Container s3Container, String url) {
+        URI endpoint = s3Container.getEndpoint();
+        return url.replace(endpoint + ".", "");
+    }
+
+    public static String putToS3AndGetUrl(ExtendedS3Container s3Container, String filename) {
+        String url = s3Container.putFile(filename);
+        return removeRegionFromUrl(s3Container, url);
+    }
+}
diff --git a/extended/build.gradle b/extended/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '7.1.0'
     id 'maven-publish'
     id 'antlr'
-    id "org.jetbrains.kotlin.jvm" version "2.1.10"
+    id "org.jetbrains.kotlin.jvm" version "2.1.0"
     id "com.diffplug.spotless" version "6.22.0"
 }
 
@@ -179,6 +179,7 @@ dependencies {
     testImplementation group: 'org.testcontainers', name: 'testcontainers-kafka', version: testContainersVersion
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"
     testImplementation group: 'org.duckdb', name: 'duckdb_jdbc', version: '1.1.3'
+    testImplementation 'junit:junit:4.13.2'
 
     configurations.all {
         exclude group: 'org.slf4j', module: 'slf4j-nop'
diff --git a/extended/src/test/java/apoc/load/GexfTest.java b/extended/src/test/java/apoc/load/GexfTest.java
@@ -15,6 +15,7 @@
 import static apoc.ApocConfig.APOC_IMPORT_FILE_ENABLED;
 import static apoc.ApocConfig.APOC_IMPORT_FILE_USE_NEO4J_CONFIG;
 import static apoc.ApocConfig.apocConfig;
+import static apoc.util.ExtendedTestUtil.assertMapEquals;
 import static apoc.util.ExtendedTestUtil.assertRelationship;
 import static apoc.util.GexfTestUtil.testImportGexfCommon;
 import static apoc.util.MapUtil.map;
@@ -41,15 +42,50 @@ public void tearDown() {
 
     @Test
     public void testLoadGexf() {
+        Map<String, Object> expected = map(
+            "_type", "gexf",
+            "version", "1.2",
+            "_children", List.of(
+                map(
+                    "_type", "graph",
+                    "defaultedgetype", "directed",
+                    "_children", List.of(
+                        map(
+                            "_type", "nodes",
+                            "_children", List.of(
+                                map(
+                                    "_type", "node",
+                                    "id", "0",     // Nota: potrebbe essere Integer 0 a seconda del parser
+                                    "label", "bar",
+                                    "_children", List.of(
+                                        map(
+                                            "_type", "attvalues",
+                                            "_children", List.of(
+                                                map(
+                                                    "_type", "attvalue",
+                                                    "for", "0",
+                                                    "value", "http://gephi.org"
+                                                )
+                                            )
+                                        )
+                                    )
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+        );
+        
+        
         final String file = ClassLoader.getSystemResource("gexf/single-node.gexf").toString();
         testCall(
                 db,
                 "CALL apoc.load.gexf($file)",
                 Map.of("file", file),
                 (row) -> {
                     Map<String, Object> value = (Map) row.get("value");
-                    String expected = "{_type=gexf, _children=[{_type=graph, defaultedgetype=directed, _children=[{_type=nodes, _children=[{_type=node, _children=[{_type=attvalues, _children=[{_type=attvalue, for=0, value=http://gephi.org}]}], id=0, label=bar}]}]}], version=1.2}";
-                    assertEquals(expected, value.toString());
+                    assertMapEquals(expected, value);
                 });
     }
 
diff --git a/extended/src/test/java/apoc/load/jdbc/CassandraJdbcTest.java b/extended/src/test/java/apoc/load/jdbc/CassandraJdbcTest.java
@@ -2,8 +2,6 @@
 
 import apoc.util.TestUtil;
 import apoc.util.Util;
-import org.hamcrest.Matchers;
-import org.hamcrest.collection.IsMapContaining;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -17,7 +15,6 @@
 
 import static apoc.util.TestUtil.testCall;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 public class CassandraJdbcTest extends AbstractJdbcTest {
 
@@ -71,11 +68,9 @@ public void testLoadJdbcUpdate() throws Exception {
                 ),
                 (r) -> {
                     Map<String, Object> row = (Map<String, Object>) r.get("row");
-                    assertThat(row, Matchers.allOf(
-                            IsMapContaining.hasEntry("NAME", "John") ,
-                            IsMapContaining.hasEntry("SURNAME", "DOE"), // FIXME: it seems that cassandra is not updated via first statment in this method
-                            IsMapContaining.hasEntry("EFFECTIVE_FROM_DATE", (Object)effectiveFromDate.toLocalDateTime())
-                            ));
+                    assertEquals("John", row.get("NAME"));
+                    assertEquals("DOE", row.get("SURNAME"));
+                    assertEquals(effectiveFromDate.toLocalDateTime(), row.get("EFFECTIVE_FROM_DATE"));
                 });
     }
 
diff --git a/extended/src/test/java/apoc/util/s3/S3Util.java b/extended/src/test/java/apoc/util/s3/S3Util.java
diff --git a/extended/src/test/java/apoc/uuid/UUIDTestUtils.java b/extended/src/test/java/apoc/uuid/UUIDTestUtils.java
diff --git a/extended/src/test/java/org/neo4j/test/rule/DbmsRule.java b/extended/src/test/java/org/neo4j/test/rule/DbmsRule.java
diff --git a/extended/src/test/java/org/neo4j/test/rule/ExternalResource.java b/extended/src/test/java/org/neo4j/test/rule/ExternalResource.java
diff --git a/extended/src/test/java/org/neo4j/test/rule/ImpermanentDbmsRule.java b/extended/src/test/java/org/neo4j/test/rule/ImpermanentDbmsRule.java

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ plugins {`
`3`	`3`	`id 'com.github.johnrengelman.shadow'`
`4`	`4`	`id 'maven-publish'`
`5`	`5`	`id 'antlr'`
`6`		`- id "org.jetbrains.kotlin.jvm" version "2.1.10"`
	`6`	`+ id "org.jetbrains.kotlin.jvm" version "2.1.0"`
`7`	`7`	`id "com.diffplug.spotless" version "6.7.2"`
`8`	`8`	`}`
`9`	`9`
`@@ -65,6 +65,8 @@ dependencies {`
`65`	`65`	`exclude group: 'org.slf4j', module: 'slf4j-nop'`
`66`	`66`	`exclude group: 'ch.qos.logback', module: 'logback-classic'`
`67`	`67`	`}`
	`68`	`+ testImplementation 'junit:junit:4.13.2'`
	`69`	`+ implementation group: 'software.amazon.awssdk', name: 's3', version: awsSdkVersion`
`68`	`70`	`}`
`69`	`71`
`70`	`72`	`tasks.register('copyApocCoreJar', Copy) {`