From c857301588d9443d0c09e04dc5eef7cac3f24586 Mon Sep 17 00:00:00 2001
From: habernal <habernal@users.noreply.github.com>
Date: Wed, 8 Jul 2015 15:06:20 +0200
Subject: [PATCH]  #13 Updating hadoop.version -> removing dependency to 1.2.x
 from mahout

---
 .../pom.xml                                   | 262 +++++++++---------
 1 file changed, 136 insertions(+), 126 deletions(-)

diff --git a/de.tudarmstadt.ukp.dkpro.bigdata.collocations/pom.xml b/de.tudarmstadt.ukp.dkpro.bigdata.collocations/pom.xml
index f5ff45d..7fa1c2d 100644
--- a/de.tudarmstadt.ukp.dkpro.bigdata.collocations/pom.xml
+++ b/de.tudarmstadt.ukp.dkpro.bigdata.collocations/pom.xml
@@ -15,144 +15,154 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-		<parent>
+	<parent>
 		<groupId>de.tudarmstadt.ukp.dkpro.bigdata</groupId>
 		<artifactId>de.tudarmstadt.ukp.dkpro.bigdata</artifactId>
 		<version>0.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
-		</parent>
+	</parent>
 	<artifactId>de.tudarmstadt.ukp.dkpro.bigdata.collocations</artifactId>
 	<name>dkpro collocations</name>
 	<description>compute collocations on the cluster</description>
-  <dependencies>
-  	<dependency> 
-  		<groupId>de.tudarmstadt.ukp.dkpro.bigdata</groupId>
-  		<artifactId>
-  			de.tudarmstadt.ukp.dkpro.bigdata.hadoop 
-  		</artifactId> 
-  		</dependency>
-  	<dependency>
-  		<groupId>de.tudarmstadt.ukp.dkpro.bigdata</groupId>
-  		<artifactId>
-  			de.tudarmstadt.ukp.dkpro.bigdata.io.hadoop
-  		</artifactId>
-  	
-  	</dependency>
-  	<dependency>
-  		<groupId>org.apache.hadoop</groupId>
-  		<artifactId>hadoop-client</artifactId>
-  		<version>${hadoop.version}</version>
-  		<scope>provided</scope>
-  	</dependency>
-  	<dependency>
-  		<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-  		<artifactId>
-  			de.tudarmstadt.ukp.dkpro.core.io.text-asl
-  		</artifactId>
-  	</dependency> 	
-  			
-  			<dependency>
-  				<groupId>org.apache.mahout</groupId>
-  				<artifactId>mahout-core</artifactId>
-  				<version>0.7</version>
-  				<exclusions>
-  					<exclusion>
-  						<artifactId>jfreechart</artifactId>
-  						<groupId>jfree</groupId>
-  					</exclusion>
-  				</exclusions>
-  			</dependency>
-  			<dependency>
-  				<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-  				<artifactId>
-  					de.tudarmstadt.ukp.dkpro.core.api.segmentation-asl
-  				</artifactId>
-  			
-  			</dependency>
-  </dependencies><build><plugins>
-     <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-        	<plugin>
-						<groupId>org.apache.rat</groupId>
-						<artifactId>apache-rat-plugin</artifactId>
-	
-								<configuration>
-									<excludes>
-										<exclude>.gitignore</exclude>
-										<exclude>pom.xml</exclude>
-										<!-- maven config files -->
-										<exclude>src/filter/**/*</exclude>
-										<!-- release generated artifact -->
-										<exclude>release.properties</exclude>
-										<exclude>CHANGES</exclude>
-											<exclude>AUTHORS</exclude>
-										<exclude>LICENCE.txt</exclude>
-										<exclude>MANIFEST.MF</exclude>
-										<exclude>NOTICE.txt</exclude>
-										<exclude>README.txt</exclude>
-										<exclude>src/main/resources/**/*</exclude>
-										<exclude>src/test/resources/**/*</exclude>
-										<!-- generated JCas wrappers -->
-										<exclude>src/main/java/**/type/**/*</exclude>
-									</excludes>
-								</configuration>
-					</plugin>
-			
-      </plugins>
-	
-	<pluginManagement>
+	<dependencies>
+		<dependency>
+			<groupId>de.tudarmstadt.ukp.dkpro.bigdata</groupId>
+			<artifactId>
+				de.tudarmstadt.ukp.dkpro.bigdata.hadoop
+			</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>de.tudarmstadt.ukp.dkpro.bigdata</groupId>
+			<artifactId>
+				de.tudarmstadt.ukp.dkpro.bigdata.io.hadoop
+			</artifactId>
+
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-client</artifactId>
+			<version>${hadoop.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
+			<artifactId>
+				de.tudarmstadt.ukp.dkpro.core.io.text-asl
+			</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.mahout</groupId>
+			<artifactId>mahout-core</artifactId>
+			<!--<version>0.7</version>-->
+			<version>0.9</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>jfreechart</artifactId>
+					<groupId>jfree</groupId>
+				</exclusion>
+				<exclusion>
+					<!-- still refers to 1.2.X version of hadoop -->
+					<groupId>org.apache.hadoop</groupId>
+					<artifactId>hadoop-core</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
+			<artifactId>
+				de.tudarmstadt.ukp.dkpro.core.api.segmentation-asl
+			</artifactId>
+
+		</dependency>
+	</dependencies>
+	<build>
 		<plugins>
-			<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
 			<plugin>
-				<groupId>org.eclipse.m2e</groupId>
-				<artifactId>lifecycle-mapping</artifactId>
-				<version>1.0.0</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>false</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-plugin</artifactId>
+
 				<configuration>
-					<lifecycleMappingMetadata>
-						<pluginExecutions>
-							<pluginExecution>
-								<pluginExecutionFilter>
-									<groupId>
-										org.apache.maven.plugins
-									</groupId>
-									<artifactId>
-										maven-dependency-plugin
-									</artifactId>
-									<versionRange>
-										[2.5.1,)
-									</versionRange>
-									<goals>
-										<goal>copy-dependencies</goal>
-									</goals>
-								</pluginExecutionFilter>
-								<action>
-									<ignore />
-								</action>
-							</pluginExecution>
-						</pluginExecutions>
-					</lifecycleMappingMetadata>
+					<excludes>
+						<exclude>.gitignore</exclude>
+						<exclude>pom.xml</exclude>
+						<!-- maven config files -->
+						<exclude>src/filter/**/*</exclude>
+						<!-- release generated artifact -->
+						<exclude>release.properties</exclude>
+						<exclude>CHANGES</exclude>
+						<exclude>AUTHORS</exclude>
+						<exclude>LICENCE.txt</exclude>
+						<exclude>MANIFEST.MF</exclude>
+						<exclude>NOTICE.txt</exclude>
+						<exclude>README.txt</exclude>
+						<exclude>src/main/resources/**/*</exclude>
+						<exclude>src/test/resources/**/*</exclude>
+						<!-- generated JCas wrappers -->
+						<exclude>src/main/java/**/type/**/*</exclude>
+					</excludes>
 				</configuration>
 			</plugin>
+
 		</plugins>
-	</pluginManagement>
-</build>
+
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-dependency-plugin
+										</artifactId>
+										<versionRange>
+											[2.5.1,)
+										</versionRange>
+										<goals>
+											<goal>copy-dependencies</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore/>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 </project>
\ No newline at end of file