From 60026c8cd83583a364be2e83a43f48db2d4090fc Mon Sep 17 00:00:00 2001
From: Andre Hacker <andrephacker@gmail.com>
Date: Sun, 22 Sep 2013 12:55:14 +0200
Subject: [PATCH] 1) Changed profile activation to properties (like hbase) 2)
 moved all properties to top of pom 3) moved module list to top of pom

---
 nephele/nephele-hdfs/pom.xml | 30 +++++++++------
 nephele/pom.xml              | 27 +++++++-------
 pact/pact-examples/pom.xml   | 72 ++++++++++++++++++++----------------
 pact/pact-runtime/pom.xml    | 22 +++++++----
 pact/pom.xml                 | 41 ++++++++++++--------
 pom.xml                      | 61 +++++++++++++++---------------
 stratosphere-dist/pom.xml    | 27 +++++++++-----
 7 files changed, 160 insertions(+), 120 deletions(-)

diff --git a/nephele/nephele-hdfs/pom.xml b/nephele/nephele-hdfs/pom.xml
index 7da52635f49..c919e482b94 100644
--- a/nephele/nephele-hdfs/pom.xml
+++ b/nephele/nephele-hdfs/pom.xml
@@ -28,29 +28,37 @@
 	<!-- See main pom.xml for explanation of profiles -->
 	<profiles>
 		<profile>
-			<id>hadoop_yarn</id>
+			<id>hadoop-1</id>
+			<activation>
+				<property>
+					<name>!hadoop.profile</name>
+				</property>
+			</activation>
 			<dependencies>
-				<!-- YARN -->
-				<dependency>
-					<groupId>org.apache.hadoop</groupId>
-					<artifactId>hadoop-common</artifactId>
-				</dependency>
+				<!-- "Old" Hadoop = MapReduce v1 -->
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
-					<artifactId>hadoop-hdfs</artifactId>
+					<artifactId>hadoop-core</artifactId>
 				</dependency>
 			</dependencies>
 		</profile>
 		<profile>
-			<id>hadoop_v1</id>
+			<id>hadoop-2</id>
 			<activation>
-				<activeByDefault>true</activeByDefault>
+				<property>
+					<name>hadoop.profile</name>
+					<value>2</value>
+				</property>
 			</activation>
 			<dependencies>
-				<!-- "Old" Hadoop = MapReduce v1 -->
+				<!-- YARN -->
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
-					<artifactId>hadoop-core</artifactId>
+					<artifactId>hadoop-common</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.hadoop</groupId>
+					<artifactId>hadoop-hdfs</artifactId>
 				</dependency>
 			</dependencies>
 		</profile>
diff --git a/nephele/pom.xml b/nephele/pom.xml
index 2b8357486f4..a70f4d86b34 100644
--- a/nephele/pom.xml
+++ b/nephele/pom.xml
@@ -36,6 +36,19 @@
 		</developer>
 	</developers>
 
+	<modules>
+		<module>nephele-common</module>
+		<module>nephele-management</module>
+		<module>nephele-profiling</module>
+		<module>nephele-queuescheduler</module>
+		<module>nephele-clustermanager</module>
+		<module>nephele-hdfs</module>
+		<module>nephele-s3</module>
+		<module>nephele-visualization</module>
+		<module>nephele-server</module>
+		<module>nephele-examples</module>
+	</modules>
+
 	<reporting>
 		<plugins>
 		</plugins>
@@ -74,17 +87,5 @@
 
 	<dependencies>
 	</dependencies>
-
-	<modules>
-		<module>nephele-common</module>
-		<module>nephele-management</module>
-		<module>nephele-profiling</module>
-		<module>nephele-queuescheduler</module>
-		<module>nephele-clustermanager</module>
-		<module>nephele-hdfs</module>
-		<module>nephele-s3</module>
-		<module>nephele-visualization</module>
-		<module>nephele-server</module>
-		<module>nephele-examples</module>
-	</modules>
+	
 </project>
diff --git a/pact/pact-examples/pom.xml b/pact/pact-examples/pom.xml
index 98024a58b44..1eddd51f9c1 100644
--- a/pact/pact-examples/pom.xml
+++ b/pact/pact-examples/pom.xml
@@ -336,7 +336,46 @@
 	<!-- See main pom.xml for explanation of profiles -->
 	<profiles>
 		<profile>
