Skip to content

Commit 12e3886

Browse files
gflgfl
committed
Merge pull request #21 from technotring/CDH5.2.1
#20 Upgraded CDH from 5.1.0 to 5.2.1
2 parents 60e2de2 + 0514c9a commit 12e3886

File tree

1 file changed

+14
-111
lines changed

1 file changed

+14
-111
lines changed

‎pom.xml‎

Lines changed: 14 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,38 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
33
http://maven.apache.org/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
65
<organization>
76
<name>Parallel AI</name>
87
<url>http://www.parallelai.com</url>
98
</organization>
10-
119
<name>Cascading and Scalding wrapper for HBase with advanced features</name>
1210
<groupId>parallelai</groupId>
1311
<artifactId>parallelai.spyglass</artifactId>
14-
<version>2.10_0.10_CDH5_4.4</version>
12+
<version>2.10_0.10_CDH5.2.1_4.4</version>
1513
<packaging>jar</packaging>
1614

1715
<properties>
18-
<!-- UTF-8 Encoding settings -->
1916
<encoding>UTF-8</encoding>
2017
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2118
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
22-
23-
<!-- Java compilation level -->
24-
<maven.compiler.source>1.6</maven.compiler.source>
25-
<maven.compiler.target>1.6</maven.compiler.target>
26-
27-
<!-- Maven -->
19+
<maven.compiler.source>1.7</maven.compiler.source>
20+
<maven.compiler.target>1.7</maven.compiler.target>
2821
<maven-compiler-plugin.version>3.0</maven-compiler-plugin.version>
2922
<maven-scala-plugin.version>2.15.2</maven-scala-plugin.version>
3023
<maven.surefire.plugin.version>2.12.3</maven.surefire.plugin.version>
31-
32-
<cdh.version>cdh5.1.0</cdh.version>
33-
34-
<hadoop.version>2.3.0-${cdh.version}</hadoop.version>
35-
<hadoop.core.version>2.3.0-mr1-${cdh.version}</hadoop.core.version>
36-
<hbase.version>0.98.1-${cdh.version}</hbase.version>
37-
38-
<!-- Scala/Scalding/Cascading properties -->
39-
<!-- can be 2.9.3 and 2.10.2 -->
24+
<cdh.version>cdh5.2.1</cdh.version>
25+
<hadoop.version>2.5.0-${cdh.version}</hadoop.version>
26+
<hbase.version>0.98.6-${cdh.version}</hbase.version>
4027
<scala.version>2.10.3</scala.version>
41-
<!-- 2.10 for Scala 2.10.2 and 2.9.3 for Scala version 2.9.3 -->
4228
<scalding.scala.version>2.10</scalding.scala.version>
4329
<scalding.version>0.10.0</scalding.version>
4430
<scalatest.version>2.2.0</scalatest.version>
45-
46-
<!-- 2.1.1 for Scala 2.10.2 and 1.12.4.1 for Scala 2.9.3-->
4731
<specs2.version>2.1.1</specs2.version>
4832
<typesafe.config.version>1.0.0</typesafe.config.version>
49-
50-
<!-- Other libraries properties -->
5133
<junit.version>4.10</junit.version>
5234
<slf4j.version>1.7.2</slf4j.version>
53-
5435
</properties>
5536

56-
<!-- Repositories -->
5737
<repositories>
5838
<repository>
5939
<id>scala-tools.org</id>
@@ -72,113 +52,42 @@
7252
</repository>
7353
</repositories>
7454

