Merge branch '1.7' into 2.0

Author: Zhen Li

driver/pom.xml

@@ -48,11 +48,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
+      <artifactId>junit-jupiter</artifactId>
     </dependency>
     <dependency>
       <groupId>org.rauschig</groupId>

driver/src/main/javadoc/overview.html

@@ -32,7 +32,7 @@ <h3>Example</h3>
             // and makes handling errors much easier.
             try (Transaction tx = session.beginTransaction())
             {
-                tx.run("MERGE (a:Person {name: {x}})", parameters("x", name));
+                tx.run("MERGE (a:Person {name: $x})", parameters("x", name));
                 tx.success();  // Mark this write as successful.
             }
         }
@@ -44,7 +44,7 @@ <h3>Example</h3>
         {
             // Auto-commit transactions are a quick and easy way to wrap a read.
             StatementResult result = session.run(
-                    "MATCH (a:Person) WHERE a.name STARTS WITH {x} RETURN a.name AS name",
+                    "MATCH (a:Person) WHERE a.name STARTS WITH $x RETURN a.name AS name",
                     parameters("x", initial));
             // Each Cypher execution returns a stream of records.
             while (result.hasNext())

driver/src/test/java/org/neo4j/driver/v1/integration/TrustCustomCertificateIT.java

@@ -18,10 +18,16 @@
  */
 package org.neo4j.driver.v1.integration;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.function.Supplier;
 
 import org.neo4j.driver.v1.Config;
@@ -42,11 +48,32 @@
 import static org.neo4j.driver.v1.util.CertificateToolUtil.createNewCertificateAndKeySignedBy;
 
 @ParallelizableIT
-public class TrustCustomCertificateIT
+class TrustCustomCertificateIT
 {
     @RegisterExtension
     static final DatabaseExtension neo4j = new DatabaseExtension();
 
+    private static Path originalKeyFile;
+    private static Path originalCertFile;
+
+    @BeforeAll
+    static void beforeAll() throws IOException
+    {
+        originalKeyFile = Files.createTempFile( "key-file-", "" );
+        originalCertFile = Files.createTempFile( "cert-file-", "" );
+
+        Files.copy( neo4j.tlsKeyFile().toPath(), originalKeyFile , StandardCopyOption.REPLACE_EXISTING);
+        Files.copy( neo4j.tlsCertFile().toPath(), originalCertFile, StandardCopyOption.REPLACE_EXISTING );
+    }
+
+    @AfterAll
+    static void afterAll() throws Exception
+    {
+        neo4j.updateEncryptionKeyAndCert( originalKeyFile.toFile(), originalCertFile.toFile() );
+        Files.deleteIfExists( originalKeyFile );
+        Files.deleteIfExists( originalCertFile );
+    }
+
     @Test
     void shouldAcceptServerWithCertificateSignedByDriverCertificate() throws Throwable
     {

examples/pom.xml

@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
+      <artifactId>junit-jupiter</artifactId>
     </dependency>
     <dependency>
       <groupId>org.rauschig</groupId>

pom.xml

@@ -10,8 +10,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <rootDir>${project.basedir}</rootDir>
     <surefire.and.failsafe.version>2.22.1</surefire.and.failsafe.version>
-    <junit.version>5.3.1</junit.version>
-    <junit.platform.version>1.3.1</junit.platform.version>
+    <junit.version>5.4.0</junit.version>
     <parallelizable.it.forkCount>1C</parallelizable.it.forkCount>
     <!-- All tests tagged are to be executed in parallel -->
     <parallelizable.it.tags>parallelizableIT</parallelizable.it.tags>
@@ -84,13 +83,7 @@
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-engine</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-params</artifactId>
+        <artifactId>junit-jupiter</artifactId>
         <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
@@ -328,18 +321,6 @@
           <argLine>${surefire.and.failsafe.argLine}</argLine>
           <trimStackTrace>false</trimStackTrace>
         </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-launcher</artifactId>
-            <version>${junit.platform.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -378,18 +359,6 @@
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-launcher</artifactId>
-            <version>${junit.platform.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
     </plugins>
   </build>