Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DRILL-8436: Upgrade Hadoop 3.2.4 → 3.3.6 #2821

Merged
merged 6 commits into from
Aug 25, 2023
Merged

DRILL-8436: Upgrade Hadoop 3.2.4 → 3.3.6 #2821

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa118f9
Upgrade Hadoop to 3.3.6.
jnturton Aug 11, 2023
c56f562
Update jersey-json coordindates for Hadoop 3.3.6.
jnturton Aug 17, 2023
06030de
Allow Netty in test scope in storage-hive.
jnturton Aug 17, 2023
4aeb152
Override class names in hadoop-common's core-default.xml for relocati…
jnturton Aug 22, 2023
e1d23af
Upgrade Apache Phoenix libs to 5.1.3
jnturton Aug 24, 2023
e16eca4
Purely aesthetic fixes to two pom.xml files.
jnturton Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions contrib/storage-hive/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@
<artifactId>hadoop-mapreduce-client-core</artifactId>
<groupId>org.apache.hadoop</groupId>
</exclusion>
<exclusion>
<artifactId>hadoop-hdfs-client</artifactId>
<groupId>org.apache.hadoop</groupId>
</exclusion>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand Down Expand Up @@ -285,14 +289,6 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</exclusion>
<exclusion>
<artifactId>netty-all</artifactId>
<groupId>io.netty</groupId>
</exclusion>
<exclusion>
<artifactId>netty</artifactId>
<groupId>io.netty</groupId>
</exclusion>
<exclusion>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP-java7</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions contrib/storage-phoenix/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<name>Drill : Contrib : Storage : Phoenix</name>

<properties>
<phoenix.version>5.1.2</phoenix.version>
<phoenix.version>5.1.3</phoenix.version>
<!-- Keep the 2.4.2 to reduce dependency conflict -->
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cgivre I need to reword this comment slightly and prune some commented sections from java-exec/pom.xml below, but are you happy with this PR at this stage?

<hbase.minicluster.version>2.4.2</hbase.minicluster.version>
<hbase.minicluster.version>2.4.17</hbase.minicluster.version>
<skipTests>false</skipTests>
</properties>

Expand Down Expand Up @@ -389,7 +389,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.4</version>
<version>5.1.9</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
36 changes: 10 additions & 26 deletions exec/java-exec/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,12 @@
<artifactId>jetty-http</artifactId>
<groupId>org.eclipse.jetty</groupId>
</exclusion>
<!--
<exclusion>
<artifactId>jetty-util</artifactId>
<groupId>org.eclipse.jetty</groupId>
</exclusion>
-->
<exclusion>
<artifactId>javax.servlet-api</artifactId>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -445,10 +447,12 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
</exclusion>
<!--
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</exclusion>
-->
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -497,32 +501,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
Expand Down Expand Up @@ -573,6 +551,12 @@
<artifactId>netty-tcnative</artifactId>
<classifier>${netty.tcnative.classifier}</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>aircompressor</artifactId>
Expand Down
180 changes: 94 additions & 86 deletions exec/jdbc-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,14 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
Expand Down Expand Up @@ -335,7 +343,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M3</version>
<version>3.1.2</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -388,51 +396,52 @@
<include>*:*</include>
</includes>
<excludes>
<exclude>io.protostuff:*</exclude>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cgivre All the diff noise here comes about because I decided to sort this list alphabetically in the hopes that contributors will keep it sorted from here on, making checking what's in it that much easier. I can revert the sorting if preferred though.

