Update to Spring Data Commons 3.0.0 and JDK 17.

- Adapt to javax -> jakarta changes
- Throw out jboss weld dependencies and just use open beans
- Upgrade to latest jQAssistant version that can deal with JDK 17 byte code but disable it as it can't fork a vm for the embedded database which would require a couple of `--add-opens` which we won't have on by default and document that accordingly
- Use `maven.compiler.release`

Author: michael-simons

pom.xml

@@ -19,12 +19,12 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-neo4j</artifactId>
-	<version>6.3.0-SNAPSHOT</version>
+	<version>7.0.0-SNAPSHOT</version>
 
 	<name>Spring Data Neo4j</name>
 	<description>Next generation Object-Graph-Mapping for Spring Data.</description>
@@ -73,20 +73,19 @@
 		<asciidoctorj-diagram.version>2.1.0</asciidoctorj-diagram.version>
 
 		<byte-buddy.version>1.11.0</byte-buddy.version>
-		<cdi>2.0.SP1</cdi>
 		<checkstyle.version>8.40</checkstyle.version>
 		<cypher-dsl.version>2022.0.0</cypher-dsl.version>
 		<dist.id>spring-data-neo4j</dist.id>
 		<dist.key>SDNEO4J</dist.key>
 		<flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version>
-		<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
+		<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
 		<java-module-name>spring.data.neo4j</java-module-name>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 		<jaxb.version>2.3.1</jaxb.version>
-		<jqassistant-dashboard-plugin.version>1.9.0</jqassistant-dashboard-plugin.version>
+		<jqassistant-dashboard-plugin.version>1.10.0</jqassistant-dashboard-plugin.version>
 		<jqassistant.plugin.git.version>1.8.0</jqassistant.plugin.git.version>
-		<jqassistant.plugin.version>1.9.1</jqassistant.plugin.version>
-		<jqassistant.version>1.9.1</jqassistant.version>
+		<jqassistant.plugin.version>1.10.1</jqassistant.plugin.version>
+		<jqassistant.version>1.10.1</jqassistant.version>
 		<junit-cc-testcontainer>2021.0.1</junit-cc-testcontainer>
 		<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
 		<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
@@ -98,23 +97,32 @@
 		<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
 		<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
 		<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
-		<maven.compiler.source>${java.version}</maven.compiler.source>
-		<maven.compiler.target>${java.version}</maven.compiler.target>
+		<maven.compiler.release>${java.version}</maven.compiler.release>
 		<mockito>${mockito.version}</mockito>
+<<<<<<< HEAD
 		<mockito.version>3.10.0</mockito.version>
 		<neo4j-java-driver.version>4.4.2</neo4j-java-driver.version>
 		<neo4j.version>4.3.6</neo4j.version>
+=======
+		<mockito.version>4.0.0</mockito.version>
+		<neo4j-java-driver.version>4.3.4</neo4j-java-driver.version>
+		<neo4j.version>4.3.2</neo4j.version>
+>>>>>>> 4ebd4a7d1 (Update to Spring Data Commons 3.0.0 and JDK 17.)
 		<objenesis.version>3.0.1</objenesis.version>
 		<project.build.docs>${project.build.directory}/docs</project.build.docs>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<r2dbc.releasetrain>Arabba-SR5</r2dbc.releasetrain>
+		<r2dbc.releasetrain>Arabba-SR11</r2dbc.releasetrain>
 		<reactive-streams.version>1.2.1</reactive-streams.version>
-		<skipArchitectureTests>${skipTests}</skipArchitectureTests>
+		<skipArchitectureTests>true</skipArchitectureTests>
 		<skipIntegrationTests>${skipTests}</skipIntegrationTests>
 		<checkstyle.skip>${skipTests}</checkstyle.skip>
 
 		<skipUnitTests>${skipTests}</skipUnitTests>
+<<<<<<< HEAD
 		<springdata.commons>2.7.0-SNAPSHOT</springdata.commons>
+=======
+		<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
+>>>>>>> 4ebd4a7d1 (Update to Spring Data Commons 3.0.0 and JDK 17.)
 
 		<spring-data-commons-docs.dir>../../../../spring-data-commons/src/main/asciidoc</spring-data-commons-docs.dir>
 	</properties>
@@ -134,16 +142,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>io.reactivex</groupId>
-				<artifactId>rxjava</artifactId>
-				<version>${rxjava}</version>
-			</dependency>
-			<dependency>
-				<groupId>io.reactivex</groupId>
-				<artifactId>rxjava-reactive-streams</artifactId>
-				<version>${rxjava-reactive-streams}</version>
-			</dependency>
 			<dependency>
 				<groupId>io.reactivex.rxjava2</groupId>
 				<artifactId>rxjava</artifactId>
