This is an automated email from the ASF dual-hosted git repository. joemcdonnell pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/impala.git
commit 5137bb94ac618271de4eefd85d73ab4ad455893c Author: Michael Smith <[email protected]> AuthorDate: Tue Sep 16 11:34:23 2025 -0700 IMPALA-14446: Clean up pom.xml Cleans up repetitive patterns in pom.xml. Centralize plugin configuration in pluginManagement. Replace inline maven-compiler-plugin configuration with newer maven.compiler.release and update to latest plugin version. Centralize common dependencies in dependencyManagement, including exclusions when appropriate. Remove exclusions that are no longer relevant. Compared before and after with dependency:tree; only difference is that commons-cli now comes from hadoop and jersey-serv{let,er} are effectively excluded; all versions matched. Also ensured USE_APACHE_COMPONENTS=true compiles. Adds com.amazonaws:aws-java-sdk-bundle to exclusion checking to ensure it's not accidentally included alongside impala-minimal-s3a-aws-sdk. Removes missed io.netty exclusion from IMPALA-12816. Updates commons-dbcp2 to 2.12.0 to match Hive. Change-Id: If96649840e23036b4a73ee23e8d12516497994f0 Reviewed-on: http://gerrit.cloudera.org:8080/23432 Reviewed-by: Impala Public Jenkins <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- bin/impala-config.sh | 2 +- fe/pom.xml | 132 ++---------------------- java/TableFlattener/pom.xml | 13 --- java/calcite-planner/pom.xml | 11 +- java/datagenerator/pom.xml | 30 ------ java/executor-deps/pom.xml | 30 +----- java/ext-data-source/api/pom.xml | 16 --- java/ext-data-source/jdbc/pom.xml | 10 -- java/ext-data-source/sample/pom.xml | 14 --- java/ext-data-source/test/pom.xml | 5 - java/external-frontend/pom.xml | 5 - java/iceberg-rest-catalog-test/pom.xml | 70 ++++--------- java/pom.xml | 177 ++++++++++++++++++++++++++++++++- java/puffin-data-generator/pom.xml | 27 ----- java/query-event-hook-api/pom.xml | 14 --- java/shaded-deps/hive-exec/pom.xml | 32 ------ java/shaded-deps/s3a-aws-sdk/pom.xml | 10 -- java/test-corrupt-hive-udfs/pom.xml | 5 - java/test-hive-udfs/pom.xml | 29 ------ java/yarn-extras/pom.xml | 23 ----- 20 files changed, 208 insertions(+), 447 deletions(-) diff --git a/bin/impala-config.sh b/bin/impala-config.sh index f74c8b2c1..33da84f76 100755 --- a/bin/impala-config.sh +++ b/bin/impala-config.sh @@ -292,7 +292,7 @@ export IMPALA_SPRINGFRAMEWORK_VERSION=5.3.39 export IMPALA_XMLSEC_VERSION=2.2.6 export IMPALA_VELOCITY_ENGINE_CORE_VERSION=2.4.1 export IMPALA_OBS_VERSION=3.1.1-hw-42 -export IMPALA_DBCP2_VERSION=2.9.0 +export IMPALA_DBCP2_VERSION=2.12.0 export IMPALA_DROPWIZARD_METRICS_VERSION=4.2.26 export IMPALA_AIRCOMPRESSOR_VERSION=0.27 export IMPALA_DATASKETCHES_VERSION=6.0.0 diff --git a/fe/pom.xml b/fe/pom.xml index 530b21bee..846b6ca48 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -55,13 +55,6 @@ under the License. <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -86,10 +79,6 @@ under the License. <groupId>com.sun.jersey</groupId> <artifactId>jersey-server</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> </exclusions> </dependency> @@ -103,14 +92,6 @@ under the License. <groupId>org.apache.httpcomponents</groupId> <artifactId>fluent-hc</artifactId> </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hive</groupId> - <artifactId>*</artifactId> - </exclusion> <exclusion> <!-- Avoid pulling in rocksdb, which is unneeded. --> <groupId>org.rocksdb</groupId> @@ -136,26 +117,7 @@ under the License. unneeded and not uploaded to toolchain. --> <exclusion> <groupId>com.cloudera</groupId> - <artifactId>jwtprovider-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.cloudera</groupId> - <artifactId>jwtprovider-knox</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.ranger</groupId> - <artifactId>ranger-plugins-audit</artifactId> - </exclusion> - <!-- After RANGER-3498, Ranger's ranger-plugins-common starts pulling in - log4j-1.2-api, which is banned by Impala's frontend. Thus we exclude the - dependency here.--> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> @@ -170,43 +132,16 @@ under the License. (See IMPALA-10644 for more details. --> <exclusion> <groupId>com.cloudera</groupId> - <artifactId>jwtprovider-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.cloudera</groupId> - <artifactId>jwtprovider-knox</artifactId> + <artifactId>*</artifactId> </exclusion> <exclusion> <groupId>org.apache.kafka</groupId> <artifactId>*</artifactId> </exclusion> - <!-- After RANGER-3498, Ranger's ranger-plugins-audit starts pulling in - log4j-1.2-api, which is banned by Impala's frontend. Thus we exclude the - dependency here.--> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> </exclusion> - <!-- RANGER-1837 causes Ranger to pull in ORC dependencies. - We have a much tighter coupling with the ORC version required by the Iceberg - dependency (which is likely to conflict), so the indirect dependency - through Ranger is excluded here. --> - <exclusion> - <groupId>org.apache.orc</groupId> - <artifactId>*</artifactId> - </exclusion> - <!-- - We do not explicitly exclude all artifacts in org.eclipse.jetty because - jetty-client is needed. - --> <!-- We exclude hive-exec which this jar includes because hive-exec brings with it tons of other unnecessary dependencies including thrift 0.9.3 which can cause build failures. @@ -235,16 +170,6 @@ under the License. <groupId>org.apache.impala</groupId> <artifactId>yarn-extras</artifactId> <version>${yarn-extras.version}</version> - <exclusions> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -263,10 +188,6 @@ under the License. <artifactId>orc-core</artifactId> <version>${orc.version}</version> <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </exclusion> <exclusion> <groupId>org.apache.hive</groupId> <artifactId>*</artifactId> @@ -294,7 +215,6 @@ under the License. <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>${thrift.version}</version> </dependency> <dependency> @@ -322,12 +242,6 @@ under the License. <version>3.3</version> </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-reload4j</artifactId> @@ -343,7 +257,6 @@ under the License. <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-dbcp2</artifactId> - <version>${commons-dbcp2.version}</version> </dependency> <dependency> @@ -431,20 +344,17 @@ under the License. <dependency> <groupId>org.apache.iceberg</groupId> <artifactId>iceberg-api</artifactId> - <version>${iceberg.version}</version> </dependency> <dependency> <groupId>org.apache.iceberg</groupId> <artifactId>iceberg-hive-runtime</artifactId> - <version>${iceberg.version}</version> </dependency> <!-- Needed for reading Iceberg Puffin files. --> <dependency> <groupId>org.apache.datasketches</groupId> <artifactId>datasketches-java</artifactId> - <version>${datasketches.version}</version> </dependency> <!-- Needed for tests like JdbcTest which instantiates HiveDriver --> @@ -454,6 +364,7 @@ under the License. <version>${hive.version}</version> <scope>test</scope> <exclusions> + <!-- Exclusions needed for Hive 3.1.3 --> <exclusion> <groupId>org.apache.hbase</groupId> <artifactId>*</artifactId> @@ -497,18 +408,10 @@ under the License. <groupId>org.fusesource.leveldbjni</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </exclusion> <exclusion> <groupId>com.cloudera</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>*</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -680,25 +583,19 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> <!-- Build fe/tests/ to jar --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.3.0</version> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> </plugin> <plugin> @@ -744,7 +641,6 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.5.0</version> <executions> <!-- TODO(todd): consider removing this execution or moving it to some kind of 'dist' profile. No need to copy all of these jars @@ -793,11 +689,9 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.0.0</version> <configuration> <trimStackTrace>false</trimStackTrace> <reportsDirectory>${surefire.reports.dir}</reportsDirectory> - <redirectTestOutputToFile>true</redirectTestOutputToFile> <argLine>${surefireJacocoArg}</argLine> <groups>${testcase.groups}</groups> <environmentVariables> @@ -822,7 +716,6 @@ under the License. <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>3.3.0</version> <executions> <!-- Tell maven about our generated files --> <execution> @@ -898,6 +791,7 @@ under the License. Jetty server --> <exclude>ant:*</exclude> <exclude>ant-contrib:*</exclude> + <exclude>com.amazonaws:aws-java-sdk-bundle</exclude> <exclude>org.apache.ant:*</exclude> <exclude>org.eclipse.jetty:*</exclude> <!-- We use reload4j, exclude log4j 1.x and 2.x --> @@ -916,8 +810,6 @@ under the License. <exclude>org.rocksdb:*</exclude> <!-- Avoid runtime dependency on Jersey server components. --> <exclude>com.sun.jersey:jersey-server</exclude> - <exclude>com.sun.jersey:jersey-server</exclude> - <exclude>org.glassfish.jersey.core:jersey-servlet</exclude> <exclude>org.glassfish.jersey.core:jersey-servlet</exclude> <!-- IMPALA-9708: Sentry is removed. --> <exclude>org.apache.sentry:*</exclude> @@ -1123,7 +1015,6 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> <configuration> <showWarnings>true</showWarnings> <compilerId>javac-with-errorprone</compilerId> @@ -1167,7 +1058,6 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> <configuration> <excludes> <exclude>**/org/apache/impala/catalog/metastore/*.java</exclude> diff --git a/java/TableFlattener/pom.xml b/java/TableFlattener/pom.xml index 721d45853..df54e1bc9 100644 --- a/java/TableFlattener/pom.xml +++ b/java/TableFlattener/pom.xml @@ -34,11 +34,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> </plugins> </build> @@ -47,7 +42,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.parquet</groupId> @@ -56,13 +50,6 @@ <dependency> <groupId>org.kitesdk</groupId> <artifactId>kite-data-core</artifactId> - <version>${kite.version}</version> - <exclusions> - <exclusion> - <groupId>com.twitter</groupId> - <artifactId>parquet-avro</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/java/calcite-planner/pom.xml b/java/calcite-planner/pom.xml index 6b75a1a35..88a5e3d81 100644 --- a/java/calcite-planner/pom.xml +++ b/java/calcite-planner/pom.xml @@ -27,7 +27,6 @@ under the License. <modelVersion>4.0.0</modelVersion> <artifactId>calcite-planner</artifactId> - <version>5.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>calcite-planner</name> @@ -36,7 +35,7 @@ under the License. <dependency> <groupId>org.apache.impala</groupId> <artifactId>impala-frontend</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.calcite</groupId> @@ -92,16 +91,10 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.5.0</version> <executions> <execution> <id>copy-dependencies</id> @@ -208,11 +201,9 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.0.0</version> <configuration> <trimStackTrace>false</trimStackTrace> <reportsDirectory>${surefire.reports.dir}</reportsDirectory> - <redirectTestOutputToFile>true</redirectTestOutputToFile> <groups>${testcase.groups}</groups> <environmentVariables> <!-- Set LD_LIBRARY_PATH and LD_PRELOAD to pick up libraries required for diff --git a/java/datagenerator/pom.xml b/java/datagenerator/pom.xml index 9ad6b3c00..8831c474f 100644 --- a/java/datagenerator/pom.xml +++ b/java/datagenerator/pom.xml @@ -36,25 +36,11 @@ under the License. <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <!-- IMPALA-9468: Avoid pulling in netty for security reasons --> - <groupId>io.netty</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> - </exclusion> </exclusions> </dependency> @@ -66,13 +52,6 @@ under the License. <dependency> <groupId>org.kitesdk</groupId> <artifactId>kite-data-core</artifactId> - <version>${kite.version}</version> - <exclusions> - <exclusion> - <groupId>com.twitter</groupId> - <artifactId>parquet-avro</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -86,20 +65,11 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.0.0</version> - <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> - </configuration> </plugin> </plugins> </build> diff --git a/java/executor-deps/pom.xml b/java/executor-deps/pom.xml index 34856edda..dad50436e 100644 --- a/java/executor-deps/pom.xml +++ b/java/executor-deps/pom.xml @@ -47,35 +47,16 @@ under the License. <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs-client</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <!-- IMPALA-9468: Avoid pulling in netty for security reasons --> - <groupId>io.netty</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> </exclusions> </dependency> @@ -98,20 +79,12 @@ under the License. </exclusion> <exclusion> <groupId>com.cloudera</groupId> - <artifactId>jwtprovider-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.cloudera</groupId> - <artifactId>jwtprovider-knox</artifactId> + <artifactId>*</artifactId> </exclusion> <exclusion> <groupId>org.eclipse.jetty</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> @@ -192,7 +165,6 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.5.0</version> <executions> <execution> <id>write-executor-classpath</id> diff --git a/java/ext-data-source/api/pom.xml b/java/ext-data-source/api/pom.xml index 9b4d970e6..2a9209130 100644 --- a/java/ext-data-source/api/pom.xml +++ b/java/ext-data-source/api/pom.xml @@ -35,7 +35,6 @@ <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>${thrift.version}</version> </dependency> </dependencies> @@ -44,30 +43,15 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>3.2.1</version> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>3.3.0</version> <executions> <!-- Tell maven about our generated files --> <execution> diff --git a/java/ext-data-source/jdbc/pom.xml b/java/ext-data-source/jdbc/pom.xml index de6cc10ac..7baa59e5b 100644 --- a/java/ext-data-source/jdbc/pom.xml +++ b/java/ext-data-source/jdbc/pom.xml @@ -31,10 +31,6 @@ <packaging>jar</packaging> <url>.</url> - <properties> - <commons-dbcp2.version>2.9.0</commons-dbcp2.version> - </properties> - <dependencies> <dependency> <groupId>org.apache.impala</groupId> @@ -51,7 +47,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-dbcp2</artifactId> - <version>${commons-dbcp2.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -66,11 +61,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> </plugins> </build> diff --git a/java/ext-data-source/sample/pom.xml b/java/ext-data-source/sample/pom.xml index c2b35b27d..cdf81bc71 100644 --- a/java/ext-data-source/sample/pom.xml +++ b/java/ext-data-source/sample/pom.xml @@ -48,24 +48,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>3.2.1</version> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> </plugins> </build> diff --git a/java/ext-data-source/test/pom.xml b/java/ext-data-source/test/pom.xml index 850b1eebe..750098783 100644 --- a/java/ext-data-source/test/pom.xml +++ b/java/ext-data-source/test/pom.xml @@ -48,11 +48,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> </plugins> </build> diff --git a/java/external-frontend/pom.xml b/java/external-frontend/pom.xml index f81354d9f..61428891c 100644 --- a/java/external-frontend/pom.xml +++ b/java/external-frontend/pom.xml @@ -45,11 +45,6 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> </plugins> </build> diff --git a/java/iceberg-rest-catalog-test/pom.xml b/java/iceberg-rest-catalog-test/pom.xml index b3d70b9db..3e3b2c5d9 100644 --- a/java/iceberg-rest-catalog-test/pom.xml +++ b/java/iceberg-rest-catalog-test/pom.xml @@ -44,52 +44,29 @@ under the License. <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs-client</artifactId> - <version>${hadoop.version}</version> - </dependency> + </dependency> - <dependency> - <groupId>org.apache.iceberg</groupId> - <artifactId>iceberg-api</artifactId> - <version>${iceberg.version}</version> - </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs-client</artifactId> + </dependency> - <dependency> - <groupId>org.apache.iceberg</groupId> - <artifactId>iceberg-core</artifactId> - <version>${iceberg.version}</version> - </dependency> + <dependency> + <groupId>org.apache.iceberg</groupId> + <artifactId>iceberg-api</artifactId> + </dependency> - <dependency> - <groupId>org.apache.iceberg</groupId> - <artifactId>iceberg-core</artifactId> - <version>${iceberg.version}</version> - <classifier>tests</classifier> - </dependency> + <dependency> + <groupId>org.apache.iceberg</groupId> + <artifactId>iceberg-core</artifactId> + <version>${iceberg.version}</version> + </dependency> <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> + <groupId>org.apache.iceberg</groupId> + <artifactId>iceberg-core</artifactId> + <version>${iceberg.version}</version> + <classifier>tests</classifier> </dependency> </dependencies> @@ -98,7 +75,6 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.5.0</version> <executions> <execution> <id>write-classpath</id> @@ -116,24 +92,14 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.0.0</version> - <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.3.0</version> <configuration> <archive> <manifest> diff --git a/java/pom.xml b/java/pom.xml index b828ff478..3ae90f790 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -89,7 +89,10 @@ under the License. <dropwizard-metrics.version>${env.IMPALA_DROPWIZARD_METRICS_VERSION}</dropwizard-metrics.version> <aircompressor.version>${env.IMPALA_AIRCOMPRESSOR_VERSION}</aircompressor.version> <datasketches.version>${env.IMPALA_DATASKETCHES_VERSION}</datasketches.version> - <impala.java.target.version>${env.IMPALA_JAVA_TARGET}</impala.java.target.version> + <!-- Informs maven-compiler-plugin to build for specified target. + Source version is fixed at 8, primarily due to sun.misc.Unsafe. --> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>${env.IMPALA_JAVA_TARGET}</maven.compiler.target> </properties> <repositories> @@ -268,12 +271,24 @@ under the License. <version>${avro.version}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-dbcp2</artifactId> + <version>${commons-dbcp2.version}</version> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> <version>${commons-lang3.version}</version> </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${thrift.version}</version> + </dependency> + <!-- Override httpcore from libthrift to a later maintenance version. Noticed certain SPNEGO auth errors when connecting to kerberized HTTP endpoints using v4.4.1 pulled by libthrift. --> @@ -379,6 +394,99 @@ under the License. <version>${log4j2.version}</version> </dependency> + <dependency> + <groupId>org.apache.datasketches</groupId> + <artifactId>datasketches-java</artifactId> + <version>${datasketches.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-aws</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-servlet</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs-client</artifactId> + <version>${hadoop.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + <version>${hive.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-0.20</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.atlas</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>com.cloudera</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.cloudera.logredactor</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.iceberg</groupId> + <artifactId>iceberg-api</artifactId> + <version>${iceberg.version}</version> + </dependency> + <dependency> + <groupId>org.apache.iceberg</groupId> + <artifactId>iceberg-hive-runtime</artifactId> + <version>${iceberg.version}</version> + </dependency> + + <dependency> + <groupId>org.kitesdk</groupId> + <artifactId>kite-data-core</artifactId> + <version>${kite.version}</version> + <exclusions> + <exclusion> + <groupId>com.twitter</groupId> + <artifactId>parquet-avro</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- Pin Dropwizard Metrics versions. We directly use metrics-core, and metrics-jvm/metrics-json are imported via HMS. --> <dependency> @@ -407,6 +515,73 @@ under the License. </dependencies> </dependencyManagement> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.14.0</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.5.0</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>3.3.0</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>3.4.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>3.2.1</version> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>3.0.0</version> + <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>3.3.0</version> + </plugin> + </plugins> + </pluginManagement> + </build> + <modules> <module>datagenerator</module> <module>puffin-data-generator</module> diff --git a/java/puffin-data-generator/pom.xml b/java/puffin-data-generator/pom.xml index 6175e252a..9f892d756 100644 --- a/java/puffin-data-generator/pom.xml +++ b/java/puffin-data-generator/pom.xml @@ -36,45 +36,27 @@ under the License. <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <!-- IMPALA-9468: Avoid pulling in netty for security reasons --> - <groupId>io.netty</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> - </exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.iceberg</groupId> <artifactId>iceberg-api</artifactId> - <version>${iceberg.version}</version> </dependency> - <dependency> <groupId>org.apache.iceberg</groupId> <artifactId>iceberg-hive-runtime</artifactId> - <version>${iceberg.version}</version> </dependency> <!-- Needed for reading Iceberg Puffin files. --> <dependency> <groupId>org.apache.datasketches</groupId> <artifactId>datasketches-java</artifactId> - <version>${datasketches.version}</version> </dependency> <dependency> @@ -88,20 +70,11 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.0.0</version> - <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> - </configuration> </plugin> </plugins> </build> diff --git a/java/query-event-hook-api/pom.xml b/java/query-event-hook-api/pom.xml index ecbd0880a..aac3cd626 100644 --- a/java/query-event-hook-api/pom.xml +++ b/java/query-event-hook-api/pom.xml @@ -35,24 +35,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>3.2.1</version> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> </plugins> </build> diff --git a/java/shaded-deps/hive-exec/pom.xml b/java/shaded-deps/hive-exec/pom.xml index f51bcab58..8c4ec479b 100644 --- a/java/shaded-deps/hive-exec/pom.xml +++ b/java/shaded-deps/hive-exec/pom.xml @@ -38,36 +38,12 @@ the same dependencies <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.hive.shims</groupId> - <artifactId>hive-shims-0.20</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.atlas</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.cloudera</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.cloudera.logredactor</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> <build> <plugins> <plugin> <artifactId>maven-shade-plugin</artifactId> - <version>3.4.1</version> <configuration> <artifactSet> <includes> @@ -134,14 +110,6 @@ the same dependencies </filter> </filters> </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> diff --git a/java/shaded-deps/s3a-aws-sdk/pom.xml b/java/shaded-deps/s3a-aws-sdk/pom.xml index 8f26480f2..42803d669 100644 --- a/java/shaded-deps/s3a-aws-sdk/pom.xml +++ b/java/shaded-deps/s3a-aws-sdk/pom.xml @@ -36,14 +36,12 @@ though some of them might not be necessary. The exclusions are sorted alphabetic <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-aws</artifactId> - <version>${hadoop.version}</version> </dependency> </dependencies> <build> <plugins> <plugin> <artifactId>maven-shade-plugin</artifactId> - <version>3.4.1</version> <configuration> <artifactSet> <includes> @@ -173,14 +171,6 @@ though some of them might not be necessary. The exclusions are sorted alphabetic </filter> </filters> </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> diff --git a/java/test-corrupt-hive-udfs/pom.xml b/java/test-corrupt-hive-udfs/pom.xml index 43e309d36..ccf1b06a3 100644 --- a/java/test-corrupt-hive-udfs/pom.xml +++ b/java/test-corrupt-hive-udfs/pom.xml @@ -42,11 +42,6 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> </plugins> </build> diff --git a/java/test-hive-udfs/pom.xml b/java/test-hive-udfs/pom.xml index e5564116c..709289cf8 100644 --- a/java/test-hive-udfs/pom.xml +++ b/java/test-hive-udfs/pom.xml @@ -40,34 +40,10 @@ under the License. <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.hive.shims</groupId> - <artifactId>hive-shims-0.20</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.atlas</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.cloudera</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.cloudera.logredactor</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> @@ -81,11 +57,6 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> </plugins> </build> diff --git a/java/yarn-extras/pom.xml b/java/yarn-extras/pom.xml index f6d1ed78c..142cd3149 100644 --- a/java/yarn-extras/pom.xml +++ b/java/yarn-extras/pom.xml @@ -35,25 +35,11 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <!-- IMPALA-9468: Avoid pulling in netty for security reasons --> - <groupId>io.netty</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> - </exclusion> </exclusions> </dependency> @@ -76,10 +62,6 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> </exclusions> </dependency> </dependencies> @@ -89,11 +71,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.11.0</version> - <configuration> - <source>1.8</source> - <target>${impala.java.target.version}</target> - </configuration> </plugin> </plugins> </build>
