issue/2640

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-#Mon Oct 11 14:30:21 CEST 2021
-distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
+#Fri Jun 03 09:39:34 CEST 2022
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip

Jenkinsfile

@@ -1,9 +1,15 @@
+def p = [:]
+node {
+    checkout scm
+    p = readProperties interpolate: true, file: 'ci/pipeline.properties'
+}
+
 pipeline {
 	agent none
 
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/2.7.x", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {
@@ -12,27 +18,28 @@ pipeline {
 	}
 
 	stages {
-		stage("test: baseline (jdk8)") {
+		stage("test: baseline (main)") {
 			when {
+				beforeAgent(true)
 				anyOf {
-					branch 'main'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
 			agent {
 				label 'data'
 			}
-			options { timeout(time: 30, unit: 'MINUTES') }
+			options { timeout(time: 60, unit: 'MINUTES') }
 
 			environment {
-				DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				DOCKER_HUB = credentials("${p['docker.credentials']}")
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}
 
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
+					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
 							sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
 							sh "PROFILE=none ci/test.sh"
 							sh "ci/clean.sh"
@@ -44,53 +51,54 @@ pipeline {
 
 		stage("Test other configurations") {
 			when {
+				beforeAgent(true)
 				allOf {
-					branch 'main'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
 			parallel {
-				stage("test: baseline (jdk11)") {
+				stage("test: baseline (next)") {
 					agent {
 						label 'data'
 					}
-					options { timeout(time: 30, unit: 'MINUTES') }
+					options { timeout(time: 60, unit: 'MINUTES') }
 
 					environment {
-						DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
-						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+						DOCKER_HUB = credentials("${p['docker.credentials']}")
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 					}
 
 					steps {
 						script {
-							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('adoptopenjdk/openjdk11:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
+							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
+								docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
 									sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-									sh "PROFILE=java11 ci/test.sh"
+									sh "PROFILE=none ci/test.sh"
 									sh "ci/clean.sh"
 								}
 							}
 						}
 					}
 				}
 
-				stage("test: baseline (jdk16)") {
+				stage("test: baseline (LTS)") {
 					agent {
 						label 'data'
 					}
-					options { timeout(time: 30, unit: 'MINUTES') }
+					options { timeout(time: 60, unit: 'MINUTES') }
 
 					environment {
-						DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
-						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+						DOCKER_HUB = credentials("${p['docker.credentials']}")
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 					}
 
 					steps {
 						script {
-							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('adoptopenjdk/openjdk16:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
+							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
+								docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
 									sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-									sh "PROFILE=java11 ci/test.sh"
+									sh "PROFILE=none ci/test.sh"
 									sh "ci/clean.sh"
 								}
 							}
@@ -102,8 +110,9 @@ pipeline {
 
 		stage('Release to artifactory') {
 			when {
+				beforeAgent(true)
 				anyOf {
-					branch 'main'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -113,13 +122,13 @@ pipeline {
 			options { timeout(time: 20, unit: 'MINUTES') }
 
 			environment {
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}
 
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
+					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
 							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root ' +
 								'-Dartifactory.server=https://repo.spring.io ' +
 								"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -136,21 +145,25 @@ pipeline {
 
 		stage('Publish documentation') {
 			when {
-				branch 'main'
+				beforeAgent(true)
+				anyOf {
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
+					not { triggeredBy 'UpstreamCause' }
+				}
 			}
 			agent {
 				label 'data'
 			}
 			options { timeout(time: 20, unit: 'MINUTES') }
 
 			environment {
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}
 
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
+					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
 							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root ' +
 									'-Dartifactory.server=https://repo.spring.io ' +
 									"-Dartifactory.username=${ARTIFACTORY_USR} " +

README.adoc

@@ -10,8 +10,8 @@ image:https://spring.io/badges/spring-data-neo4j/ga.svg[Spring Data Neo4j,link=h
 :artifactIdStarter: spring-boot-starter-data-neo4j
 
 :neo4j-version: 4.1.5
-:spring-boot-version: 2.5.3
-:spring-data-neo4j-version: 6.1.3
+:spring-boot-version: 2.6.3
+:spring-data-neo4j-version: 6.2.1
 // end::properties[]
 
 [abstract]

ci/pipeline.properties

@@ -0,0 +1,29 @@
+# Java versions
+java.main.tag=8u352-b08-jdk-focal
+java.next.tag=11.0.17_8-jdk-focal
+java.lts.tag=17.0.5_8-jdk-focal
+
+# Docker container images - standard
+docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
+docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
+docker.java.lts.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.lts.tag}
+
+# Supported versions of MongoDB
+docker.mongodb.4.0.version=4.0.28
+docker.mongodb.4.4.version=4.4.17
+docker.mongodb.5.0.version=5.0.13
+
+# Supported versions of Redis
+docker.redis.6.version=6.2.6
+
+# Supported versions of Cassandra
+docker.cassandra.3.version=3.11.14
+
+# Docker environment settings
+docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
+docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home
+
+# Credentials
+docker.registry=
+docker.credentials=hub.docker.com-springbuildmaster
+artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c

etc/adr/general-discussion.adoc

@@ -318,7 +318,7 @@ Thus we stay consistent with all other Spring Boot starters, that are actually p
 
 ==== Responsibilities
 
-The starter and it's automatic configuration is responsible for configuring Spring Data Neo4j repositories and infrastructure.
+The starter and its automatic configuration is responsible for configuring Spring Data Neo4j repositories and infrastructure.
 It needs a configured Neo4j Java Driver and therefor is itself dependent on `org.neo4j.driver:neo4j-java-driver-spring-boot-starter`,
 the official starter for the Neo4j Java Driver.
 

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
- | Copyright 2011-2022 the original author or authors.
+ | Copyright 2011-2023 the original author or authors.
  |
  | Licensed under the Apache License, Version 2.0 (the "License");
  | you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.7.7-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-neo4j</artifactId>
-	<version>6.3.0-SNAPSHOT</version>
+	<version>6.3.7-SNAPSHOT</version>
 
 	<name>Spring Data Neo4j</name>
 	<description>Next generation Object-Graph-Mapping for Spring Data.</description>
@@ -75,18 +75,18 @@
 		<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>
+		<cypher-dsl.version>2022.4.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>
 		<java-module-name>spring.data.neo4j</java-module-name>
 		<java.version>1.8</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>
@@ -102,7 +102,7 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<mockito>${mockito.version}</mockito>
 		<mockito.version>3.10.0</mockito.version>
-		<neo4j-java-driver.version>4.4.2</neo4j-java-driver.version>
+		<neo4j-java-driver.version>4.4.10</neo4j-java-driver.version>
 		<neo4j.version>4.3.6</neo4j.version>
 		<objenesis.version>3.0.1</objenesis.version>
 		<project.build.docs>${project.build.directory}/docs</project.build.docs>
@@ -114,7 +114,7 @@
 		<checkstyle.skip>${skipTests}</checkstyle.skip>
 
 		<skipUnitTests>${skipTests}</skipUnitTests>
-		<springdata.commons>2.7.0-SNAPSHOT</springdata.commons>
+		<springdata.commons>2.7.7-SNAPSHOT</springdata.commons>
 
 		<spring-data-commons-docs.dir>../../../../spring-data-commons/src/main/asciidoc</spring-data-commons-docs.dir>
 	</properties>
@@ -583,7 +583,6 @@
 						</goals>
 						<configuration>
 							<rules>
-								<DependencyConvergence/>
 								<requireMavenVersion>
 									<version>3.8.3</version>
 								</requireMavenVersion>
@@ -729,41 +728,44 @@
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId>
 						<version>${asciidoctor-maven-plugin.version}</version>
-						<executions>
-							<execution>
-								<id>generate-docs</id>
-								<phase>prepare-package</phase>
-								<goals>
-									<goal>process-asciidoc</goal>
-								</goals>
-							</execution>
-						</executions>
 						<dependencies>
 							<dependency>
 								<groupId>org.asciidoctor</groupId>
 								<artifactId>asciidoctorj-diagram</artifactId>
 								<version>${asciidoctorj-diagram.version}</version>
 							</dependency>
 						</dependencies>
-						<configuration>
-							<backend>html</backend>
-							<doctype>book</doctype>
-							<imagesDir>img</imagesDir>
-							<sourceDirectory>${project.basedir}/src/main/asciidoc</sourceDirectory>
-							<sourceDocumentName>index.adoc</sourceDocumentName>
-							<sourceHighlighter>coderay</sourceHighlighter>
+						<configuration combine.self="append">
 							<attributes>
-								<icons>font</icons>
-								<toc>left</toc>
-								<setanchors/>
-								<idprefix/>
-								<idseparator/>
 								<spring-data-commons-docs>${spring-data-commons-docs.dir}</spring-data-commons-docs>
 							</attributes>
 							<requires>
 								<require>asciidoctor-diagram</require>
 							</requires>
-							<outputDirectory>${project.build.docs}</outputDirectory>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>com.buschmais.jqassistant</groupId>
+						<artifactId>jqassistant-maven-plugin</artifactId>
+						<version>${jqassistant.version}</version>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>artifactory</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>com.buschmais.jqassistant</groupId>
+						<artifactId>jqassistant-maven-plugin</artifactId>
+						<version>${jqassistant.version}</version>
+						<configuration>
+							<skip>true</skip>
 						</configuration>
 					</plugin>
 				</plugins>

src/main/asciidoc/appendix/conversions.adoc

@@ -1,6 +1,9 @@
 [[conversions]]
 = Conversions
 
+[[build-in.conversions]]
+== Built-in conversions
+
 We support a broad range of conversions out of the box.
 Find the list of supported cypher types in the official drivers manual: https://neo4j.com/docs/driver-manual/current/cypher-values/[Working with Cypher values].
 

src/main/asciidoc/appendix/custom-queries.adoc

@@ -357,7 +357,10 @@ All properties - and type of relationships - appear in those maps as they would
 have been written by SDN.
 Values will have the correct Cypher type and won't need further conversion.
 
-All relationships are lists of maps. Dynamic relationships will be resolved accordingly.
+TIP: All relationships are lists of maps. Dynamic relationships will be resolved accordingly.
+     One-to-one relationships will also be serialized as singleton lists. So to access a one-to-one mapping
+     between people, you would write this das `$person.\\__properties__.BEST_FRIEND[0].\\__target__.\\__id__`.
+
 If an entity has a relationship with the same type to different types of others nodes, they will all appear in the same list.
 If you need such a mapping and also have the need to work with those custom parameters, you have to unroll it accordingly.
 One way to do this are correlated subqueries (Neo4j 4.1+ required).