@@ -248,42 +246,46 @@
 			<artifactId>r2dbc-h2</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.reactivex</groupId>
-			<artifactId>rxjava</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>io.reactivex</groupId>
-			<artifactId>rxjava-reactive-streams</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>io.reactivex.rxjava2</groupId>
 			<artifactId>rxjava</artifactId>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
+			<groupId>jakarta.enterprise</groupId>
+			<artifactId>jakarta.enterprise.cdi-api</artifactId>
 			<version>${cdi}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>jta</artifactId>
-			<version>1.1</version>
-			<scope>test</scope>
+			<groupId>jakarta.transaction</groupId>
+			<artifactId>jakarta.transaction-api</artifactId>
+			<version>2.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apiguardian</groupId>
 			<artifactId>apiguardian-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jboss.weld.se</groupId>
-			<artifactId>weld-se-core</artifactId>
-			<version>3.1.4.Final</version>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-se</artifactId>
+			<classifier>jakarta</classifier>
+			<version>${webbeans}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-spi</artifactId>
+			<classifier>jakarta</classifier>
+			<version>${webbeans}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-impl</artifactId>
+			<classifier>jakarta</classifier>
+			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

src/main/asciidoc/appendix/build.adoc

@@ -155,6 +155,16 @@ Your build will break on formatting errors or something like unused imports.
 [[building-SDN.jqassistant]]
 === jQAssistant
 
+WARNING: Verification of those rules is off by default since Spring Data Neo4j 7, as the it requires JDK 17 to build.
+         The currently available version of jQAssistant does not run without several `--add-opens` arguments to the Java
+         module system and we won't apply this to the whole build as we must ensure that SDN itself does *not* need them.
+         +
+         To execute the rules during a build run the build like this:
+         +
+         +
+         `MAVEN_OPTS="--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED" ./mvnw -DskipArchitectureTests=false -DskipTests=true verify`
+
+
 We also use https://jqassistant.org[jQAssistant], a Neo4j-based tool, to verify some aspects of our architecture.
 The rules are described with Cypher and your build will break when they are violated:
 
@@ -171,7 +181,7 @@ When the build finishes, execute the following command:
 [[start-jqassistant]]
 .Start jQAssistant
 ----
-$ ./mvnw -pl org.springframework.data.neo4j:spring-data-neo4j jqassistant:server
+$ MAVEN_OPTS="--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED" ./mvnw -DskipArchitectureTests=false jqassistant:server
 ----
 
 Access the standard Neo4j browser at http://localhost:7474 and a dedicated jQA-Dashboard at http://localhost:7474/jqassistant/dashboard/.
@@ -182,6 +192,6 @@ The scanning and analyzing can be triggered individually, without going through
 [[scan-with-jqassistant]]
 .Manually scan and analyze the main project
 ----
-$ ./mvnw -pl org.springframework.data.neo4j:spring-data-neo4j jqassistant:scan@jqassistant-scan
-$ ./mvnw -pl org.springframework.data.neo4j:spring-data-neo4j jqassistant:analyze@jqassistant-analyze
+$ MAVEN_OPTS="--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED" ./mvnw -DskipArchitectureTests=false jqassistant:scan@jqassistant-scan
+$ MAVEN_OPTS="--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED" ./mvnw -DskipArchitectureTests=false jqassistant:analyze@jqassistant-analyze
 ----

src/main/java/org/springframework/data/neo4j/config/Builtin.java

@@ -19,7 +19,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 import org.apiguardian.api.API;
 

src/main/java/org/springframework/data/neo4j/config/Neo4jCdiConfigurationSupport.java

@@ -26,11 +26,11 @@
 import org.springframework.data.neo4j.core.transaction.Neo4jTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
 
 /**
  * Support class that can be used as is for all necessary CDI beans or as a blueprint for custom producers.

src/main/java/org/springframework/data/neo4j/config/Neo4jCdiExtension.java

@@ -19,13 +19,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.util.AnnotationLiteral;
 
 import org.apache.commons.logging.LogFactory;
 import org.apiguardian.api.API;

src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactoryCdiBean.java

@@ -20,9 +20,9 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apiguardian.api.API;
 import org.springframework.data.neo4j.config.Neo4jCdiExtension;

src/test/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionManagerTest.java

@@ -34,8 +34,8 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.transaction.Status;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.Status;
+import jakarta.transaction.UserTransaction;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

src/test/java/org/springframework/data/neo4j/integration/cdi/Neo4jBasedService.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.neo4j.integration.cdi;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.neo4j.driver.Driver;
 

src/test/java/org/springframework/data/neo4j/integration/cdi/Neo4jCdiExtensionIT.java

@@ -20,12 +20,12 @@
 
 import java.util.Optional;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
-import javax.inject.Singleton;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.AmbiguousResolutionException;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
+import jakarta.inject.Singleton;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;