<exclude>org.pentaho:*</exclude>
<exclude>org.msgpack:*</exclude>
<exclude>xerces:*</exclude>
<exclude>xalan:*</exclude>
<exclude>org.apache.avro:*</exclude>
<exclude>org.mongodb:*</exclude>
<exclude>com.googlecode.json-simple:*</exclude>
<exclude>dom4j:*</exclude>
<exclude>org.hibernate:*</exclude>
<exclude>antlr:*</exclude>
<exclude>com.beust:*</exclude>
<exclude>com.dropbox.*</exclude>
<exclude>com.github.stefanbirkner</exclude>
<exclude>org.ow2.asm:*</exclude>
<exclude>com.univocity:*</exclude>
<exclude>com.google.code.findbugs:jsr305:*</exclude>
<exclude>com.googlecode.json-simple:*</exclude>
<exclude>commons-beanutils:commons-beanutils-core:jar:*</exclude>
<exclude>commons-beanutils:commons-beanutils:jar:*</exclude>
<exclude>commons-cli:commons-cli</exclude>
<exclude>commons-io:commons-io</exclude>
<exclude>com.nimbusds:*</exclude>
<exclude>com.twitter:*</exclude>
<exclude>org.apache.parquet:*</exclude>
<exclude>com.univocity:*</exclude>
<exclude>dnsjava:dnsjava:jar:*</exclude>
<exclude>dom4j:*</exclude>
<exclude>io.netty:netty-tcnative-classes:jar:*</exclude>
<exclude>io.netty:netty-tcnative:jar:*</exclude>
<exclude>io.protostuff:*</exclude>
<exclude>javax.activation:activation</exclude>
<exclude>javax.inject:*</exclude>
<exclude>com.beust:*</exclude>
<exclude>javax.xml.bind:jaxb-api</exclude>
<exclude>javax.xml.stream:stax-api</exclude>
<exclude>jline:*</exclude>
<exclude>org.xerial.snappy:*</exclude>
<exclude>net.hydromatic:linq4j</exclude>
<exclude>org.apache.avro:*</exclude>
<exclude>org.tukaani:*</exclude>
<exclude>org.apache.avro:*</exclude>
<exclude>org.apache.commons:commons-collections4</exclude>
<exclude>org.apache.hadoop:hadoop-yarn-client</exclude>
<exclude>org.apache.parquet:*</exclude>
<exclude>org.apache.velocity:*</exclude>
<exclude>net.hydromatic:linq4j</exclude>
<exclude>org.apache.yetus:*</exclude>
<exclude>org.eclipse.jetty:*</exclude>
<exclude>org.slf4j:jul-to-slf4j</exclude>
<exclude>org.eclipse.jetty.websocket:*</exclude>
<exclude>org.hamcrest:hamcrest-core</exclude>
<exclude>org.hibernate:*</exclude>
<exclude>org.mockito:mockito-core</exclude>
<exclude>org.mongodb:*</exclude>
<exclude>org.msgpack:*</exclude>
<exclude>org.objenesis:objenesis</exclude>
<exclude>org.eclipse.jetty:*</exclude>
<exclude>javax.xml.bind:jaxb-api</exclude>
<exclude>javax.xml.stream:stax-api</exclude>
<exclude>javax.activation:activation</exclude>
<exclude>commons-cli:commons-cli</exclude>
<exclude>org.apache.commons:commons-collections4</exclude>
<exclude>commons-io:commons-io</exclude>
<exclude>commons-beanutils:commons-beanutils-core:jar:*</exclude>
<exclude>commons-beanutils:commons-beanutils:jar:*</exclude>
<exclude>com.google.code.findbugs:jsr305:*</exclude>
<exclude>dnsjava:dnsjava:jar:*</exclude>
<exclude>io.netty:netty-tcnative:jar:*</exclude>
<exclude>io.netty:netty-tcnative-classes:jar:*</exclude>
<exclude>com.nimbusds:*</exclude>
<exclude>org.apache.yetus:*</exclude>
<exclude>org.ow2.asm:*</exclude>
<exclude>org.pentaho:*</exclude>
<exclude>org.slf4j:jul-to-slf4j</exclude>
<exclude>org.tukaani:*</exclude>
<exclude>org.xerial.snappy:*</exclude>
<exclude>xalan:*</exclude>
<exclude>xerces:*</exclude>
</excludes>
</artifactSet>
<relocations>
Expand Down Expand Up @@ -679,86 +688,85 @@
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>**/logback.xml</exclude>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another list that's been sorted alphabetically in this PR.

