From b25df0bcf15f56a7c2c1398d76db84352658d5b3 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Thu, 28 Jan 2016 15:41:58 +0100
Subject: [PATCH] DATAREST-756 - Reorganize dependencies to make sure they get
 pulled in in release profile.

---
 pom.xml                         |  95 +++++++--------
 spring-data-rest-webmvc/pom.xml | 199 ++++++++++++--------------------
 2 files changed, 116 insertions(+), 178 deletions(-)

diff --git a/pom.xml b/pom.xml
index be9f81184..6cad93217 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,62 +80,6 @@
 			</build>
 		</profile>
 
-		<profile>
-			<id>jpa</id>
-
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-
-			<dependencies>
-
-				<dependency>
-					<groupId>org.springframework.data</groupId>
-					<artifactId>spring-data-jpa</artifactId>
-					<version>${springdata.jpa}</version>
-					<scope>test</scope>
-				</dependency>
-
-				<dependency>
-					<groupId>org.hibernate</groupId>
-					<artifactId>hibernate-entitymanager</artifactId>
-					<version>${hibernate.version}</version>
-					<scope>test</scope>
-				</dependency>
-
-				<dependency>
-					<groupId>org.hsqldb</groupId>
-					<artifactId>hsqldb</artifactId>
-					<version>2.3.2</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-
-		<profile>
-			<id>mongodb</id>
-
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-
-			<dependencies>
-				<dependency>
-					<groupId>org.springframework.data</groupId>
-					<artifactId>spring-data-mongodb</artifactId>
-					<version>${springdata.mongodb}</version>
-					<scope>test</scope>
-				</dependency>
-
-				<dependency>
-					<groupId>com.querydsl</groupId>
-					<artifactId>querydsl-mongodb</artifactId>
-					<version>${querydsl}</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-
 	</profiles>
 
 	<dependencies>
@@ -147,6 +91,45 @@
 			<optional>true</optional>
 		</dependency>
 
+		<!-- JPA -->
+
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-jpa</artifactId>
+			<version>${springdata.jpa}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<version>${hibernate.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>2.3.2</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- MongoDB -->
+
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-mongodb</artifactId>
+			<version>${springdata.mongodb}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-mongodb</artifactId>
+			<version>${querydsl}</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 	<build>
diff --git a/spring-data-rest-webmvc/pom.xml b/spring-data-rest-webmvc/pom.xml
index 32fc4c197..fc524d3a2 100644
--- a/spring-data-rest-webmvc/pom.xml
+++ b/spring-data-rest-webmvc/pom.xml
@@ -130,130 +130,85 @@
 			<scope>test</scope>
 		</dependency>
 
+		<!-- Unifying: Neo4j VS. Solr -->
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.3</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Gemfire -->
+
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-gemfire</artifactId>
+			<version>${springdata.gemfire}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Solr -->
+
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-solr</artifactId>
+			<version>${springdata.solr}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.solr</groupId>
+			<artifactId>solr-core</artifactId>
+			<version>4.10.1</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jdk.tools</artifactId>
+					<groupId>jdk.tools</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google</groupId>
+					<artifactId>guava</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- Spring Security -->
+
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-core</artifactId>
+			<version>${spring-security.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-config</artifactId>
+			<version>${spring-security.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+			<version>${spring-security.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-test</artifactId>
+			<version>${spring-security.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
-	<profiles>
-
-		<profile>
-			<id>unifying</id>
-
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-
-			<dependencies>
-				<!-- Neo4j VS. Solr -->
-				<dependency>
-					<groupId>commons-io</groupId>
-					<artifactId>commons-io</artifactId>
-					<version>2.3</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-
-		</profile>
-
-		<profile>
-			<id>gemfire</id>
-
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-
-			<dependencies>
-				<dependency>
-					<groupId>org.springframework.data</groupId>
-					<artifactId>spring-data-gemfire</artifactId>
-					<version>${springdata.gemfire}</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-
-		<profile>
-			<id>solr</id>
-
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-
-			<dependencies>
-
-				<dependency>
-					<groupId>org.springframework.data</groupId>
-					<artifactId>spring-data-solr</artifactId>
-					<version>${springdata.solr}</version>
-					<scope>test</scope>
-				</dependency>
-
-				<dependency>
-					<groupId>org.apache.solr</groupId>
-					<artifactId>solr-core</artifactId>
-					<version>4.10.1</version>
-					<scope>test</scope>
-					<exclusions>
-						<exclusion>
-							<groupId>org.slf4j</groupId>
-							<artifactId>slf4j-api</artifactId>
-						</exclusion>
-						<exclusion>
-							<artifactId>jdk.tools</artifactId>
-							<groupId>jdk.tools</groupId>
-						</exclusion>
-						<exclusion>
-							<groupId>com.google</groupId>
-							<artifactId>guava</artifactId>
-						</exclusion>
-					</exclusions>
-				</dependency>
-
-			</dependencies>
-
-		</profile>
-
-		<profile>
-
-			<id>spring-security</id>
-
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-
-			<dependencies>
-
-				<dependency>
-					<groupId>org.springframework.security</groupId>
-					<artifactId>spring-security-core</artifactId>
-					<version>${spring-security.version}</version>
-					<scope>test</scope>
-				</dependency>
-
-				<dependency>
-					<groupId>org.springframework.security</groupId>
-					<artifactId>spring-security-config</artifactId>
-					<version>${spring-security.version}</version>
-					<scope>test</scope>
-				</dependency>
-
-				<dependency>
-					<groupId>org.springframework.security</groupId>
-					<artifactId>spring-security-web</artifactId>
-					<version>${spring-security.version}</version>
-					<scope>test</scope>
-				</dependency>
-
-				<dependency>
-					<groupId>org.springframework.security</groupId>
-					<artifactId>spring-security-test</artifactId>
-					<version>${spring-security.version}</version>
-					<scope>test</scope>
-				</dependency>
-
-			</dependencies>
-		</profile>
-
-	</profiles>
-
 	<build>
 		<plugins>
 			<plugin>