Merge branch '2.1.x'

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java

@@ -18,10 +18,7 @@ package org.springframework.boot.test.autoconfigure.data.neo4j;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
 import org.junit.runner.RunWith;
-import org.junit.runners.model.Statement;
 import org.neo4j.ogm.session.Session;
 import org.testcontainers.containers.Neo4jContainer;
 
@@ -50,19 +47,10 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 @DataNeo4jTest
 public class DataNeo4jTestIntegrationTests {
 
+	@ClassRule
 	public static SkippableContainer<Neo4jContainer<?>> neo4j = new SkippableContainer<Neo4jContainer<?>>(
 			() -> new Neo4jContainer<>().withAdminPassword(null));
 
-	@ClassRule
-	public static TestRule skippableContainer = new TestRule() {
-
-		@Override
-		public Statement apply(Statement base, Description description) {
-			return neo4j.apply(base, description);
-		}
-
-	};
-
 	@Autowired
 	private Session session;