<exclude>**/LICENSE.txt</exclude>
<exclude>bootstrap-storage-plugins.json</exclude>
<exclude>codegen/**</exclude>
<exclude>com/google/common/cache</exclude>
<exclude>com/google/common/collect/Standard*</exclude>
<exclude>com/google/common/collect/Tree*</exclude>
<exclude>com/google/common/math</exclude>
<exclude>com/google/common/net</exclude>
<exclude>com/google/common/primitives</exclude>
<exclude>com/google/common/reflect</exclude>
<exclude>com/google/common/util</exclude>
<exclude>com/jcraft/**</exclude>
<exclude>**/*.DSA</exclude>
<exclude>hello/**</exclude>
<exclude>**/*.java</exclude>
<exclude>javax/activation/**</exclude>
<exclude>javax/annotation-api/**</exclude>
<exclude>javax/*</exclude>
<exclude>javax/inject/**</exclude>
<exclude>javax/json/**</exclude>
<exclude>javax/servlet/**</exclude>
<exclude>javax/ws/**</exclude>
<exclude>**/LICENSE.txt</exclude>
<exclude>**/logback.xml</exclude>
<exclude>**/mapr/**</exclude>
<exclude>META-INF/ASL2.0</exclude>
<exclude>META-INF/NOTICE.txt</exclude>
<exclude>META-INF/drill-module-scan/**</exclude>
<exclude>META-INF/jboss-beans.xml</exclude>
<exclude>META-INF/license/**</exclude>
<exclude>META-INF/maven/**</exclude>
<exclude>META-INF/native/**</exclude>
<exclude>META-INF/NOTICE.txt</exclude>
<exclude>META-INF/**/*.properties</exclude>
<exclude>META-INF/services/com.fasterxml.*</exclude>
<exclude>META-INF/services/javax.ws.*</exclude>
<exclude>META-INF/**/*.properties</exclude>
<exclude>**/org.codehaus.commons.compiler.properties</exclude>
<exclude>module-info.class</exclude>
<exclude>**/*.SF</exclude>
<exclude>**/*.RSA</exclude>
<exclude>**/*.DSA</exclude>
<exclude>javax/*</exclude>
<exclude>javax/activation/**</exclude>
<exclude>javax/annotation-api/**</exclude>
<exclude>javax/inject/**</exclude>
<exclude>javax/servlet-api/**</exclude>
<exclude>javax/json/**</exclude>
<exclude>javax/ws/**</exclude>
<exclude>rest/**</exclude>
<exclude>*.tokens</exclude>
<exclude>codegen/**</exclude>
<exclude>bootstrap-storage-plugins.json</exclude>
<exclude>org/apache/parquet</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/escape/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/eventbus/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/html/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/net/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/xml/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/graph/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/collect/Tree*</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/collect/Standard*</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/io/BaseEncoding*</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/graph/**</exclude>
<exclude>com/google/common/math</exclude>
<exclude>com/google/common/net</exclude>
<exclude>com/google/common/primitives</exclude>
<exclude>com/google/common/reflect</exclude>
<exclude>com/google/common/util</exclude>
<exclude>com/google/common/cache</exclude>
<exclude>com/google/common/collect/Tree*</exclude>
<exclude>com/google/common/collect/Standard*</exclude>
<exclude>org/apache/commons/pool2/**</exclude>
<exclude>org/apache/directory/**</exclude>
<exclude>org/apache/drill/exec/compile/**</exclude>
<exclude>org/apache/drill/exec/expr/annotations/**</exclude>
<exclude>org/apache/drill/exec/expr/fn/**</exclude>
<exclude>org/apache/drill/exec/proto/beans/**</exclude>
<exclude>org/apache/drill/exec/compile/**</exclude>
<exclude>org/apache/drill/exec/planner/**</exclude>
<exclude>org/apache/drill/exec/physical/**</exclude>
<exclude>org/apache/drill/exec/store/**</exclude>
<exclude>org/apache/drill/exec/server/rest/**</exclude>
<exclude>org/apache/drill/exec/rpc/data/**</exclude>
<exclude>org/apache/drill/exec/planner/**</exclude>
<exclude>org/apache/drill/exec/proto/beans/**</exclude>
<exclude>org/apache/drill/exec/rpc/control/**</exclude>
<exclude>org/apache/drill/exec/rpc/data/**</exclude>
<exclude>org/apache/drill/exec/server/rest/**</exclude>
<exclude>org/apache/drill/exec/store/**</exclude>
<exclude>org/apache/drill/exec/work/**</exclude>
<exclude>org/apache/drill/metastore/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/collect/Standard*</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/collect/Tree*</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/escape/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/eventbus/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/graph/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/graph/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/html/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/io/BaseEncoding*</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/net/**</exclude>
<exclude>org/apache/drill/shaded/guava/com/google/common/xml/**</exclude>
<exclude>org/apache/hadoop/crypto/**</exclude>
<exclude>org/apache/hadoop/ha/**</exclude>
<exclude>org/apache/hadoop/http/**</exclude>
<exclude>org/apache/hadoop/ipc/**</exclude>
<exclude>org/apache/hadoop/jmx/**</exclude>
<exclude>org/apache/hadoop/log/**</exclude>
<exclude>org/apache/hadoop/metrics/**</exclude>
<exclude>org/apache/hadoop/net/**</exclude>
<exclude>org/apache/hadoop/record/**</exclude>
<exclude>org/apache/hadoop/service/**</exclude>
<exclude>org/apache/hadoop/tracing/**</exclude>
<exclude>org/apache/hadoop/tools/**</exclude>
<exclude>org/apache/hadoop/tracing/**</exclude>
<exclude>org/apache/hadoop/yarn/**</exclude>
<exclude>org/apache/commons/pool2/**</exclude>
<exclude>org/apache/http/**</exclude>
<exclude>org/apache/directory/**</exclude>
<exclude>org/apache/drill/metastore/**</exclude>
<exclude>com/jcraft/**</exclude>
<exclude>**/mapr/**</exclude>
<exclude>org/apache/parquet</exclude>
<exclude>**/org.codehaus.commons.compiler.properties</exclude>
<exclude>org/yaml/**</exclude>
<exclude>hello/**</exclude>
<exclude>rest/**</exclude>
<exclude>**/*.RSA</exclude>
<exclude>**/*.SF</exclude>
<exclude>*.tokens</exclude>
<exclude>webapps/**</exclude>
</excludes>
</filter>
Expand Down
Loading