Skip to content

Commit 3362348

Browse files
authored
DRILL-8533: Remove Hadoop 2 Support (#3018)
1 parent fa615a5 commit 3362348

5 files changed

Lines changed: 3 additions & 736 deletions

File tree

contrib/storage-phoenix/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -386,22 +386,6 @@
386386
</plugins>
387387
</build>
388388
<profiles>
389-
<profile>
390-
<id>hadoop-2</id>
391-
<properties>
392-
<skipTests>true</skipTests>
393-
</properties>
394-
<build>
395-
<plugins>
396-
<plugin>
397-
<groupId>org.apache.felix</groupId>
398-
<artifactId>maven-bundle-plugin</artifactId>
399-
<version>5.1.9</version>
400-
<extensions>true</extensions>
401-
</plugin>
402-
</plugins>
403-
</build>
404-
</profile>
405389
<profile>
406390
<!-- Disable unit tests for JDK 14+ until Phoenix 5.2.0+ is released.
407391
See PHOENIX-6723 for details.-->

docs/dev/Maven.md

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ Please make sure the names are concise, unique and easy to read.
3131

3232
## drill-jdbc-all JAR maxsize
3333

34-
The file drill-jdbc-all-${project.version}.jar is outside the expected size range.
35-
This is likely due to you adding new dependencies to a java-exec and not updating the excludes in this module.
34+
The file drill-jdbc-all-${project.version}.jar is outside the expected size range.
35+
This is likely due to you adding new dependencies to a java-exec and not updating the excludes in this module.
3636
This is important as it minimizes the size of the dependency of Drill application users.
3737

38-
The maxsize of the jar can be configured via `jdbc-all-jar.maxsize` property
38+
The maxsize of the jar can be configured via `jdbc-all-jar.maxsize` property
3939
in [drill-jdbc-all](../../exec/jdbc-all/pom.xml)
4040

4141
## Maven profiles
@@ -49,15 +49,3 @@ To check the list of active Maven profiles:<br>
4949
```
5050
mvn help:active-profiles
5151
```
52-
53-
### Hadoop 2
54-
55-
To run Apache Drill on the Hadoop2 cluster [r2.4.1-r2.9.2](https://hadoop.apache.org/docs/) need to prepare
56-
the Drill distribution by building the project with `hadoop-2` profile:
57-
```
58-
mvn clean install -Phadoop-2
59-
```
60-
or
61-
```
62-
mvn clean install -P hadoop-2
63-
```

exec/java-exec/pom.xml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -668,28 +668,6 @@
668668
</dependency>
669669
</dependencies>
670670
</profile>
671-
<profile>
672-
<id>hadoop-2</id>
673-
<build>
674-
<plugins>
675-
<plugin>
676-
<groupId>org.apache.maven.plugins</groupId>
677-
<artifactId>maven-surefire-plugin</artifactId>
678-
<configuration>
679-
<excludes>
680-
<!-- The following tests are flaky when run in the full Hadoop 2 CI. -->
681-
<exclude>**/TestBitBitKerberos.java</exclude>
682-
<exclude>**/TestUserBitKerberos.java</exclude>
683-
<exclude>**/TestUserBitKerberosEncryption.java</exclude>
684-
<exclude>**/TestDrillSpnegoAuthenticator.java</exclude>
685-
<exclude>**/TestSpnegoAuthentication.java</exclude>
686-
<exclude>**/TestSpnegoConfig.java</exclude>
687-
</excludes>
688-
</configuration>
689-
</plugin>
690-
</plugins>
691-
</build>
692-
</profile>
693671
<profile>
694672
<id>hdp</id>
695673
<dependencies>

exec/jdbc-all/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -900,12 +900,6 @@
900900
</plugins>
901901
</build>
902902
</profile>
903-
<profile>
904-
<id>hadoop-2</id>
905-
<properties>
906-
<jdbc-all-jar.maxsize>55000000</jdbc-all-jar.maxsize>
907-
</properties>
908-
</profile>
909903
</profiles>
910904

911905
</project>

0 commit comments

Comments
 (0)