Update to latest driver, fix bundle builds.

neo4j · Feb 27, 2025 · a4f9517 · a4f9517
1 parent c5cffdc
commit a4f9517
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 20 deletions.
diff --git a/bundles/neo4j-jdbc-bundle/pom.xml b/bundles/neo4j-jdbc-bundle/pom.xml
@@ -103,18 +103,15 @@
 						<configuration>
 							<artifactSet>
 								<includes>
-									<include>org.neo4j:neo4j-jdbc:*</include>
-									<include>org.neo4j:neo4j-jdbc-translator-spi:*</include>
-									<include>org.neo4j:neo4j-cypher-dsl-schema-name-support</include>
 									<include>io.github.cdimascio:dotenv-java</include>
 									<include>io.netty:*</include>
+									<include>org.neo4j.driver:*</include>
+									<include>org.neo4j:neo4j-cypher-dsl-schema-name-support</include>
+									<include>org.neo4j:neo4j-jdbc-translator-spi:*</include>
+									<include>org.neo4j:neo4j-jdbc:*</include>
 								</includes>
 							</artifactSet>
 							<relocations>
-								<relocation>
-									<pattern>org.neo4j.cypherdsl.support.schema_name</pattern>
-									<shadedPattern>org.neo4j.jdbc.internal.shaded.schema_name</shadedPattern>
-								</relocation>
 								<relocation>
 									<pattern>io.github.cdimascio.dotenv</pattern>
 									<shadedPattern>org.neo4j.jdbc.internal.shaded.dotenv</shadedPattern>
@@ -123,6 +120,14 @@
 									<pattern>io.netty</pattern>
 									<shadedPattern>org.neo4j.jdbc.internal.shaded.io.netty</shadedPattern>
 								</relocation>
+								<relocation>
+									<pattern>org.neo4j.driver.internal.bolt</pattern>
+									<shadedPattern>org.neo4j.jdbc.internal.shaded.bolt</shadedPattern>
+								</relocation>
+								<relocation>
+									<pattern>org.neo4j.cypherdsl.support.schema_name</pattern>
+									<shadedPattern>org.neo4j.jdbc.internal.shaded.schema_name</shadedPattern>
+								</relocation>
 							</relocations>
 							<transformers>
 								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
@@ -142,10 +147,18 @@
 										<exclude>META-INF/MANIFEST.MF</exclude>
 										<exclude>META-INF/io.netty.versions.properties</exclude>
 										<exclude>services/reactor.blockhound.integration.BlockHoundIntegration</exclude>
+										<exclude>META-INF/**/module-info.class</exclude>
 									</excludes>
 								</filter>
 								<filter>
-									<artifact>org.neo4j:neo4j-jdbc</artifact>
+									<artifact>org.neo4j.driver:*</artifact>
+									<excludes>
+										<exclude>META-INF/MANIFEST.MF</exclude>
+										<exclude>module-info.class</exclude>
+									</excludes>
+								</filter>
+								<filter>
+									<artifact>org.neo4j:neo4j-cypher-dsl-schema-name-support</artifact>
 									<excludes>
 										<exclude>META-INF/MANIFEST.MF</exclude>
 										<exclude>module-info.class</exclude>
@@ -159,7 +172,7 @@
 									</excludes>
 								</filter>
 								<filter>
-									<artifact>org.neo4j:neo4j-cypher-dsl-schema-name-support</artifact>
+									<artifact>org.neo4j:neo4j-jdbc</artifact>
 									<excludes>
 										<exclude>META-INF/MANIFEST.MF</exclude>
 										<exclude>module-info.class</exclude>

diff --git a/bundles/neo4j-jdbc-full-bundle/pom.xml b/bundles/neo4j-jdbc-full-bundle/pom.xml
@@ -127,11 +127,12 @@
 									<include>io.netty:*</include>
 									<include>io.r2dbc:*</include>
 									<include>org.jooq:*</include>
-									<include>org.neo4j:neo4j-jdbc:*</include>
+									<include>org.neo4j.driver:*</include>
+									<include>org.neo4j:neo4j-cypher-dsl</include>
+									<include>org.neo4j:neo4j-cypher-dsl-schema-name-support</include>
 									<include>org.neo4j:neo4j-jdbc-translator-spi:*</include>
 									<include>org.neo4j:neo4j-jdbc-translator-impl:*</include>
-									<include>org.neo4j:neo4j-cypher-dsl-schema-name-support</include>
-									<include>org.neo4j:neo4j-cypher-dsl</include>
+									<include>org.neo4j:neo4j-jdbc:*</include>
 									<include>org.reactivestreams:*</include>
 								</includes>
 							</artifactSet>
