From 5057a282bd971653b8b0a16c951e93fa89422c10 Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Fri, 18 May 2018 23:47:28 -0400
Subject: [PATCH] Move test deps and versions to test module

---
 pom.xml      | 56 ----------------------------------------------------
 test/pom.xml | 22 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 56 deletions(-)

diff --git a/pom.xml b/pom.xml
index ef966a3..4e84468 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,48 +76,6 @@
                 <version>4.11</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derby</artifactId>
-                <version>${derby.version}</version>
-                <scope>test</scope>
-                <optional>true</optional>
-            </dependency>
-            <dependency>
-                <groupId>org.hsqldb</groupId>
-                <artifactId>hsqldb</artifactId>
-                <version>${hsql.version}</version>
-                <scope>test</scope>
-                <optional>true</optional>
-            </dependency>
-            <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>${h2.version}</version>
-                <scope>test</scope>
-                <optional>true</optional>
-            </dependency>
-            <dependency>
-                <groupId>org.xerial</groupId>
-                <artifactId>sqlite-jdbc</artifactId>
-                <version>3.21.0.1</version>
-                <scope>test</scope>
-                <optional>true</optional>
-            </dependency>
-            <dependency>
-                <groupId>org.postgresql</groupId>
-                <artifactId>postgresql</artifactId>
-                <version>${postgresql.version}</version>
-                <scope>test</scope>
-                <optional>true</optional>
-            </dependency>
-            <dependency>
-                <groupId>org.mariadb.jdbc</groupId>
-                <artifactId>mariadb-java-client</artifactId>
-                <version>${mariadb.version}</version>
-                <scope>test</scope>
-                <optional>true</optional>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>
@@ -224,12 +182,6 @@
                 <source.classifier>jdk16-sources</source.classifier>
                 <maven.javadoc.skip>true</maven.javadoc.skip>
                 <jar.classifier>jdk16</jar.classifier>
-                <derby.version>10.12.1.1</derby.version>
-                <hsql.version>2.3.5</hsql.version>
-                <h2.version>1.4.191</h2.version>
-                <postgresql.version>42.2.2.jre6</postgresql.version>
-                <mariadb.version>1.7.3</mariadb.version>
-                <mssql.version>6.4.0.jre7</mssql.version>
             </properties>
             <modules>
                 <module>common</module>
@@ -333,14 +285,6 @@
             <activation>
                 <jdk>[1.8,)</jdk>
             </activation>
-            <properties>
-                <derby.version>10.14.2.0</derby.version>
-                <hsql.version>2.4.0</hsql.version>
-                <h2.version>1.4.197</h2.version>
-                <postgresql.version>42.2.2</postgresql.version>
-                <mariadb.version>2.2.4</mariadb.version>
-                <mssql.version>6.4.0.jre8</mssql.version>
-            </properties>
             <modules>
                 <module>common</module>
                 <module>runtime-compiler</module>
diff --git a/test/pom.xml b/test/pom.xml
index 161735d..c8e632a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -33,36 +33,42 @@
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
+            <version>${derby.version}</version>
             <scope>test</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
+            <version>${hsql.version}</version>
             <scope>test</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
             <scope>test</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
+            <version>3.21.0.1</version>
             <scope>test</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
+            <version>${postgresql.version}</version>
             <scope>test</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
+            <version>${mariadb.version}</version>
             <scope>test</scope>
             <optional>true</optional>
         </dependency>
@@ -88,6 +94,14 @@
             <activation>
                 <jdk>[1.6,1.8)</jdk>
             </activation>
+            <properties>
+                <derby.version>10.12.1.1</derby.version>
+                <hsql.version>2.3.5</hsql.version>
+                <h2.version>1.4.191</h2.version>
+                <postgresql.version>42.2.2.jre6</postgresql.version>
+                <mariadb.version>1.7.3</mariadb.version>
+                <mssql.version>6.4.0.jre7</mssql.version>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -102,6 +116,14 @@
             <activation>
                 <jdk>[1.8,)</jdk>
             </activation>
+            <properties>
+                <derby.version>10.14.2.0</derby.version>
+                <hsql.version>2.4.0</hsql.version>
+                <h2.version>1.4.197</h2.version>
+                <postgresql.version>42.2.2</postgresql.version>
+                <mariadb.version>2.2.4</mariadb.version>
+                <mssql.version>6.4.0.jre8</mssql.version>
+            </properties>
             <dependencies>
                 <dependency>
                     <groupId>${project.groupId}</groupId>