75-
<!-- Profiles
76-
<profiles>
77-
<profile>
78-
<id>windows_profile</id>
79-
<activation>
80-
<activeByDefault>false</activeByDefault>
81-
<os>
82-
<family>Windows</family>
83-
</os>
84-
</activation>
85-
<properties>
86-
<toolsjar>${JAVA_HOME}\\lib\\tools.jar</toolsjar>
87-
</properties>
88-
<dependencies>
89-
<dependency>
90-
<groupId>jdk.tools</groupId>
91-
<artifactId>jdk.tools</artifactId>
92-
<version>1.6</version>
93-
<scope>system</scope>
94-
<systemPath>${toolsjar}</systemPath>
95-
</dependency>
96-
</dependencies>
97-
</profile>
98-
<profile>
99-
<id>osx_profile</id>
100-
<activation>
101-
<activeByDefault>false</activeByDefault>
102-
<os>
103-
<family>mac</family>
104-
</os>
105-
</activation>
106-
<properties>
107-
<toolsjar>${java.home}/../Classes/classes.jar</toolsjar>
108-
</properties>
109-
<dependencies>
110-
<dependency>
111-
<groupId>jdk.tools</groupId>
112-
<artifactId>jdk.tools</artifactId>
113-
<version>1.6</version>
114-
<scope>system</scope>
115-
<systemPath>${toolsjar}</systemPath>
116-
</dependency>
117-
</dependencies>
118-
</profile>
119-
</profiles>-->
120-
121-
12255
<dependencies>
12356
<dependency>
12457
<groupId>org.scala-lang</groupId>
12558
<artifactId>scala-library</artifactId>
12659
<version>${scala.version}</version>
12760
</dependency>
128-
129-
<!-- Scalding -->
13061
<dependency>
13162
<groupId>com.twitter</groupId>
13263
<artifactId>scalding-core_${scalding.scala.version}</artifactId>
13364
<version>${scalding.version}</version>
13465
</dependency>
135-
136-
<!-- Hadoop -->
13766
<dependency>
13867
<groupId>org.apache.hadoop</groupId>
139-
<artifactId>hadoop-core</artifactId>
140-
<version>${hadoop.core.version}</version>
141-
</dependency>
142-
<dependency>
143-
<groupId>org.apache.hadoop</groupId>
144-
<artifactId>hadoop-common</artifactId>
68+
<artifactId>hadoop-client</artifactId>
14569
<version>${hadoop.version}</version>
14670
</dependency>
147-
148-
<!-- HBase -->
14971
<dependency>
15072
<groupId>org.apache.hbase</groupId>
15173
<artifactId>hbase-server</artifactId>
15274
<version>${hbase.version}</version>
15375
</dependency>
154-
<dependency>
155-
<groupId>org.apache.hbase</groupId>
156-
<artifactId>hbase-common</artifactId>
157-
<version>${hbase.version}</version>
158-
</dependency>
159-
<dependency>
160-
<groupId>org.apache.hbase</groupId>
161-
<artifactId>hbase-client</artifactId>
162-
<version>${hbase.version}</version>
163-
</dependency>
164-
<dependency>
165-
<groupId>org.apache.hbase</groupId>
166-
<artifactId>hbase-protocol</artifactId>
167-
<version>${hbase.version}</version>
168-
</dependency>
169-
17076
<dependency>
17177
<groupId>org.slf4j</groupId>
17278
<artifactId>slf4j-api</artifactId>
17379
<version>${slf4j.version}</version>
17480
</dependency>
175-
81+
<dependency>
82+
<groupId>com.jcraft</groupId>
83+
<artifactId>jsch</artifactId>
84+
<version>0.1.51</version>
85+
</dependency>
17686
<dependency>
17787
<groupId>com.typesafe</groupId>
17888
<artifactId>config</artifactId>
17989
<version>${typesafe.config.version}</version>
18090
</dependency>
181-
18291
<dependency>
18392
<groupId>com.twitter.elephantbird</groupId>
18493
<artifactId>elephant-bird-core</artifactId>
@@ -188,9 +97,7 @@
18897
<groupId>com.twitter.elephantbird</groupId>
18998
<artifactId>elephant-bird-hadoop-compat</artifactId>
19099
<version>4.1</version>
191-
</dependency>
192-
193-
<!-- Testing dependencies (ScalaSpec / ScalaTest / JUnit) -->
100+
</dependency>
194101
<dependency>
195102
<groupId>org.specs2</groupId>
196103
<artifactId>specs2_${scalding.scala.version}</artifactId>
@@ -215,7 +122,6 @@
215122
<build>
216123
<sourceDirectory>src/main/java</sourceDirectory>
217124
<testSourceDirectory>src/test/scala</testSourceDirectory>
218-
<!-- From https://wiki.scala-lang.org/display/SIW/ScalaEclipseMaven -->
219125
<plugins>
220126
<plugin>
221127
<groupId>org.apache.maven.plugins</groupId>
@@ -287,7 +193,6 @@
287193
</goals>
288194
<configuration>
289195
<outputDirectory>./alternateLocation</outputDirectory>
290-
<!-- ${project.build.directory} -->
291196
<overWriteReleases>false</overWriteReleases>
292197
<overWriteSnapshots>false</overWriteSnapshots>
293198
<overWriteIfNewer>true</overWriteIfNewer>
@@ -298,7 +203,6 @@
298203
</plugins>
299204
<pluginManagement>
300205
<plugins>
301-
<!--Run with : mvn dependency:copy-dependencies -->
302206
<plugin>
303207
<groupId>org.eclipse.m2e</groupId>
304208
<artifactId>lifecycle-mapping</artifactId>
@@ -371,5 +275,4 @@
371275
</plugins>
372276
</pluginManagement>
373277
</build>
374-
375-
</project>
278+
</project>

0 commit comments

Comments
 (0)