-			<id>hadoop_yarn</id>
+			<id>hadoop-1</id>
+			<activation>
+				<property>
+					<name>!hadoop.profile</name>
+				</property>
+			</activation>
+			<dependencies>
+				<!-- No extra dependencies: pact-hbase is currently not compatible with Hadoop v1 -->
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>default-compile</id>
+								<phase>compile</phase>
+								<configuration>
+									<excludes>
+										<exclude>**/hbase/*.java</exclude>
+									</excludes>
+								</configuration>
+								<goals>
+									<goal>compile</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>hadoop-2</id>
+			<activation>
+				<property>
+					<name>hadoop.profile</name>
+					<value>2</value>
+				</property>
+			</activation>
 			<dependencies>
 				<dependency>
 					<groupId>eu.stratosphere</groupId>
@@ -380,37 +419,6 @@
 			</build>
 		</profile>
 		
-		<profile>
-			<id>hadoop_v1</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<dependencies>
-        		<!-- No extra dependencies: pact-hbase is currently not compatible with Hadoop v1 -->
-			</dependencies>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-compiler-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>default-compile</id>
-								<phase>compile</phase>
-								<configuration>
-									<excludes>
-										<exclude>**/hbase/*.java</exclude>
-									</excludes>
-								</configuration>
-								<goals>
-									<goal>compile</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
   
 </project>
diff --git a/pact/pact-runtime/pom.xml b/pact/pact-runtime/pom.xml
index 96cc1ada52d..b041aea23b7 100644
--- a/pact/pact-runtime/pom.xml
+++ b/pact/pact-runtime/pom.xml
@@ -36,25 +36,33 @@
 	<!-- See main pom.xml for explanation of profiles -->
 	<profiles>
 		<profile>
-			<id>hadoop_yarn</id>
+			<id>hadoop-1</id>
+			<activation>
+				<property>
+					<name>!hadoop.profile</name>
+				</property>
+			</activation>
 			<dependencies>
-				<!-- YARN -->
+				<!-- "Old" Hadoop = MapReduce v1 -->
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
-					<artifactId>hadoop-common</artifactId>
+					<artifactId>hadoop-core</artifactId>
 				</dependency>
 			</dependencies>
 		</profile>
 		<profile>
-			<id>hadoop_v1</id>
+			<id>hadoop-2</id>
 			<activation>
-				<activeByDefault>true</activeByDefault>
+				<property>
+					<name>hadoop.profile</name>
+					<value>2</value>
+				</property>
 			</activation>
 			<dependencies>
-				<!-- "Old" Hadoop = MapReduce v1 -->
+				<!-- YARN -->
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
-					<artifactId>hadoop-core</artifactId>
+					<artifactId>hadoop-common</artifactId>
 				</dependency>
 			</dependencies>
 		</profile>
diff --git a/pact/pom.xml b/pact/pom.xml
index cfa365b7e75..508877abbd8 100644
--- a/pact/pom.xml
+++ b/pact/pom.xml
@@ -26,6 +26,17 @@
 	<developers>
 	</developers>
 
+	<modules>
+		<module>pact-common</module>
+		<module>pact-runtime</module>
+		<module>pact-compiler</module>
+		<module>pact-compiler-tests</module>
+		<module>pact-clients</module>
+		<module>pact-examples</module>
+		<module>pact-tests</module>
+		<module>pact-array-datamodel</module>
+	</modules>
+
 	<properties>
 	</properties>
 
@@ -63,32 +74,30 @@
 
 		</plugins>
 	</build>
-
-	<modules>
-		<module>pact-common</module>
-		<module>pact-runtime</module>
-		<module>pact-compiler</module>
-		<module>pact-compiler-tests</module>
-		<module>pact-clients</module>
-		<module>pact-examples</module>
-		<module>pact-tests</module>
-		<module>pact-array-datamodel</module>
-	</modules>
 	
+	<!-- See main pom.xml for explanation of profiles -->
 	<profiles>
 		<profile>
-			<id>hadoop_yarn</id>
+			<id>hadoop-1</id>
+			<activation>
+				<property>
+					<name>!hadoop.profile</name>
+				</property>
+			</activation>
 			<modules>
-				<module>pact-hbase</module>
+				<!-- No extra modules: pact-hbase is currently not compatible with Hadoop v1 -->
 			</modules>
 		</profile>
 		<profile>
-			<id>hadoop_v1</id>
+			<id>hadoop-2</id>
 			<activation>
-				<activeByDefault>true</activeByDefault>
+				<property>
+					<name>hadoop.profile</name>
+					<value>2</value>
+				</property>
 			</activation>
 			<modules>
-				<!-- No extra modules: pact-hbase is currently not compatible with Hadoop v1 -->
+				<module>pact-hbase</module>
 			</modules>
 		</profile>
 	</profiles>
diff --git a/pom.xml b/pom.xml
index 95b2114a2ce..fa3e48f57a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,9 +24,17 @@
 	<developers>
 	</developers>
 
+	<modules>
+		<module>nephele</module>
+		<module>pact</module>
+		<module>stratosphere-dist</module>
+	</modules>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<hadoop-one.version>1.2.1</hadoop-one.version>
+		<hadoop-two.version>2.0.0-cdh4.2.1</hadoop-two.version>
 	</properties>
 
 	<pluginRepositories>
@@ -121,53 +129,50 @@
 		
 	</dependencies>
 
-	<!--
-		Usage of profiles for various hadoop versions:
-		Profile hadoop-yarn is active by default.
-		It will be deactivated whenever another profile becomes active in this pom
-
-		How to build for yarn using a specific version
-		- Call: mvn -Dhadoop.version=<version> <goal>
-
-		How to build for hadoop v1 (will use hadoop-core):
-		- Call: mvn -Phadoop_v1 -Dhadoop.version=<hadoop-version> <goal>
-	-->
 	<profiles>
 		<profile>
-			<id>hadoop_yarn</id>
+			<id>hadoop-1</id>
+			<activation>
+				<property>
+					<name>!hadoop.profile</name>
+				</property>
+			</activation>
 			<properties>
-				<hadoop.version>2.0.0-cdh4.2.1</hadoop.version>
+				<hadoop.version>${hadoop-one.version}</hadoop.version>
 			</properties>
 			<dependencyManagement>
 				<dependencies>
-					<!-- YARN -->
-					<dependency>
-						<groupId>org.apache.hadoop</groupId>
-						<artifactId>hadoop-common</artifactId>
-						<version>${hadoop.version}</version>
-					</dependency>
+					<!-- "Old" stable Hadoop = MapReduce v1 -->
 					<dependency>
 						<groupId>org.apache.hadoop</groupId>
-						<artifactId>hadoop-hdfs</artifactId>
+						<artifactId>hadoop-core</artifactId>
 						<version>${hadoop.version}</version>
 					</dependency>
 				</dependencies>
 			</dependencyManagement>
 		</profile>
 		<profile>
-			<id>hadoop_v1</id>
+			<id>hadoop-2</id>
 			<activation>
-				<activeByDefault>true</activeByDefault>
+				<property>
+					<name>hadoop.profile</name>
+					<value>2</value>
+				</property>
 			</activation>
 			<properties>
-				<hadoop.version>1.2.1</hadoop.version>
+				<hadoop.version>${hadoop-two.version}</hadoop.version>
 			</properties>
 			<dependencyManagement>
 				<dependencies>
-					<!-- "Old" Hadoop = MapReduce v1 -->
+					<!-- YARN -->
 					<dependency>
 						<groupId>org.apache.hadoop</groupId>
-						<artifactId>hadoop-core</artifactId>
+						<artifactId>hadoop-common</artifactId>
+						<version>${hadoop.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.hadoop</groupId>
+						<artifactId>hadoop-hdfs</artifactId>
 						<version>${hadoop.version}</version>
 					</dependency>
 				</dependencies>
@@ -414,10 +419,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
-	<modules>
-		<module>nephele</module>
-		<module>pact</module>
-		<module>stratosphere-dist</module>
-	</modules>
 </project>
diff --git a/stratosphere-dist/pom.xml b/stratosphere-dist/pom.xml
index a0c1e2476e5..92502233558 100644
--- a/stratosphere-dist/pom.xml
+++ b/stratosphere-dist/pom.xml
@@ -96,23 +96,30 @@
 	<!-- See main pom.xml for explanation of profiles -->
 	<profiles>
 		<profile>
-			<id>hadoop_yarn</id>
+			<id>hadoop-1</id>
+			<activation>
+				<property>
+					<name>!hadoop.profile</name>
+				</property>
+			</activation>
 			<dependencies>
-				<dependency>
-					<groupId>eu.stratosphere</groupId>
-					<artifactId>pact-hbase</artifactId>
-					<version>${project.version}</version>
-				</dependency>
+				<!-- No extra dependencies: pact-hbase is currently not compatible with Hadoop v1 -->
 			</dependencies>
 		</profile>
-		
 		<profile>
-			<id>hadoop_v1</id>
+			<id>hadoop-2</id>
 			<activation>
-				<activeByDefault>true</activeByDefault>
+				<property>
+					<name>hadoop.profile</name>
+					<value>2</value>
+				</property>
 			</activation>
 			<dependencies>
-        		<!-- No extra dependencies: pact-hbase is currently not compatible with Hadoop v1 -->
+				<dependency>
+					<groupId>eu.stratosphere</groupId>
+					<artifactId>pact-hbase</artifactId>
+					<version>${project.version}</version>
+				</dependency>
 			</dependencies>
 		</profile>
 	</profiles>
-- 
GitLab