@@ -152,6 +153,10 @@
 									<pattern>org.jooq</pattern>
 									<shadedPattern>org.neo4j.jdbc.internal.shaded.jooq</shadedPattern>
 								</relocation>
+								<relocation>
+									<pattern>org.neo4j.driver.internal.bolt</pattern>
+									<shadedPattern>org.neo4j.jdbc.internal.shaded.bolt</shadedPattern>
+								</relocation>
 								<relocation>
 									<pattern>org.neo4j.cypherdsl.core</pattern>
 									<shadedPattern>org.neo4j.jdbc.internal.shaded.cypherdsl</shadedPattern>
@@ -183,6 +188,7 @@
 										<exclude>META-INF/MANIFEST.MF</exclude>
 										<exclude>META-INF/io.netty.versions.properties</exclude>
 										<exclude>services/reactor.blockhound.integration.BlockHoundIntegration</exclude>
+										<exclude>META-INF/**/module-info.class</exclude>
 									</excludes>
 								</filter>
 								<filter>
@@ -192,14 +198,15 @@
 									</excludes>
 								</filter>
 								<filter>
-									<artifact>org.neo4j:neo4j-jdbc</artifact>
+									<artifact>org.jooq:*</artifact>
 									<excludes>
 										<exclude>META-INF/MANIFEST.MF</exclude>
 										<exclude>module-info.class</exclude>
+										<exclude>migrations/*</exclude>
 									</excludes>
 								</filter>
 								<filter>
-									<artifact>org.neo4j:neo4j-jdbc-translator-*</artifact>
+									<artifact>org.neo4j.driver:*</artifact>
 									<excludes>
 										<exclude>META-INF/MANIFEST.MF</exclude>
 										<exclude>module-info.class</exclude>
@@ -213,11 +220,17 @@
 									</excludes>
 								</filter>
 								<filter>
-									<artifact>org.jooq:*</artifact>
+									<artifact>org.neo4j:neo4j-jdbc-translator-*</artifact>
+									<excludes>
+										<exclude>META-INF/MANIFEST.MF</exclude>
+										<exclude>module-info.class</exclude>
+									</excludes>
+								</filter>
+								<filter>
+									<artifact>org.neo4j:neo4j-jdbc</artifact>
 									<excludes>
 										<exclude>META-INF/MANIFEST.MF</exclude>
 										<exclude>module-info.class</exclude>
-										<exclude>migrations/*</exclude>
 									</excludes>
 								</filter>
 								<filter>

diff --git a/neo4j-jdbc/pom.xml b/neo4j-jdbc/pom.xml
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>org.neo4j.driver</groupId>
 			<artifactId>neo4j-bolt-api-netty</artifactId>
-			<version>5.27-SNAPSHOT</version>
+			<version>${neo4j-bolt-connection.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.stefanbirkner</groupId>

diff --git a/neo4j-jdbc/src/main/java/module-info.java b/neo4j-jdbc/src/main/java/module-info.java
@@ -23,9 +23,6 @@
 module org.neo4j.jdbc {
 	requires transitive java.sql;
 
-	requires org.neo4j.bolt.api;
-	requires org.neo4j.bolt.netty;
-
 	// start::shaded-dependencies
 	requires io.github.cdimascio.dotenv.java;
 	requires io.netty.buffer;
@@ -34,6 +31,8 @@
 	requires io.netty.handler;
 	requires io.netty.resolver;
 	requires io.netty.transport;
+	requires org.neo4j.bolt.api;
+	requires org.neo4j.bolt.netty;
 	requires org.neo4j.jdbc.translator.spi;
 	requires org.neo4j.cypherdsl.support.schema_name;
 	// end::shaded-dependencies

diff --git a/pom.xml b/pom.xml
@@ -178,6 +178,7 @@
 		<mockito.version>5.15.2</mockito.version>
 		<moditect-maven-plugin.version>1.2.2.Final</moditect-maven-plugin.version>
 		<native-maven-plugin.version>0.10.4</native-maven-plugin.version>
+		<neo4j-bolt-connection.version>5.28-SNAPSHOT</neo4j-bolt-connection.version>
 		<neo4j-cypher-dsl.version>2024.4.0</neo4j-cypher-dsl.version>
 		<neo4j-jdbc.previous.version>6.1.1</neo4j-jdbc.previous.version>
 		<neo4j.image>neo4j:${neo4j.version}</neo4j.image>