From f50fc2a9fdd9673acebdcbb1d4bde37439eca020 Mon Sep 17 00:00:00 2001
From: Juan Moreno <earth001@users.noreply.github.com>
Date: Thu, 21 Feb 2019 00:50:34 -0300
Subject: [PATCH] Move src to spring-testing module (#6375)

---
 spring-5/pom.xml                                   |  7 -------
 testing-modules/spring-testing/pom.xml             | 14 ++++++++++++++
 .../java/com/baeldung/config/ScheduledConfig.java  |  0
 .../main/java/com/baeldung/scheduled/Counter.java  |  0
 .../ScheduledAwaitilityIntegrationTest.java        |  0
 .../scheduled/ScheduledIntegrationTest.java        |  0
 6 files changed, 14 insertions(+), 7 deletions(-)
 rename {spring-5 => testing-modules/spring-testing}/src/main/java/com/baeldung/config/ScheduledConfig.java (100%)
 rename {spring-5 => testing-modules/spring-testing}/src/main/java/com/baeldung/scheduled/Counter.java (100%)
 rename {spring-5 => testing-modules/spring-testing}/src/test/java/com/baeldung/scheduled/ScheduledAwaitilityIntegrationTest.java (100%)
 rename {spring-5 => testing-modules/spring-testing}/src/test/java/com/baeldung/scheduled/ScheduledIntegrationTest.java (100%)

diff --git a/spring-5/pom.xml b/spring-5/pom.xml
index 701aa3831d..6e4162fbcc 100644
--- a/spring-5/pom.xml
+++ b/spring-5/pom.xml
@@ -89,12 +89,6 @@
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${awaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
         <!-- restdocs -->
         <dependency>
             <groupId>org.springframework.restdocs</groupId>
@@ -162,7 +156,6 @@
         <commons-collections4.version>4.1</commons-collections4.version>
         <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
-        <awaitility.version>3.1.6</awaitility.version>
     </properties>
 
 </project>
diff --git a/testing-modules/spring-testing/pom.xml b/testing-modules/spring-testing/pom.xml
index a137bc8d33..630aed0c81 100644
--- a/testing-modules/spring-testing/pom.xml
+++ b/testing-modules/spring-testing/pom.xml
@@ -54,6 +54,18 @@
             <artifactId>spring-data-jpa</artifactId>
             <version>LATEST</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -70,6 +82,8 @@
     <properties>
         <!-- testing -->
         <hamcrest.version>2.0.0.0</hamcrest.version>
+        <awaitility.version>3.1.6</awaitility.version>
+        <junit.jupiter.version>5.4.0</junit.jupiter.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-5/src/main/java/com/baeldung/config/ScheduledConfig.java b/testing-modules/spring-testing/src/main/java/com/baeldung/config/ScheduledConfig.java
similarity index 100%
rename from spring-5/src/main/java/com/baeldung/config/ScheduledConfig.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/config/ScheduledConfig.java
diff --git a/spring-5/src/main/java/com/baeldung/scheduled/Counter.java b/testing-modules/spring-testing/src/main/java/com/baeldung/scheduled/Counter.java
similarity index 100%
rename from spring-5/src/main/java/com/baeldung/scheduled/Counter.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/scheduled/Counter.java
diff --git a/spring-5/src/test/java/com/baeldung/scheduled/ScheduledAwaitilityIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/scheduled/ScheduledAwaitilityIntegrationTest.java
similarity index 100%
rename from spring-5/src/test/java/com/baeldung/scheduled/ScheduledAwaitilityIntegrationTest.java
rename to testing-modules/spring-testing/src/test/java/com/baeldung/scheduled/ScheduledAwaitilityIntegrationTest.java
diff --git a/spring-5/src/test/java/com/baeldung/scheduled/ScheduledIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/scheduled/ScheduledIntegrationTest.java
similarity index 100%
rename from spring-5/src/test/java/com/baeldung/scheduled/ScheduledIntegrationTest.java
rename to testing-modules/spring-testing/src/test/java/com/baeldung/scheduled/ScheduledIntegrationTest.java