From 1804a52740538d3d8ca9a0e7ba858c0bbac490ab Mon Sep 17 00:00:00 2001
From: Markus Kreusch <mail@markuskreusch.de>
Date: Mon, 28 Dec 2015 19:30:40 +0100
Subject: [PATCH] Restructured test dependencies

* All modules now have commons-test as test dependency.
* commons-test has dependencies to junit, hamcrest and mockito
---
 main/commons-test/pom.xml              | 9 +++++++++
 main/core/pom.xml                      | 6 ++++++
 main/crypto-aes/pom.xml                | 6 ++++++
 main/crypto-api/pom.xml                | 6 ++++++
 main/filesystem-api/pom.xml            | 4 ++++
 main/filesystem-crypto/pom.xml         | 7 +++++--
 main/filesystem-inmemory/pom.xml       | 6 ++++++
 main/filesystem-nameshortening/pom.xml | 7 +++++--
 main/filesystem-nio/pom.xml            | 9 +--------
 main/pom.xml                           | 4 +---
 main/ui/pom.xml                        | 6 ++++++
 11 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml
index 194ebf7a7..c8ff86ead 100644
--- a/main/commons-test/pom.xml
+++ b/main/commons-test/pom.xml
@@ -14,6 +14,15 @@
 	<description>Shared utilities for tests</description>
 
 	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<scope>compile</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-all</artifactId>
diff --git a/main/core/pom.xml b/main/core/pom.xml
index fe3fc22d3..2450eacab 100644
--- a/main/core/pom.xml
+++ b/main/core/pom.xml
@@ -73,6 +73,12 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
+		
+		<!-- Tests -->
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>commons-test</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/main/crypto-aes/pom.xml b/main/crypto-aes/pom.xml
index 3329405b5..36b640ea9 100644
--- a/main/crypto-aes/pom.xml
+++ b/main/crypto-aes/pom.xml
@@ -76,6 +76,12 @@
 			<artifactId>dagger-compiler</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		
+		<!-- Tests -->
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>commons-test</artifactId>
+		</dependency>
 	</dependencies>
 	
 	<build>
diff --git a/main/crypto-api/pom.xml b/main/crypto-api/pom.xml
index 52889fc93..f39dce6c6 100644
--- a/main/crypto-api/pom.xml
+++ b/main/crypto-api/pom.xml
@@ -31,6 +31,12 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-collections4</artifactId>
 		</dependency>
+		
+		<!-- Tests -->
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>commons-test</artifactId>
+		</dependency>
 	</dependencies>
 	
 	<build>
diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml
index 9625b6ba4..3bc027ba1 100644
--- a/main/filesystem-api/pom.xml
+++ b/main/filesystem-api/pom.xml
@@ -28,6 +28,10 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-collections4</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>commons-test</artifactId>
+		</dependency>
 	</dependencies>
 	
 	<build>
diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml
index fb0baadbe..a5e73da35 100644
--- a/main/filesystem-crypto/pom.xml
+++ b/main/filesystem-crypto/pom.xml
@@ -60,11 +60,14 @@
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
 		
-		<!-- Test dependencies -->
+		<!-- Tests -->
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>commons-test</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>filesystem-inmemory</artifactId>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	
diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml
index 70a27559a..d1351b822 100644
--- a/main/filesystem-inmemory/pom.xml
+++ b/main/filesystem-inmemory/pom.xml
@@ -22,6 +22,12 @@
 			<groupId>org.cryptomator</groupId>
 			<artifactId>filesystem-api</artifactId>
 		</dependency>
+		
+		<!-- Tests -->
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>commons-test</artifactId>
+		</dependency>
 	</dependencies>
 	
 	<build>
diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml
index cfc639de2..2b762fa23 100644
--- a/main/filesystem-nameshortening/pom.xml
+++ b/main/filesystem-nameshortening/pom.xml
@@ -39,11 +39,14 @@
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
 
-		<!-- Test dependencies -->
+		<!-- Tests -->
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>commons-test</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>filesystem-inmemory</artifactId>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml
index f732c68b5..51bc7e259 100644
--- a/main/filesystem-nio/pom.xml
+++ b/main/filesystem-nio/pom.xml
@@ -37,18 +37,11 @@
 			<artifactId>guava</artifactId>
 		</dependency>
 
+		<!-- Tests -->
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>commons-test</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/main/pom.xml b/main/pom.xml
index 308b2e008..54879dd88 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -71,6 +71,7 @@
 				<groupId>org.cryptomator</groupId>
 				<artifactId>filesystem-inmemory</artifactId>
 				<version>${project.version}</version>
+				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.cryptomator</groupId>
@@ -186,7 +187,6 @@
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
 				<version>${junit.version}</version>
-				<scope>test</scope>
 				<exclusions>
 					<exclusion>
 						<artifactId>hamcrest-core</artifactId>
@@ -198,7 +198,6 @@
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
 				<version>${mockito.version}</version>
-				<scope>test</scope>
 				<exclusions>
 					<exclusion>
 						<artifactId>hamcrest-core</artifactId>
@@ -210,7 +209,6 @@
 				<groupId>org.hamcrest</groupId>
 				<artifactId>hamcrest-all</artifactId>
 				<version>${hamcrest.version}</version>
-				<scope>test</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index 9b59c99b2..a7951aab3 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -63,5 +63,11 @@
 			<artifactId>dagger-compiler</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		
+		<!-- Tests -->
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>commons-test</artifactId>
+		</dependency>
 	</dependencies>
 </project>