Skip to content

Commit 639c776

Browse files
omar952vga91
andauthored
Codeartifact fix (#4515)
* Codeartifact fix * bump kotlin version * Revert "bump kotlin version" This reverts commit 41b709d. * Revert "Revert "bump kotlin version"" This reverts commit 48d0c1f. * de-ignored startup test --------- Co-authored-by: vga91 <giuseppe.villani@larus-ba.it>
1 parent 4a57698 commit 639c776

File tree

5 files changed

+3
-7
lines changed

5 files changed

+3
-7
lines changed

.github/workflows/CI.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ jobs:
6262
NEO4J_DOCKER_CE_OVERRIDE="neo4j:$neo4j_version_base"
6363
NEO4J_DOCKER_EE_OVERRIDE="neo4j:$neo4j_version_base-enterprise"
6464
fi
65-
echo "CODEARTIFACT_DOWNLOAD_URL=$CODEARTIFACT_DOWNLOAD_URL" >> "$GITHUB_ENV"
6665
6766
echo "Found NEO4JVERSION=$NEO4JVERSION"
6867
echo "Found NEO4J_DOCKER_CE_OVERRIDE=$NEO4J_DOCKER_CE_OVERRIDE"
@@ -144,7 +143,6 @@ jobs:
144143
NEO4J_DOCKER_CE_OVERRIDE="neo4j:$neo4j_version_base"
145144
NEO4J_DOCKER_EE_OVERRIDE="neo4j:$neo4j_version_base-enterprise"
146145
fi
147-
echo "CODEARTIFACT_DOWNLOAD_URL=$CODEARTIFACT_DOWNLOAD_URL" >> "$GITHUB_ENV"
148146
149147
echo "Found NEO4JVERSION=$NEO4JVERSION"
150148
echo "Found NEO4J_DOCKER_CE_OVERRIDE=$NEO4J_DOCKER_CE_OVERRIDE"

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id 'maven-publish'
55
id 'antlr'
66
id "com.github.hierynomus.license-report" version"0.16.1"
7-
id "org.jetbrains.kotlin.jvm" version "1.9.20" apply false
7+
id "org.jetbrains.kotlin.jvm" version "2.1.10" apply false
88
}
99

1010
downloadLicenses {

extended-it/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'com.github.johnrengelman.shadow'
44
id 'maven-publish'
55
id 'antlr'
6-
id "org.jetbrains.kotlin.jvm" version "1.9.20"
6+
id "org.jetbrains.kotlin.jvm" version "2.1.10"
77
id "com.diffplug.spotless" version "6.7.2"
88
}
99

extended-it/src/test/java/apoc/neo4j/docker/StartupExtendedTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import apoc.util.TestContainerUtil.Neo4jVersion;
88
import apoc.util.TestUtil;
99
import org.apache.commons.io.FileUtils;
10-
import org.junit.Ignore;
1110
import org.junit.Test;
1211
import org.neo4j.driver.Session;
1312

@@ -40,7 +39,6 @@
4039
* so we need to set the environment variable `NEO4JVERSION=<correctVersion>`, e.g. `NEO4JVERSION=5.25.1`,
4140
* which is valued via {@link TestContainerUtil#executeGradleTasks(File, String...)} present in APOC Core and therefore not modifiable by APOC Extended
4241
*/
43-
@Ignore
4442
public class StartupExtendedTest {
4543
private static final String APOC_HELP_QUERY = "CALL apoc.help('') YIELD core, type, name WHERE core = $core and type = $type RETURN name";
4644
private static final List<String> EXPECTED_EXTENDED_NAMES_CYPHER_5;

extended/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id 'com.github.johnrengelman.shadow' version '7.1.0'
66
id 'maven-publish'
77
id 'antlr'
8-
id "org.jetbrains.kotlin.jvm" version "1.9.20"
8+
id "org.jetbrains.kotlin.jvm" version "2.1.10"
99
id "com.diffplug.spotless" version "6.22.0"
1010
}
1111

0 commit comments

Comments
 (0)