Skip to content

Commit 9d4f5a0

Browse files
sjrandrobert3005
authored andcommitted
Upgrade hadoop to 2.8.0-palantir3 (#145)
1 parent 08f044c commit 9d4f5a0

File tree

5 files changed

+19
-98
lines changed

5 files changed

+19
-98
lines changed

core/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@
5858
<groupId>org.apache.hadoop</groupId>
5959
<artifactId>hadoop-client</artifactId>
6060
</dependency>
61-
<dependency>
62-
<groupId>org.apache.hadoop</groupId>
63-
<artifactId>hadoop-hdfs</artifactId>
64-
</dependency>
6561
<dependency>
6662
<groupId>org.apache.spark</groupId>
6763
<artifactId>spark-launcher_${scala.binary.version}</artifactId>

dev/deps/spark-deps-hadoop-palantir

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,25 @@ gson-2.2.4.jar
6868
guava-14.0.1.jar
6969
guice-3.0.jar
7070
guice-servlet-3.0.jar
71-
hadoop-annotations-2.8.0-palantir2.jar
72-
hadoop-auth-2.8.0-palantir2.jar
73-
hadoop-client-2.8.0-palantir2.jar
74-
hadoop-common-2.8.0-palantir2.jar
75-
hadoop-hdfs-2.8.0-palantir2.jar
76-
hadoop-hdfs-client-2.8.0-palantir2.jar
77-
hadoop-mapreduce-client-app-2.8.0-palantir2.jar
78-
hadoop-mapreduce-client-common-2.8.0-palantir2.jar
79-
hadoop-mapreduce-client-core-2.8.0-palantir2.jar
80-
hadoop-mapreduce-client-jobclient-2.8.0-palantir2.jar
81-
hadoop-mapreduce-client-shuffle-2.8.0-palantir2.jar
82-
hadoop-yarn-api-2.8.0-palantir2.jar
83-
hadoop-yarn-client-2.8.0-palantir2.jar
84-
hadoop-yarn-common-2.8.0-palantir2.jar
85-
hadoop-yarn-server-common-2.8.0-palantir2.jar
86-
hadoop-yarn-server-web-proxy-2.8.0-palantir2.jar
71+
hadoop-annotations-2.8.0-palantir3.jar
72+
hadoop-auth-2.8.0-palantir3.jar
73+
hadoop-client-2.8.0-palantir3.jar
74+
hadoop-common-2.8.0-palantir3.jar
75+
hadoop-hdfs-2.8.0-palantir3.jar
76+
hadoop-hdfs-client-2.8.0-palantir3.jar
77+
hadoop-mapreduce-client-app-2.8.0-palantir3.jar
78+
hadoop-mapreduce-client-common-2.8.0-palantir3.jar
79+
hadoop-mapreduce-client-core-2.8.0-palantir3.jar
80+
hadoop-mapreduce-client-jobclient-2.8.0-palantir3.jar
81+
hadoop-mapreduce-client-shuffle-2.8.0-palantir3.jar
82+
hadoop-yarn-api-2.8.0-palantir3.jar
83+
hadoop-yarn-client-2.8.0-palantir3.jar
84+
hadoop-yarn-common-2.8.0-palantir3.jar
85+
hadoop-yarn-server-common-2.8.0-palantir3.jar
86+
hadoop-yarn-server-web-proxy-2.8.0-palantir3.jar
8787
hk2-api-2.4.0-b34.jar
8888
hk2-locator-2.4.0-b34.jar
8989
hk2-utils-2.4.0-b34.jar
90-
hpack-0.11.0.jar
9190
htrace-core4-4.0.1-incubating.jar
9291
httpclient-4.5.2.jar
9392
httpcore-4.4.4.jar
@@ -204,7 +203,6 @@ super-csv-2.2.0.jar
204203
univocity-parsers-2.2.1.jar
205204
validation-api-1.1.0.Final.jar
206205
xbean-asm5-shaded-4.4.jar
207-
xercesImpl-2.9.1.jar
208206
xmlenc-0.52.jar
209207
xz-1.0.jar
210208
zjsonpatch-0.3.0.jar

dev/publish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ make_dist() {
2727
}
2828

2929
publish_artifacts
30-
make_dist hadoop-2.8.0-palantir2 "${PALANTIR_FLAGS[*]}" --clean
30+
make_dist hadoop-2.8.0-palantir3 "${PALANTIR_FLAGS[*]}" --clean
3131
make_dist without-hadoop "-Phadoop-provided -Pkubernetes -Pmesos -Pyarn -Psparkr" --clean

dists/hadoop-palantir/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<sbt.project.name>spark-dist-hadoop-palantir</sbt.project.name>
3535
<build.testJarPhase>none</build.testJarPhase>
3636
<build.copyDependenciesPhase>none</build.copyDependenciesPhase>
37-
<hadoop.version>2.8.0-palantir2</hadoop.version>
37+
<hadoop.version>2.8.0-palantir3</hadoop.version>
3838
</properties>
3939

4040
<dependencyManagement>

pom.xml

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -918,79 +918,6 @@
918918
</exclusion>
919919
</exclusions>
920920
</dependency>
921-
<!-- TODO (srand) Remove this when https://issues.apache.org/jira/browse/HDFS-11431 is fixed -->
922-
<dependency>
923-
<groupId>org.apache.hadoop</groupId>
924-
<artifactId>hadoop-hdfs</artifactId>
925-
<version>${hadoop.version}</version>
926-
<scope>${hadoop.deps.scope}</scope>
927-
<exclusions>
928-
<exclusion>
929-
<groupId>asm</groupId>
930-
<artifactId>asm</artifactId>
931-
</exclusion>
932-
<exclusion>
933-
<groupId>org.codehaus.jackson</groupId>
934-
<artifactId>jackson-mapper-asl</artifactId>
935-
</exclusion>
936-
<exclusion>
937-
<groupId>org.ow2.asm</groupId>
938-
<artifactId>asm</artifactId>
939-
</exclusion>
940-
<exclusion>
941-
<groupId>org.jboss.netty</groupId>
942-
<artifactId>netty</artifactId>
943-
</exclusion>
944-
<exclusion>
945-
<groupId>io.netty</groupId>
946-
<artifactId>netty</artifactId>
947-
</exclusion>
948-
<exclusion>
949-
<groupId>io.netty</groupId>
950-
<artifactId>netty-all</artifactId>
951-
</exclusion>
952-
<exclusion>
953-
<groupId>commons-daemon</groupId>
954-
<artifactId>commons-daemon</artifactId>
955-
</exclusion>
956-
<exclusion>
957-
<groupId>commons-net</groupId>
958-
<artifactId>commons-net</artifactId>
959-
</exclusion>
960-
<exclusion>
961-
<groupId>commons-logging</groupId>
962-
<artifactId>commons-logging</artifactId>
963-
</exclusion>
964-
<exclusion>
965-
<groupId>org.mockito</groupId>
966-
<artifactId>mockito-all</artifactId>
967-
</exclusion>
968-
<exclusion>
969-
<groupId>org.mortbay.jetty</groupId>
970-
<artifactId>servlet-api-2.5</artifactId>
971-
</exclusion>
972-
<exclusion>
973-
<groupId>javax.servlet</groupId>
974-
<artifactId>servlet-api</artifactId>
975-
</exclusion>
976-
<exclusion>
977-
<groupId>junit</groupId>
978-
<artifactId>junit</artifactId>
979-
</exclusion>
980-
<exclusion>
981-
<groupId>com.sun.jersey</groupId>
982-
<artifactId>*</artifactId>
983-
</exclusion>
984-
<exclusion>
985-
<groupId>com.sun.jersey.jersey-test-framework</groupId>
986-
<artifactId>*</artifactId>
987-
</exclusion>
988-
<exclusion>
989-
<groupId>com.sun.jersey.contribs</groupId>
990-
<artifactId>*</artifactId>
991-
</exclusion>
992-
</exclusions>
993-
</dependency>
994921
<dependency>
995922
<groupId>org.apache.avro</groupId>
996923
<artifactId>avro</artifactId>
@@ -2656,7 +2583,7 @@
26562583
<profile>
26572584
<id>hadoop-palantir</id>
26582585
<properties>
2659-
<hadoop.version>2.8.0-palantir2</hadoop.version>
2586+
<hadoop.version>2.8.0-palantir3</hadoop.version>
26602587
<curator.version>2.7.1</curator.version>
26612588
</properties>
26622589
</profile>

0 commit comments

Comments
 (0)