Switched to CDH4 MR1.

LinkedInAttic · Jan 8, 2014 · 1763072 · 1763072
1 parent 67381bd
commit 1763072
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 4 deletions.
diff --git a/camus-api/pom.xml b/camus-api/pom.xml
@@ -17,6 +17,10 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+    </dependency>
   </dependencies>
 
 

diff --git a/camus-etl-kafka/pom.xml b/camus-etl-kafka/pom.xml
@@ -31,6 +31,12 @@
 		<dependency>
 			<groupId>org.apache.hadoop</groupId>
 			<artifactId>hadoop-core</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-common</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>kafka</groupId>
@@ -87,6 +93,28 @@
  						</execution> 
  				</executions> 
 			</plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <archive>
+            <manifest>
+              <mainClass></mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 		</plugins>
 	</build>
 

diff --git a/camus-example/pom.xml b/camus-example/pom.xml
@@ -32,6 +32,12 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+			<scope>provided</scope>
     </dependency>
   </dependencies>
 

diff --git a/camus-example/src/main/resources/org-xerial-snappy.properties b/camus-example/src/main/resources/org-xerial-snappy.properties
@@ -0,0 +1,2 @@
+org.xerial.snappy.use.systemlib=false
+org.xerial.snappy.disable.bundled.libs=false
diff --git a/lib/kafka-0.8-SNAPSHOT.jar b/lib/kafka-0.8-SNAPSHOT.jar
diff --git a/lib/kafka-0.8-SNAPSHOT.xml b/lib/kafka-0.8-SNAPSHOT.xml
@@ -5,7 +5,7 @@
     <artifactId>kafka_2.10</artifactId>
     <packaging>jar</packaging>
     <description>kafka</description>
-    <version>0.8.0</version>
+    <version>0.8.1</version>
     <name>kafka</name>
     <organization>
         <name>org.apache.kafka</name>

diff --git a/pom.xml b/pom.xml
@@ -76,13 +76,21 @@
 			<dependency>
 				<groupId>org.apache.hadoop</groupId>
 				<artifactId>hadoop-core</artifactId>
-				<version>1.2.1</version>
-				<scope>provided</scope>
+				<version>2.0.0-mr1-cdh4.5.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.hadoop</groupId>
+				<artifactId>hadoop-common</artifactId>
+				<version>2.0.0-cdh4.5.0</version>
 			</dependency>
 			<dependency>
 				<groupId>kafka</groupId>
 				<artifactId>kafka</artifactId>
 				<version>0.8-SNAPSHOT</version>
+				<!--<exclusion>
+					<groupId>org.xerial.snappy</groupId>
+					<artifactId>snappy-java</artifactId>
+				</exclusion>-->
 			</dependency>
 			<dependency>
 				<groupId>com.github.sgroschupf</groupId>
@@ -110,7 +118,6 @@
 				<groupId>org.xerial.snappy</groupId>
 				<artifactId>snappy-java</artifactId>
 				<version>1.0.4.1</version>
-				<scope>provided</scope>
 			</dependency>
 
 		</dependencies>
@@ -148,6 +155,10 @@
 			<id>apache-releases</id>
 			<url>https://repository.apache.org/content/groups/public</url>
 		</repository>
+		<repository>
+			<id>cloudera</id>
+			<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
+		</repository>
 	</repositories>
 
 	<build>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		org.xerial.snappy.use.systemlib=false
		org.xerial.snappy.disable.bundled.libs=false