diff --git a/pom.xml b/pom.xml
index ad15c2b9..5fd9a5d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-r2dbc</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 
 	<name>Spring Data R2DBC</name>
 	<description>Spring Data module for R2DBC</description>
@@ -14,15 +14,15 @@
 	<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>
 
 	<properties>
 
 		<dist.key>DATAR2DBC</dist.key>
 
-		<springdata.commons>2.7.0-SNAPSHOT</springdata.commons>
-		<springdata.jdbc>2.4.0-SNAPSHOT</springdata.jdbc>
+		<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
+		<springdata.jdbc>3.0.0-SNAPSHOT</springdata.jdbc>
 		<springdata.relational>${springdata.jdbc}</springdata.relational>
 		<java-module-name>spring.data.r2dbc</java-module-name>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
diff --git a/src/test/java/org/springframework/data/r2dbc/DependencyTests.java b/src/test/java/org/springframework/data/r2dbc/DependencyTests.java
index 913039b1..ebabc489 100644
--- a/src/test/java/org/springframework/data/r2dbc/DependencyTests.java
+++ b/src/test/java/org/springframework/data/r2dbc/DependencyTests.java
@@ -23,6 +23,7 @@ import de.schauderhaft.degraph.configuration.NamedPattern;
 import scala.runtime.AbstractFunction1;
 
 import org.junit.Assume;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -30,6 +31,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jens Schauder
  */
+@Disabled("To be replaced with ArchUnit")
 public class DependencyTests {
 
 	@Test // DATAJDBC-114