GH-4 - Build now against 4.0.0-beta03 by default.

The docker image against which the integration tests run can now be select via system or environmental properties `SPRING_BOOT_STARTER_NEO4J_REPOSITORY` and `SPRING_BOOT_STARTER_NEO4J_VERSION`, where the environmental properties have precende over the system properties. The system properties defaults to `neo4j/neo4j-experimental:4.0.0-beta03mr03` via maven. If none set, we fallback to `neo4j:3.5.13` (for example when run via IDE).

Author: michael-simons

neo4j-java-driver-spring-boot-autoconfigure/src/test/java/org/neo4j/driver/springframework/boot/autoconfigure/Neo4jDriverAutoConfigurationIT.java

@@ -42,6 +42,7 @@
 
 import java.util.Optional;
 import java.util.function.Predicate;
+import java.util.logging.Logger;
 
 /**
  * @author Michael J. Simons
@@ -52,18 +53,33 @@
 class Neo4jDriverAutoConfigurationIT {
 
 	private static final String SYS_PROPERTY_NEO4J_ACCEPT_COMMERCIAL_EDITION = "SPRING_BOOT_STARTER_NEO4J_ACCEPT_COMMERCIAL_EDITION";
+	private static final String SYS_PROPERTY_NEO4J_REPOSITORY = "SPRING_BOOT_STARTER_NEO4J_REPOSITORY";
 	private static final String SYS_PROPERTY_NEO4J_VERSION = "SPRING_BOOT_STARTER_NEO4J_VERSION";
 
 	@Container
 	private static Neo4jContainer neo4jServer;
+
+	private static final Logger LOGGER = Logger.getLogger(Neo4jDriverAutoConfigurationIT.class.getName());
+
 	static {
 		Predicate<String> isNotBlank = s -> !s.trim().isEmpty();
-		final String imageVersion = Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_VERSION))
-			.filter(isNotBlank)
-			.orElse("3.5.12");
-		neo4jServer = new Neo4jContainer<>("neo4j:" + imageVersion)
+
+		String repository = Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_REPOSITORY))
+				.filter(isNotBlank)
+				.orElseGet(() -> System.getProperty(SYS_PROPERTY_NEO4J_REPOSITORY, "neo4j"));
+
+		String imageVersion = Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_VERSION))
+				.filter(isNotBlank)
+				.orElseGet(() -> System.getProperty(SYS_PROPERTY_NEO4J_VERSION, "3.5.13"));
+
+		String image = repository + ":" + imageVersion;
+		LOGGER.info(() -> String.format("Using image %s", image));
+
+		neo4jServer = new Neo4jContainer<>(image)
 			.withoutAuthentication()
-			.withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_ACCEPT_COMMERCIAL_EDITION)).filter(isNotBlank).orElse("no"));
+			.withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT",
+				Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_ACCEPT_COMMERCIAL_EDITION)).filter(isNotBlank)
+					.orElse("no"));
 	}
 
 

pom.xml

@@ -99,7 +99,8 @@
 		<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
 		<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
 		<neo4j-java-driver.version>4.0.0-rc1</neo4j-java-driver.version>
-		<neo4j.version>3.5.12</neo4j.version>
+		<neo4j.repository>neo4j/neo4j-experimental</neo4j.repository>
+		<neo4j.version>4.0.0-beta03mr03</neo4j.version>
 		<revision>4.0</revision>
 		<sha1></sha1>
 		<sortpom-maven-plugin.version>2.8.0</sortpom-maven-plugin.version>
@@ -226,13 +227,29 @@
 							<rules>
 								<DependencyConvergence></DependencyConvergence>
 								<requireMavenVersion>
-									<version>3.6.0</version>
+									<version>3.6.1</version>
 								</requireMavenVersion>
 							</rules>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<systemProperties>
+						<property>
+							<name>SPRING_BOOT_STARTER_NEO4J_REPOSITORY</name>
+							<value>${neo4j.repository}</value>
+						</property>
+						<property>
+							<name>SPRING_BOOT_STARTER_NEO4J_VERSION</name>
+							<value>${neo4j.version}</value>
+						</property>
+					</systemProperties>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
@@ -244,6 +261,18 @@
 						</goals>
 					</execution>
 				</executions>
+				<configuration>
+					<systemProperties>
+						<property>
+							<name>SPRING_BOOT_STARTER_NEO4J_REPOSITORY</name>
+							<value>${neo4j.repository}</value>
+						</property>
+						<property>
+							<name>SPRING_BOOT_STARTER_NEO4J_VERSION</name>
+							<value>${neo4j.version}</value>
+						</property>
+					</systemProperties>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>