diff --git a/acceptance-test/pom.xml b/acceptance-test/pom.xml
index 4807016..898754b 100644
--- a/acceptance-test/pom.xml
+++ b/acceptance-test/pom.xml
@@ -9,6 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>acceptance-test</artifactId>
+  <properties>
+    <io.cucumber-message.version>17.1.1</io.cucumber-message.version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>packagename</groupId>
@@ -33,34 +36,27 @@
       <scope>test</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apiguardian</groupId>
-          <artifactId>apiguardian-api</artifactId>
+          <groupId>io.cucumber</groupId>
+          <artifactId>messages</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>io.cucumber</groupId>
-      <artifactId>cucumber-junit</artifactId>
+      <artifactId>messages</artifactId>
+      <version>${io.cucumber-message.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.cucumber</groupId>
+      <artifactId>cucumber-junit-platform-engine</artifactId>
       <version>${cucumber.version}</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apiguardian</groupId>
-          <artifactId>apiguardian-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.cucumber</groupId>
       <artifactId>cucumber-spring</artifactId>
       <version>${cucumber.version}</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apiguardian</groupId>
-          <artifactId>apiguardian-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
   <build>
diff --git a/acceptance-test/src/test/java/packagename/cucumber/ExampleStepDef.java b/acceptance-test/src/test/java/packagename/cucumber/ExampleStepDef.java
index f6836c1..e9762c8 100644
--- a/acceptance-test/src/test/java/packagename/cucumber/ExampleStepDef.java
+++ b/acceptance-test/src/test/java/packagename/cucumber/ExampleStepDef.java
@@ -1,34 +1,23 @@
 package packagename.cucumber;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 import io.cucumber.datatable.DataTable;
 import io.cucumber.java8.En;
 import io.cucumber.java8.HookNoArgsBody;
-import io.cucumber.spring.CucumberContextConfiguration;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import packagename.boot.ExampleApplication;
 import packagename.domain.model.Example;
 import packagename.domain.model.ExampleInfo;
 import packagename.repository.dao.ExampleDao;
 import packagename.repository.entity.ExampleEntity;
 import packagename.rest.exception.ExampleExceptionResponse;
 
-@ExtendWith(SpringExtension.class)
-@SpringBootTest(classes = ExampleApplication.class, webEnvironment = RANDOM_PORT)
-@CucumberContextConfiguration
-@ActiveProfiles("test")
 public class ExampleStepDef implements En {
 
   private static final String LOCALHOST = "http://localhost:";
diff --git a/acceptance-test/src/test/java/packagename/cucumber/RunCucumberExampleTest.java b/acceptance-test/src/test/java/packagename/cucumber/RunCucumberExampleTest.java
index 9ce777d..ef6435e 100644
--- a/acceptance-test/src/test/java/packagename/cucumber/RunCucumberExampleTest.java
+++ b/acceptance-test/src/test/java/packagename/cucumber/RunCucumberExampleTest.java
@@ -1,13 +1,21 @@
 package packagename.cucumber;
 
-import io.cucumber.junit.Cucumber;
-import io.cucumber.junit.CucumberOptions;
-import org.junit.runner.RunWith;
+import static io.cucumber.junit.platform.engine.Constants.*;
 
-@RunWith(Cucumber.class)
-@CucumberOptions(
-    features = "classpath:features",
-    plugin = {"json:target/cucumber/example.json", "json:target/cucumber/example.xml"},
-    tags = "@Example",
-    glue = "classpath:packagename.cucumber")
+import org.junit.platform.suite.api.ConfigurationParameter;
+import org.junit.platform.suite.api.ConfigurationParameters;
+import org.junit.platform.suite.api.IncludeEngines;
+import org.junit.platform.suite.api.SelectClasspathResource;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@IncludeEngines("cucumber")
+@SelectClasspathResource("features/example.feature")
+@ConfigurationParameters({
+  @ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "packagename.cucumber"),
+  @ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "@Example"),
+  @ConfigurationParameter(key = JUNIT_PLATFORM_NAMING_STRATEGY_PROPERTY_NAME, value = "long"),
+  @ConfigurationParameter(key = PLUGIN_PUBLISH_QUIET_PROPERTY_NAME, value = "true"),
+  @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "json:target/cucumber/cucumber.json")
+})
 public class RunCucumberExampleTest {}
diff --git a/acceptance-test/src/test/java/packagename/cucumber/SpringCucumberTestConfig.java b/acceptance-test/src/test/java/packagename/cucumber/SpringCucumberTestConfig.java
new file mode 100644
index 0000000..76bbd96
--- /dev/null
+++ b/acceptance-test/src/test/java/packagename/cucumber/SpringCucumberTestConfig.java
@@ -0,0 +1,13 @@
+package packagename.cucumber;
+
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+import io.cucumber.spring.CucumberContextConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import packagename.boot.ExampleApplication;
+
+@SpringBootTest(classes = ExampleApplication.class, webEnvironment = RANDOM_PORT)
+@CucumberContextConfiguration
+@ActiveProfiles("test")
+public class SpringCucumberTestConfig {}
diff --git a/jpa-adapter/pom.xml b/jpa-adapter/pom.xml
index 232db9c..4576449 100644
--- a/jpa-adapter/pom.xml
+++ b/jpa-adapter/pom.xml
@@ -19,10 +19,30 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.roo</groupId>
+          <artifactId>org.springframework.roo.annotations</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-envers</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.roo</groupId>
+          <artifactId>org.springframework.roo.annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.javassist</groupId>
+          <artifactId>javassist</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.liquibase</groupId>
diff --git a/pom.xml b/pom.xml
index 3e67e7f..1ab9143 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,14 +12,15 @@
     <java.version>11</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <spring-boot.version>2.5.5</spring-boot.version>
-    <cucumber.version>6.11.0</cucumber.version>
-    <springdoc.version>1.5.10</springdoc.version>
+    <junit-jupiter.version>5.8.1</junit-jupiter.version>
+    <spring-boot.version>2.5.6</spring-boot.version>
+    <cucumber.version>7.0.0</cucumber.version>
+    <springdoc.version>1.5.12</springdoc.version>
     <pre-liquibase.version>1.1.1</pre-liquibase.version>
     <!-- plugins -->
     <cukedoctor-maven-plugin.version>3.7.0</cukedoctor-maven-plugin.version>
     <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-    <maven-enforcer-plugin>3.0.0-M3</maven-enforcer-plugin>
+    <maven-enforcer-plugin>3.0.0</maven-enforcer-plugin>
     <arch-unit-maven-plugin.version>2.8.0</arch-unit-maven-plugin.version>
     <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
     <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -63,6 +64,13 @@
         <version>${project.version}</version>
       </dependency>
       <!-- Frameworks & Libraries -->
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>${junit-jupiter.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
@@ -93,22 +101,12 @@
     <!-- JUnit 5 dependencies -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-launcher</artifactId>
+      <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-runner</artifactId>
+      <artifactId>junit-platform-suite</artifactId>
       <scope>test</scope>
     </dependency>
     <!-- mockito dependencies -->