This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push: new e61032fc1 STORM-4038 - Cleanup Hadoop/HDFS dependencies e61032fc1 is described below commit e61032fc1494b2769de35332805099f5b914370b Author: Richard Zowalla <richard.zowa...@hs-heilbronn.de> AuthorDate: Tue Feb 27 12:30:44 2024 +0100 STORM-4038 - Cleanup Hadoop/HDFS dependencies --- DEPENDENCY-LICENSES | 69 +--- LICENSE-binary | 50 +-- examples/storm-hdfs-examples/pom.xml | 5 +- external/storm-autocreds/pom.xml | 166 +------- .../storm/hbase/security/AutoHBaseCommand.java | 1 - .../storm/hbase/security/AutoHBaseNimbus.java | 5 +- external/storm-blobstore-migration/pom.xml | 68 +-- external/storm-hdfs-blobstore/pom.xml | 205 +-------- .../hdfs/testing/MiniDFSClusterExtension.java | 98 +++++ .../testing/MiniDFSClusterExtensionClassLevel.java | 70 ++++ external/storm-hdfs-oci/pom.xml | 58 +-- .../oci/HdfsManifestToResourcesPlugin.java | 3 +- external/storm-hdfs/pom.xml | 228 ++-------- external/storm-hive/pom.xml | 457 ++++++++------------- pom.xml | 28 +- 15 files changed, 474 insertions(+), 1037 deletions(-) diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES index 7a554a783..37c2d7841 100644 --- a/DEPENDENCY-LICENSES +++ b/DEPENDENCY-LICENSES @@ -22,7 +22,6 @@ List of third-party dependencies grouped by their license type. * Aether :: SPI (org.sonatype.aether:aether-spi:1.7 - http://aether.sonatype.org/aether-spi/) * Aether :: Utilities (org.sonatype.aether:aether-util:1.7 - http://aether.sonatype.org/aether-util/) * Aggregate Designer Algorithm (net.hydromatic:aggdesigner-algorithm:6.0 - http://github.com/julianhyde/aggdesigner/aggdesigner-algorithm) - * agrona (org.agrona:agrona:1.12.0 - https://github.com/real-logic/agrona) * aircompressor (io.airlift:aircompressor:0.10 - http://github.com/airlift/aircompressor) * Annotations for Metrics (io.dropwizard.metrics:metrics-annotation:4.1.16 - https://metrics.dropwizard.io/metrics-annotation) * Apache Ant Core (org.apache.ant:ant:1.9.1 - http://ant.apache.org/) @@ -30,14 +29,13 @@ List of third-party dependencies grouped by their license type. * Apache Avro (org.apache.avro:avro:1.11.3 - https://avro.apache.org) * Apache Calcite Avatica (org.apache.calcite.avatica:avatica-core:1.11.0 - https://calcite.apache.org/avatica/avatica-core) * Apache Calcite Avatica (Shaded) (org.apache.calcite.avatica:avatica:1.11.0 - https://calcite.apache.org/avatica/avatica) - * Apache Calcite Avatica Metrics (org.apache.calcite.avatica:avatica-metrics:1.11.0 - https://calcite.apache.org/avatica/avatica-metrics) * Apache Commons BeanUtils (commons-beanutils:commons-beanutils:1.9.4 - https://commons.apache.org/proper/commons-beanutils/) * Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/) - * Apache Commons Codec (commons-codec:commons-codec:1.11 - http://commons.apache.org/proper/commons-codec/) + * Apache Commons Codec (commons-codec:commons-codec:1.15 - https://commons.apache.org/proper/commons-codec/) * Apache Commons Collections (commons-collections:commons-collections:3.2.2 - http://commons.apache.org/collections/) * Apache Commons Collections (org.apache.commons:commons-collections4:4.4 - https://commons.apache.org/proper/commons-collections/) * Apache Commons Compress (org.apache.commons:commons-compress:1.26.0 - https://commons.apache.org/proper/commons-compress/) - * Apache Commons Configuration (org.apache.commons:commons-configuration2:2.8.0 - https://commons.apache.org/proper/commons-configuration/) + * Apache Commons Configuration (org.apache.commons:commons-configuration2:2.9.0 - https://commons.apache.org/proper/commons-configuration/) * Apache Commons Crypto (org.apache.commons:commons-crypto:1.1.0 - https://commons.apache.org/proper/commons-crypto/) * Apache Commons CSV (org.apache.commons:commons-csv:1.4 - http://commons.apache.org/proper/commons-csv/) * Apache Commons Exec (org.apache.commons:commons-exec:1.3 - http://commons.apache.org/proper/commons-exec/) @@ -45,30 +43,20 @@ List of third-party dependencies grouped by their license type. * Apache Commons IO (commons-io:commons-io:2.14.0 - https://commons.apache.org/proper/commons-io/) * Apache Commons Lang (org.apache.commons:commons-lang3:3.14.0 - https://commons.apache.org/proper/commons-lang/) * Apache Commons Logging (commons-logging:commons-logging:1.2 - http://commons.apache.org/proper/commons-logging/) - * Apache Commons Math (org.apache.commons:commons-math3:3.6.1 - http://commons.apache.org/proper/commons-math/) * Apache Commons Net (commons-net:commons-net:3.9.0 - https://commons.apache.org/proper/commons-net/) * Apache Commons Pool (org.apache.commons:commons-pool2:2.12.0 - https://commons.apache.org/proper/commons-pool/) * Apache Commons Text (org.apache.commons:commons-text:1.11.0 - https://commons.apache.org/proper/commons-text) * Apache Curator (org.apache.curator:apache-curator:2.12.0 - http://curator.apache.org) * Apache Derby Database Engine and Embedded JDBC Driver (org.apache.derby:derby:10.14.1.0 - http://db.apache.org/derby/) - * Apache Directory API ASN.1 API (org.apache.directory.api:api-asn1-api:2.1.4 - https://directory.apache.org/api-parent/api-asn1-parent/api-asn1-api/) - * Apache Directory API ASN.1 BER (org.apache.directory.api:api-asn1-ber:2.1.4 - https://directory.apache.org/api-parent/api-asn1-parent/api-asn1-ber/) - * Apache Directory LDAP API I18n (org.apache.directory.api:api-i18n:2.1.4 - https://directory.apache.org/api-parent/api-i18n/) - * Apache Directory LDAP API Model (org.apache.directory.api:api-ldap-model:2.1.4 - https://directory.apache.org/api-parent/api-ldap-parent/api-ldap-model/) - * Apache Directory LDAP API Utilities (org.apache.directory.api:api-util:2.1.4 - https://directory.apache.org/api-parent/api-util/) * Apache Geronimo JCache Spec 1.0 (org.apache.geronimo.specs:geronimo-jcache_1.0_spec:1.0-alpha-1 - http://geronimo.apache.org/maven/specs/geronimo-jcache_1.0_spec/1.0-alpha-1) * Apache Groovy (org.codehaus.groovy:groovy-all:2.4.11 - http://groovy-lang.org) * Apache Hadoop Annotations (org.apache.hadoop:hadoop-annotations:3.3.6 - no url defined) * Apache Hadoop Archives (org.apache.hadoop:hadoop-archives:3.3.6 - no url defined) * Apache Hadoop Auth (org.apache.hadoop:hadoop-auth:3.3.6 - no url defined) - * Apache Hadoop Client Aggregator (org.apache.hadoop:hadoop-client:3.3.6 - no url defined) * Apache Hadoop Common (org.apache.hadoop:hadoop-common:3.3.6 - no url defined) - * Apache Hadoop Distributed Copy (org.apache.hadoop:hadoop-distcp:3.2.4 - no url defined) * Apache Hadoop HDFS (org.apache.hadoop:hadoop-hdfs:3.3.6 - no url defined) * Apache Hadoop HDFS Client (org.apache.hadoop:hadoop-hdfs-client:3.3.6 - no url defined) - * Apache Hadoop MapReduce Common (org.apache.hadoop:hadoop-mapreduce-client-common:3.3.6 - no url defined) * Apache Hadoop MapReduce Core (org.apache.hadoop:hadoop-mapreduce-client-core:3.3.6 - no url defined) - * Apache Hadoop MapReduce JobClient (org.apache.hadoop:hadoop-mapreduce-client-jobclient:3.3.6 - no url defined) * Apache Hadoop Registry (org.apache.hadoop:hadoop-registry:3.3.6 - no url defined) * Apache Hadoop shaded Guava (org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 - https://www.apache.org/hadoop-thirdparty/hadoop-shaded-guava/) * Apache Hadoop shaded Protobuf 3.7 (org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1 - https://www.apache.org/hadoop-thirdparty/hadoop-shaded-protobuf_3_7/) @@ -80,32 +68,20 @@ List of third-party dependencies grouped by their license type. * Apache Hadoop YARN ResourceManager (org.apache.hadoop:hadoop-yarn-server-resourcemanager:3.3.6 - no url defined) * Apache Hadoop YARN Server Common (org.apache.hadoop:hadoop-yarn-server-common:3.3.6 - no url defined) * Apache Hadoop YARN Web Proxy (org.apache.hadoop:hadoop-yarn-server-web-proxy:3.3.6 - no url defined) - * Apache HBase - Annotations (org.apache.hbase:hbase-annotations:2.5.6-hadoop3 - https://hbase.apache.org/hbase-annotations) - * Apache HBase - Asynchronous FileSystem (org.apache.hbase:hbase-asyncfs:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-asyncfs) * Apache HBase - Client (org.apache.hbase:hbase-client:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-client) - * Apache HBase - Common (org.apache.hbase:hbase-common:2.0.0-alpha4 - http://hbase.apache.org/hbase-build-configuration/hbase-common) * Apache HBase - Common (org.apache.hbase:hbase-common:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-common) * Apache HBase - Hadoop Compatibility (org.apache.hbase:hbase-hadoop-compat:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-hadoop-compat) * Apache HBase - Hadoop Two Compatibility (org.apache.hbase:hbase-hadoop2-compat:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-hadoop2-compat) - * Apache HBase - HTTP (org.apache.hbase:hbase-http:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-http) * Apache HBase - Logging (org.apache.hbase:hbase-logging:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-logging) - * Apache HBase - MapReduce (org.apache.hbase:hbase-mapreduce:2.0.0-alpha4 - http://hbase.apache.org/hbase-build-configuration/hbase-mapreduce) * Apache HBase - Metrics API (org.apache.hbase:hbase-metrics-api:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-metrics-api) * Apache HBase - Metrics Implementation (org.apache.hbase:hbase-metrics:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-metrics) * Apache HBase Patched and Relocated (Shaded) Protobuf (org.apache.hbase.thirdparty:hbase-shaded-protobuf:4.1.5 - https://hbase.apache.org/hbase-shaded-protobuf) - * Apache HBase - Prefix Tree (org.apache.hbase:hbase-prefix-tree:2.0.0-alpha4 - http://hbase.apache.org/hbase-build-configuration/hbase-prefix-tree) - * Apache HBase - Procedure (org.apache.hbase:hbase-procedure:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-procedure) * Apache HBase - Protocol (org.apache.hbase:hbase-protocol:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-protocol) * Apache HBase Relocated (Shaded) GSON Libs (org.apache.hbase.thirdparty:hbase-shaded-gson:4.1.5 - https://hbase.apache.org/hbase-shaded-gson) - * Apache HBase Relocated (Shaded) Jersey Libs (org.apache.hbase.thirdparty:hbase-shaded-jersey:4.1.5 - https://hbase.apache.org/hbase-shaded-jersey) - * Apache HBase Relocated (Shaded) Jetty Libs (org.apache.hbase.thirdparty:hbase-shaded-jetty:4.1.5 - https://hbase.apache.org/hbase-shaded-jetty) * Apache HBase Relocated (Shaded) Netty Libs (org.apache.hbase.thirdparty:hbase-shaded-netty:4.1.5 - https://hbase.apache.org/hbase-shaded-netty) * Apache HBase Relocated (Shaded) Third-party Miscellaneous Libs (org.apache.hbase.thirdparty:hbase-shaded-miscellaneous:4.1.5 - https://hbase.apache.org/hbase-shaded-miscellaneous) - * Apache HBase - Replication (org.apache.hbase:hbase-replication:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-replication) - * Apache HBase - Server (org.apache.hbase:hbase-server:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-server) * Apache HBase - Shaded Protocol (org.apache.hbase:hbase-protocol-shaded:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-protocol-shaded) * Apache HBase Unsafe Wrapper (org.apache.hbase.thirdparty:hbase-unsafe:4.1.5 - https://hbase.apache.org/hbase-unsafe) - * Apache HBase - Zookeeper (org.apache.hbase:hbase-zookeeper:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-zookeeper) * Apache HttpAsyncClient (org.apache.httpcomponents:httpasyncclient:4.1.5 - http://hc.apache.org/httpcomponents-asyncclient) * Apache HttpClient (org.apache.httpcomponents:httpclient:4.5.14 - http://hc.apache.org/httpcomponents-client-ga) * Apache HttpClient (org.apache.httpcomponents.client5:httpclient5:5.2.1 - https://hc.apache.org/httpcomponents-client-5.0.x/5.2.1/httpclient5/) @@ -126,14 +102,9 @@ List of third-party dependencies grouped by their license type. * Apache Maven Shade Plugin (org.apache.maven.plugins:maven-shade-plugin:3.1.1 - https://maven.apache.org/plugins/maven-shade-plugin/) * Apache Maven Shared Utils (org.apache.maven.shared:maven-shared-utils:3.1.0 - https://maven.apache.org/shared/maven-shared-utils/) * Apache Maven Shared Utils (org.apache.maven.shared:maven-shared-utils:3.2.1 - https://maven.apache.org/shared/maven-shared-utils/) - * Apache MINA Core (org.apache.mina:mina-core:2.2.2 - https://mina.apache.org/mina-core/) * Apache Parquet Hadoop Bundle (org.apache.parquet:parquet-hadoop-bundle:1.10.0 - https://parquet.apache.org) - * Apache ServiceMix :: Bundles :: antlr (org.apache.servicemix.bundles:org.apache.servicemix.bundles.antlr:2.7.7_5 - http://servicemix.apache.org/bundles-pom/org.apache.servicemix.bundles.antlr/) - * Apache Standard Taglib Implementation (org.apache.taglibs:taglibs-standard-impl:1.2.5 - http://tomcat.apache.org/taglibs/standard-1.2.5/taglibs-standard-impl) - * Apache Standard Taglib Specification API (org.apache.taglibs:taglibs-standard-spec:1.2.5 - http://tomcat.apache.org/taglibs/standard-1.2.5/taglibs-standard-spec) * Apache Thrift (org.apache.thrift:libfb303:0.9.3 - http://thrift.apache.org) * Apache Thrift (org.apache.thrift:libthrift:0.19.0 - http://thrift.apache.org) - * Apache Thrift (org.apache.thrift:libthrift:0.9.3 - http://thrift.apache.org) * Apache Twill API (org.apache.twill:twill-api:0.6.0-incubating - http://twill.incubator.apache.org/twill-api) * Apache Twill common library (org.apache.twill:twill-common:0.6.0-incubating - http://twill.incubator.apache.org/twill-common) * Apache Twill core library (org.apache.twill:twill-core:0.6.0-incubating - http://twill.incubator.apache.org/twill-core) @@ -153,7 +124,6 @@ List of third-party dependencies grouped by their license type. * AutoService (com.google.auto.service:auto-service:1.0-rc4 - https://github.com/google/auto/auto-service) * Bean Validation API (javax.validation:validation-api:1.1.0.Final - http://beanvalidation.org) * BoneCP :: Core Library (com.jolbox:bonecp:0.8.0.RELEASE - http://jolbox.com/bonecp) - * Caffeine cache (com.github.ben-manes.caffeine:caffeine:3.1.8 - https://github.com/ben-manes/caffeine) * Calcite Core (org.apache.calcite:calcite-core:1.16.0 - https://calcite.apache.org/calcite-core) * Calcite Druid (org.apache.calcite:calcite-druid:1.16.0 - https://calcite.apache.org/calcite-druid) * Calcite Linq4j (org.apache.calcite:calcite-linq4j:1.16.0 - https://calcite.apache.org/calcite-linq4j) @@ -176,7 +146,6 @@ List of third-party dependencies grouped by their license type. * DataNucleus Core (org.datanucleus:datanucleus-core:4.1.17 - http://www.datanucleus.org/#/datanucleus-core) * DataNucleus JDO API plugin (org.datanucleus:datanucleus-api-jdo:4.2.4 - http://www.datanucleus.org/#/datanucleus-api-jdo) * DataNucleus RDBMS plugin (org.datanucleus:datanucleus-rdbms:4.1.19 - http://www.datanucleus.org/#/datanucleus-rdbms) - * Disruptor Framework (com.lmax:disruptor:3.4.2 - http://lmax-exchange.github.com/disruptor) * Dropwizard (io.dropwizard:dropwizard-core:1.3.29 - http://www.dropwizard.io/1.3.29/dropwizard-core) * Dropwizard Asset Bundle (io.dropwizard:dropwizard-assets:1.3.29 - http://www.dropwizard.io/1.3.29/dropwizard-assets) * Dropwizard Configuration Support (io.dropwizard:dropwizard-configuration:1.3.29 - http://www.dropwizard.io/1.3.29/dropwizard-configuration) @@ -194,7 +163,7 @@ List of third-party dependencies grouped by their license type. * error-prone annotations (com.google.errorprone:error_prone_annotations:2.25.0 - https://errorprone.info/error_prone_annotations) * Esri Geometry API for Java (com.esri.geometry:esri-geometry-api:2.0.0 - https://github.com/Esri/geometry-api-java) * fastutil (it.unimi.dsi:fastutil:6.5.6 - http://fasutil.dsi.unimi.it/) - * Findbugs Annotations under Apache License (com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 - http://stephenc.github.com/findbugs-annotations) + * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.0 - http://findbugs.sourceforge.net/) * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.1 - http://findbugs.sourceforge.net/) * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/) * fst (de.ruedigermoeller:fst:2.50 - http://ruedigermoeller.github.io/fast-serialization/) @@ -217,7 +186,6 @@ List of third-party dependencies grouped by their license type. * HikariCP (com.zaxxer:HikariCP:5.0.1 - https://github.com/brettwooldridge/HikariCP) * HikariCP (com.zaxxer:HikariCP-java7:2.4.12 - https://github.com/brettwooldridge/HikariCP) * Hive Classifications (org.apache.hive:hive-classification:3.1.3 - https://hive.apache.org/hive-classification) - * Hive CLI (org.apache.hive:hive-cli:3.1.3 - https://hive.apache.org/hive-cli) * Hive Common (org.apache.hive:hive-common:3.1.3 - https://hive.apache.org/hive-common) * Hive HCatalog Core (org.apache.hive.hcatalog:hive-hcatalog-core:3.1.3 - https://hive.apache.org/hive-hcatalog/hive-hcatalog-core) * Hive HCatalog Server Extensions (org.apache.hive.hcatalog:hive-hcatalog-server-extensions:3.1.3 - https://hive.apache.org/hive-hcatalog/hive-hcatalog-server-extensions) @@ -225,12 +193,10 @@ List of third-party dependencies grouped by their license type. * Hive HCatalog Webhcat Java Client (org.apache.hive.hcatalog:hive-webhcat-java-client:3.1.3 - https://hive.apache.org/hive-hcatalog/hive-webhcat-java-client) * Hive Llap Client (org.apache.hive:hive-llap-client:3.1.3 - https://hive.apache.org/hive-llap-client) * Hive Llap Common (org.apache.hive:hive-llap-common:3.1.3 - https://hive.apache.org/hive-llap-common) - * Hive Llap Server (org.apache.hive:hive-llap-server:3.1.3 - https://hive.apache.org/hive-llap-server) * Hive Llap Tez (org.apache.hive:hive-llap-tez:3.1.3 - https://hive.apache.org/hive-llap-tez) * Hive Metastore (org.apache.hive:hive-metastore:3.1.3 - https://hive.apache.org/hive-metastore) * Hive Query Language (org.apache.hive:hive-exec:3.1.3 - https://hive.apache.org/hive-exec) * Hive Serde (org.apache.hive:hive-serde:3.1.3 - https://hive.apache.org/hive-serde) - * Hive Service (org.apache.hive:hive-service:3.1.3 - https://hive.apache.org/hive-service) * Hive Service RPC (org.apache.hive:hive-service-rpc:3.1.3 - https://hive.apache.org/hive-service-rpc) * Hive Shims (org.apache.hive:hive-shims:3.1.3 - https://hive.apache.org/hive-shims) * Hive Shims 0.23 (org.apache.hive.shims:hive-shims-0.23:3.1.3 - https://hive.apache.org/hive-shims-0.23) @@ -242,7 +208,6 @@ List of third-party dependencies grouped by their license type. * Hive Vector-Code-Gen Utilities (org.apache.hive:hive-vector-code-gen:3.1.3 - https://hive.apache.org/hive-vector-code-gen) * HPPC Collections (com.carrotsearch:hppc:0.7.2 - http://labs.carrotsearch.com/hppc.html/hppc) * HPPC Collections (com.carrotsearch:hppc:0.8.1 - http://labs.carrotsearch.com/hppc.html/hppc) - * htrace-core (org.apache.htrace:htrace-core:3.2.0-incubating - http://incubator.apache.org/projects/htrace.html) * j2html (com.j2html:j2html:1.6.0 - http://j2html.com) * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:2.8 - https://github.com/google/j2objc/) * Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.16.1 - https://github.com/FasterXML/jackson) @@ -273,7 +238,6 @@ List of third-party dependencies grouped by their license type. * JDO API (javax.jdo:jdo-api:3.0.1 - http://db.apache.org/jdo) * JDO API (org.datanucleus:javax.jdo:3.2.0-m3 - http://www.datanucleus.org/#/javax.jdo) * Jettison (org.codehaus.jettison:jettison:1.1 - no url defined) - * Jettison (org.codehaus.jettison:jettison:1.5.4 - https://github.com/jettison-json/jettison) * Joda-Time (joda-time:joda-time:2.12.5 - https://www.joda.org/joda-time/) * JPam (net.sf.jpam:jpam:1.1 - http://jpam.sf.net) * json-io (com.cedarsoftware:json-io:2.5.1 - https://github.com/jdereg/json-io) @@ -388,6 +352,8 @@ List of third-party dependencies grouped by their license type. * Netty (io.netty:netty:3.10.6.Final - http://netty.io/) * Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:9.8.1 - https://bitbucket.org/connect2id/nimbus-jose-jwt) * Objenesis (org.objenesis:objenesis:3.3 - http://objenesis.org/objenesis) + * okhttp (com.squareup.okhttp3:okhttp:4.9.3 - https://square.github.io/okhttp/) + * Okio (com.squareup.okio:okio:2.8.0 - https://github.com/square/okio/) * opencsv (net.sf.opencsv:opencsv:2.3 - http://opencsv.sf.net) * Open JSON (com.tdunning:json:1.8 - https://github.com/tdunning/open-json) * OpenTelemetry Java (io.opentelemetry:opentelemetry-api:1.15.0 - https://github.com/open-telemetry/opentelemetry-java) @@ -395,6 +361,8 @@ List of third-party dependencies grouped by their license type. * OpenTelemetry Java (io.opentelemetry:opentelemetry-semconv:1.15.0-alpha - https://github.com/open-telemetry/opentelemetry-java) * ORC Core (org.apache.orc:orc-core:1.5.8 - http://orc.apache.org/orc-core) * ORC Shims (org.apache.orc:orc-shims:1.5.8 - http://orc.apache.org/orc-shims) + * org.jetbrains.kotlin:kotlin-stdlib (org.jetbrains.kotlin:kotlin-stdlib:1.4.10 - https://kotlinlang.org/) + * org.jetbrains.kotlin:kotlin-stdlib-common (org.jetbrains.kotlin:kotlin-stdlib-common:1.4.10 - https://kotlinlang.org/) * Plexus :: Component Annotations (org.codehaus.plexus:plexus-component-annotations:1.5.5 - http://plexus.codehaus.org/plexus-containers/plexus-component-annotations/) * Plexus :: Component Annotations (org.codehaus.plexus:plexus-component-annotations:1.7.1 - http://codehaus-plexus.github.io/plexus-containers/plexus-component-annotations/) * Plexus :: Component Annotations (org.codehaus.plexus:plexus-component-annotations:2.1.0 - http://codehaus-plexus.github.io/plexus-containers/plexus-component-annotations/) @@ -452,21 +420,12 @@ List of third-party dependencies grouped by their license type. Apache License, Version 2.0, Eclipse Public License - Version 1.0 - * Apache :: JSTL module (org.eclipse.jetty:apache-jstl:9.4.53.v20231009 - http://tomcat.apache.org/taglibs/standard/) - * Jetty :: Apache JSP Implementation (org.eclipse.jetty:apache-jsp:9.4.53.v20231009 - https://eclipse.org/jetty/apache-jsp) * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-client) * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-continuation) * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-http) * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-io) - * Jetty :: JAAS (org.eclipse.jetty:jetty-jaas:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-jaas) - * Jetty :: JNDI Naming (org.eclipse.jetty:jetty-jndi:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-jndi) - * Jetty :: Plus (org.eclipse.jetty:jetty-plus:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-plus) - * Jetty :: Rewrite Handler (org.eclipse.jetty:jetty-rewrite:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-rewrite) - * Jetty :: Runner (org.eclipse.jetty:jetty-runner:9.3.20.v20170531 - http://www.eclipse.org/jetty) - * Jetty :: Schemas (org.eclipse.jetty.toolchain:jetty-schemas:3.1.2 - https://eclipse.org/jetty/jetty-schemas) * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-security) * Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-server) - * Jetty :: Servlet Annotations (org.eclipse.jetty:jetty-annotations:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-annotations) * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-servlet) * Jetty :: SetUID Java (org.eclipse.jetty.toolchain.setuid:jetty-setuid-java:1.0.4 - https://eclipse.org/jetty/jetty-setuid-parent/jetty-setuid-java) * Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-util-ajax) @@ -476,8 +435,6 @@ List of third-party dependencies grouped by their license type. * Jetty :: Websocket :: API (org.eclipse.jetty.websocket:websocket-api:9.4.53.v20231009 - https://eclipse.org/jetty/websocket-parent/websocket-api) * Jetty :: Websocket :: Client (org.eclipse.jetty.websocket:websocket-client:9.4.53.v20231009 - https://eclipse.org/jetty/websocket-parent/websocket-client) * Jetty :: Websocket :: Common (org.eclipse.jetty.websocket:websocket-common:9.4.53.v20231009 - https://eclipse.org/jetty/websocket-parent/websocket-common) - * Jetty :: Websocket :: Server (org.eclipse.jetty.websocket:websocket-server:9.4.53.v20231009 - https://eclipse.org/jetty/websocket-parent/websocket-server) - * Jetty :: Websocket :: Servlet Interface (org.eclipse.jetty.websocket:websocket-servlet:9.4.53.v20231009 - https://eclipse.org/jetty/websocket-parent/websocket-servlet) * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-xml) Apache License, Version 2.0, GNU General Public License, version 2 @@ -530,6 +487,7 @@ List of third-party dependencies grouped by their license type. * JLine (jline:jline:0.9.94 - http://jline.sourceforge.net) * JLine Bundle (org.jline:jline:3.9.0 - http://nexus.sonatype.org/oss-repository-hosting.html/jline-parent/jline) * Stax2 API (org.codehaus.woodstox:stax2-api:4.2.1 - http://github.com/FasterXML/stax2-api) + * Stax2 API (org.codehaus.woodstox:stax2-api:4.2 - http://github.com/FasterXML/stax2-api) CDDL/GPLv2+CE @@ -542,10 +500,8 @@ List of third-party dependencies grouped by their license type. Common Development and Distribution License * Expression Language 3.0 (org.glassfish:javax.el:3.0.1-b12 - http://uel.java.net) - * JavaServer Pages(TM) API (javax.servlet.jsp:javax.servlet.jsp-api:2.3.1 - http://jsp.java.net) * Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - http://servlet-spec.java.net) * javax.annotation API (javax.annotation:javax.annotation-api:1.3.2 - http://jcp.org/en/jsr/detail?id=250) - * JSP implementation (org.glassfish.web:javax.servlet.jsp:2.3.2 - http://jsp.java.net) Common Development and Distribution License (CDDL) v1.0 @@ -554,7 +510,6 @@ List of third-party dependencies grouped by their license type. Common Development and Distribution License (CDDL) v1.1 * Java Transaction API (javax.transaction:jta:1.1 - http://java.sun.com/products/jta) - * jsp-api (javax.servlet.jsp:jsp-api:2.1 - no url defined) * transaction-api (javax.transaction:transaction-api:1.1 - no url defined) Common Development and Distribution License (CDDL) v1.1, The GNU General Public License (GPL), Version 2, With Classpath Exception @@ -656,14 +611,6 @@ List of third-party dependencies grouped by their license type. * sqlline (sqlline:sqlline:1.3.0 - http://github.com/julianhyde/sqlline) - Mozilla Public License Version 1.1 - - * jamon-runtime (org.jamon:jamon-runtime:2.3.1 - http://www.jamon.org/jamon-runtime/) - - Mozilla Public License Version 2.0 - - * jamon-runtime (org.jamon:jamon-runtime:2.4.1 - http://www.jamon.org/jamon-java-parent/jamon-runtime/) - Public Domain * AOP alliance (aopalliance:aopalliance:1.0 - http://aopalliance.sourceforge.net) diff --git a/LICENSE-binary b/LICENSE-binary index de5fce36b..1d8115733 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -666,25 +666,24 @@ The license texts of these dependencies can be found in the licenses directory. Apache License, Version 2.0 * Aggregate Designer Algorithm (net.hydromatic:aggdesigner-algorithm:6.0 - http://github.com/julianhyde/aggdesigner/aggdesigner-algorithm) - * agrona (org.agrona:agrona:1.12.0 - https://github.com/real-logic/agrona) * aircompressor (io.airlift:aircompressor:0.10 - http://github.com/airlift/aircompressor) * Annotations for Metrics (io.dropwizard.metrics:metrics-annotation:4.1.16 - https://metrics.dropwizard.io/metrics-annotation) * Apache Ant Core (org.apache.ant:ant:1.9.1 - http://ant.apache.org/) * Apache Ant Launcher (org.apache.ant:ant-launcher:1.9.1 - http://ant.apache.org/) * Apache Calcite Avatica (org.apache.calcite.avatica:avatica-core:1.11.0 - https://calcite.apache.org/avatica/avatica-core) * Apache Calcite Avatica (Shaded) (org.apache.calcite.avatica:avatica:1.11.0 - https://calcite.apache.org/avatica/avatica) + * Apache Commons BeanUtils (commons-beanutils:commons-beanutils:1.9.4 - https://commons.apache.org/proper/commons-beanutils/) * Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/) - * Apache Commons Codec (commons-codec:commons-codec:1.11 - http://commons.apache.org/proper/commons-codec/) + * Apache Commons Codec (commons-codec:commons-codec:1.15 - http://commons.apache.org/proper/commons-codec/) * Apache Commons Collections (commons-collections:commons-collections:3.2.2 - http://commons.apache.org/collections/) * Apache Commons Collections (org.apache.commons:commons-collections4:4.4 - https://commons.apache.org/proper/commons-collections/) * Apache Commons Compress (org.apache.commons:commons-compress:1.26.0 - https://commons.apache.org/proper/commons-compress/) - * Apache Commons Configuration (org.apache.commons:commons-configuration2:2.8.0 - https://commons.apache.org/proper/commons-configuration/) + * Apache Commons Configuration (org.apache.commons:commons-configuration2:2.9.0 - https://commons.apache.org/proper/commons-configuration/) * Apache Commons Crypto (org.apache.commons:commons-crypto:1.1.0 - https://commons.apache.org/proper/commons-crypto/) * Apache Commons CSV (org.apache.commons:commons-csv:1.4 - http://commons.apache.org/proper/commons-csv/) * Apache Commons Exec (org.apache.commons:commons-exec:1.3 - http://commons.apache.org/proper/commons-exec/) * Apache Commons IO (commons-io:commons-io:2.14.0 - https://commons.apache.org/proper/commons-io/) * Apache Commons Logging (commons-logging:commons-logging:1.2 - http://commons.apache.org/proper/commons-logging/) - * Apache Commons Math (org.apache.commons:commons-math3:3.6.1 - http://commons.apache.org/proper/commons-math/) * Apache Commons Net (commons-net:commons-net:3.9.0 - https://commons.apache.org/proper/commons-net/) * Apache Curator (org.apache.curator:apache-curator:2.12.0 - http://curator.apache.org) * Apache Derby Database Engine and Embedded JDBC Driver (org.apache.derby:derby:10.14.1.0 - http://db.apache.org/derby/) @@ -693,14 +692,10 @@ The license texts of these dependencies can be found in the licenses directory. * Apache Hadoop Annotations (org.apache.hadoop:hadoop-annotations:3.3.6 - no url defined) * Apache Hadoop Archives (org.apache.hadoop:hadoop-archives:3.3.6 - no url defined) * Apache Hadoop Auth (org.apache.hadoop:hadoop-auth:3.3.6 - no url defined) - * Apache Hadoop Client Aggregator (org.apache.hadoop:hadoop-client:3.3.6 - no url defined) * Apache Hadoop Common (org.apache.hadoop:hadoop-common:3.3.6 - no url defined) - * Apache Hadoop Distributed Copy (org.apache.hadoop:hadoop-distcp:3.2.4 - no url defined) * Apache Hadoop HDFS (org.apache.hadoop:hadoop-hdfs:3.3.6 - no url defined) * Apache Hadoop HDFS Client (org.apache.hadoop:hadoop-hdfs-client:3.3.6 - no url defined) - * Apache Hadoop MapReduce Common (org.apache.hadoop:hadoop-mapreduce-client-common:3.3.6 - no url defined) * Apache Hadoop MapReduce Core (org.apache.hadoop:hadoop-mapreduce-client-core:3.3.6 - no url defined) - * Apache Hadoop MapReduce JobClient (org.apache.hadoop:hadoop-mapreduce-client-jobclient:3.3.6 - no url defined) * Apache Hadoop Registry (org.apache.hadoop:hadoop-registry:3.3.6 - no url defined) * Apache Hadoop shaded Guava (org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 - https://www.apache.org/hadoop-thirdparty/hadoop-shaded-guava/) * Apache Hadoop shaded Protobuf 3.7 (org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1 - https://www.apache.org/hadoop-thirdparty/hadoop-shaded-protobuf_3_7/) @@ -712,29 +707,20 @@ The license texts of these dependencies can be found in the licenses directory. * Apache Hadoop YARN ResourceManager (org.apache.hadoop:hadoop-yarn-server-resourcemanager:3.3.6 - no url defined) * Apache Hadoop YARN Server Common (org.apache.hadoop:hadoop-yarn-server-common:3.3.6 - no url defined) * Apache Hadoop YARN Web Proxy (org.apache.hadoop:hadoop-yarn-server-web-proxy:3.3.6 - no url defined) - * Apache HBase - Annotations (org.apache.hbase:hbase-annotations:2.5.6-hadoop3 - https://hbase.apache.org/hbase-annotations) - * Apache HBase - Asynchronous FileSystem (org.apache.hbase:hbase-asyncfs:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-asyncfs) * Apache HBase - Client (org.apache.hbase:hbase-client:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-client) * Apache HBase - Common (org.apache.hbase:hbase-common:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-common) * Apache HBase - Hadoop Compatibility (org.apache.hbase:hbase-hadoop-compat:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-hadoop-compat) * Apache HBase - Hadoop Two Compatibility (org.apache.hbase:hbase-hadoop2-compat:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-hadoop2-compat) - * Apache HBase - HTTP (org.apache.hbase:hbase-http:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-http) * Apache HBase - Logging (org.apache.hbase:hbase-logging:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-logging) * Apache HBase - Metrics API (org.apache.hbase:hbase-metrics-api:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-metrics-api) * Apache HBase - Metrics Implementation (org.apache.hbase:hbase-metrics:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-metrics) * Apache HBase Patched and Relocated (Shaded) Protobuf (org.apache.hbase.thirdparty:hbase-shaded-protobuf:4.1.5 - https://hbase.apache.org/hbase-shaded-protobuf) - * Apache HBase - Procedure (org.apache.hbase:hbase-procedure:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-procedure) * Apache HBase - Protocol (org.apache.hbase:hbase-protocol:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-protocol) * Apache HBase Relocated (Shaded) GSON Libs (org.apache.hbase.thirdparty:hbase-shaded-gson:4.1.5 - https://hbase.apache.org/hbase-shaded-gson) - * Apache HBase Relocated (Shaded) Jersey Libs (org.apache.hbase.thirdparty:hbase-shaded-jersey:4.1.5 - https://hbase.apache.org/hbase-shaded-jersey) - * Apache HBase Relocated (Shaded) Jetty Libs (org.apache.hbase.thirdparty:hbase-shaded-jetty:4.1.5 - https://hbase.apache.org/hbase-shaded-jetty) * Apache HBase Relocated (Shaded) Netty Libs (org.apache.hbase.thirdparty:hbase-shaded-netty:4.1.5 - https://hbase.apache.org/hbase-shaded-netty) * Apache HBase Relocated (Shaded) Third-party Miscellaneous Libs (org.apache.hbase.thirdparty:hbase-shaded-miscellaneous:4.1.5 - https://hbase.apache.org/hbase-shaded-miscellaneous) - * Apache HBase - Replication (org.apache.hbase:hbase-replication:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-replication) - * Apache HBase - Server (org.apache.hbase:hbase-server:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-server) * Apache HBase - Shaded Protocol (org.apache.hbase:hbase-protocol-shaded:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-protocol-shaded) * Apache HBase Unsafe Wrapper (org.apache.hbase.thirdparty:hbase-unsafe:4.1.5 - https://hbase.apache.org/hbase-unsafe) - * Apache HBase - Zookeeper (org.apache.hbase:hbase-zookeeper:2.5.6-hadoop3 - https://hbase.apache.org/hbase-build-configuration/hbase-zookeeper) * Apache HttpClient (org.apache.httpcomponents:httpclient:4.5.14 - http://hc.apache.org/httpcomponents-client-ga) * Apache HttpClient (org.apache.httpcomponents.client5:httpclient5:5.2.1 - https://hc.apache.org/httpcomponents-client-5.0.x/5.2.1/httpclient5/) * Apache HttpComponents Core HTTP/1.1 (org.apache.httpcomponents.core5:httpcore5:5.2 - https://hc.apache.org/httpcomponents-core-5.2.x/5.2/httpcore5/) @@ -766,7 +752,6 @@ The license texts of these dependencies can be found in the licenses directory. * ASM based accessors helper used by json-smart (net.minidev:accessors-smart:2.5.0 - https://urielch.github.io/) * Bean Validation API (javax.validation:validation-api:1.1.0.Final - http://beanvalidation.org) * BoneCP :: Core Library (com.jolbox:bonecp:0.8.0.RELEASE - http://jolbox.com/bonecp) - * Caffeine cache (com.github.ben-manes.caffeine:caffeine:3.1.8 - https://github.com/ben-manes/caffeine) * Calcite Core (org.apache.calcite:calcite-core:1.16.0 - https://calcite.apache.org/calcite-core) * Calcite Druid (org.apache.calcite:calcite-druid:1.16.0 - https://calcite.apache.org/calcite-druid) * Calcite Linq4j (org.apache.calcite:calcite-linq4j:1.16.0 - https://calcite.apache.org/calcite-linq4j) @@ -779,6 +764,7 @@ The license texts of these dependencies can be found in the licenses directory. * Commons DBCP (commons-dbcp:commons-dbcp:1.4 - http://commons.apache.org/dbcp/) * Commons Lang (commons-lang:commons-lang:2.6 - http://commons.apache.org/lang/) * Commons Logging (commons-logging:commons-logging:1.1.3 - http://commons.apache.org/proper/commons-logging/) + * Commons Math (org.apache.commons:commons-math3:3.1.1 - http://commons.apache.org/math/) * Commons Pool (commons-pool:commons-pool:1.5.4 - http://commons.apache.org/pool/) * Curator Client (org.apache.curator:curator-client:5.6.0 - https://curator.apache.org/curator-client) * Curator Framework (org.apache.curator:curator-framework:5.6.0 - https://curator.apache.org/curator-framework) @@ -786,7 +772,6 @@ The license texts of these dependencies can be found in the licenses directory. * DataNucleus Core (org.datanucleus:datanucleus-core:4.1.17 - http://www.datanucleus.org/#/datanucleus-core) * DataNucleus JDO API plugin (org.datanucleus:datanucleus-api-jdo:4.2.4 - http://www.datanucleus.org/#/datanucleus-api-jdo) * DataNucleus RDBMS plugin (org.datanucleus:datanucleus-rdbms:4.1.19 - http://www.datanucleus.org/#/datanucleus-rdbms) - * Disruptor Framework (com.lmax:disruptor:3.4.2 - http://lmax-exchange.github.com/disruptor) * Dropwizard (io.dropwizard:dropwizard-core:1.3.29 - http://www.dropwizard.io/1.3.29/dropwizard-core) * Dropwizard Asset Bundle (io.dropwizard:dropwizard-assets:1.3.29 - http://www.dropwizard.io/1.3.29/dropwizard-assets) * Dropwizard Configuration Support (io.dropwizard:dropwizard-configuration:1.3.29 - http://www.dropwizard.io/1.3.29/dropwizard-configuration) @@ -807,7 +792,7 @@ The license texts of these dependencies can be found in the licenses directory. * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.1 - http://findbugs.sourceforge.net/) * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/) * fst (de.ruedigermoeller:fst:2.50 - http://ruedigermoeller.github.io/fast-serialization/) - * Google Guice - Core Library (com.google.inject:guice:3.0 - http://code.google.com/p/google-guice/guice/) + * Google Guice - Core Library (com.google.inject:guice:4.0 - https://github.com/google/guice/guice) * Google Guice - Extensions - AssistedInject (com.google.inject.extensions:guice-assistedinject:3.0 - http://code.google.com/p/google-guice/extensions-parent/guice-assistedinject/) * Google Guice - Extensions - Servlet (com.google.inject.extensions:guice-servlet:4.0 - https://github.com/google/guice/extensions-parent/guice-servlet) * Graphite Integration for Metrics (io.dropwizard.metrics:metrics-graphite:3.2.6 - http://metrics.dropwizard.io/metrics-graphite/) @@ -825,7 +810,6 @@ The license texts of these dependencies can be found in the licenses directory. * Hive Common (org.apache.hive:hive-common:3.1.3 - https://hive.apache.org/hive-common) * Hive HCatalog Core (org.apache.hive.hcatalog:hive-hcatalog-core:3.1.3 - https://hive.apache.org/hive-hcatalog/hive-hcatalog-core) * Hive HCatalog Server Extensions (org.apache.hive.hcatalog:hive-hcatalog-server-extensions:3.1.3 - https://hive.apache.org/hive-hcatalog/hive-hcatalog-server-extensions) - * Hive HCatalog Streaming (org.apache.hive.hcatalog:hive-hcatalog-streaming:3.1.3 - https://hive.apache.org/hive-hcatalog/hive-hcatalog-streaming) * Hive HCatalog Webhcat Java Client (org.apache.hive.hcatalog:hive-webhcat-java-client:3.1.3 - https://hive.apache.org/hive-hcatalog/hive-webhcat-java-client) * Hive Llap Client (org.apache.hive:hive-llap-client:3.1.3 - https://hive.apache.org/hive-llap-client) * Hive Llap Common (org.apache.hive:hive-llap-common:3.1.3 - https://hive.apache.org/hive-llap-common) @@ -870,7 +854,7 @@ The license texts of these dependencies can be found in the licenses directory. * JCL 1.2 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.36 - http://www.slf4j.org) * JDO API (javax.jdo:jdo-api:3.0.1 - http://db.apache.org/jdo) * JDO API (org.datanucleus:javax.jdo:3.2.0-m3 - http://www.datanucleus.org/#/javax.jdo) - * Jettison (org.codehaus.jettison:jettison:1.5.4 - https://github.com/jettison-json/jettison) + * Jettison (org.codehaus.jettison:jettison:1.1 - no url defined) * Joda-Time (joda-time:joda-time:2.12.5 - https://www.joda.org/joda-time/) * JPam (net.sf.jpam:jpam:1.1 - http://jpam.sf.net) * json-io (com.cedarsoftware:json-io:2.5.1 - https://github.com/jdereg/json-io) @@ -930,12 +914,14 @@ The license texts of these dependencies can be found in the licenses directory. * Netty/Handler/Ssl/Ocsp (io.netty:netty-handler-ssl-ocsp:4.1.107.Final - https://netty.io/netty-handler-ssl-ocsp/) * Netty/Handler (io.netty:netty-handler:4.1.107.Final - https://netty.io/netty-handler/) * Netty/Resolver/DNS/Classes/MacOS (io.netty:netty-resolver-dns-classes-macos:4.1.107.Final - https://netty.io/netty-resolver-dns-classes-macos/) + * Netty/Resolver/DNS/Native/MacOS (io.netty:netty-resolver-dns-native-macos:4.1.107.Final - https://netty.io/netty-resolver-dns-native-macos/) * Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.107.Final - https://netty.io/netty-resolver-dns/) * Netty/Resolver (io.netty:netty-resolver:4.1.107.Final - https://netty.io/netty-resolver/) * Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:jar:2.0.61.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) * Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.61.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) * Netty/Transport/Classes/Epoll (io.netty:netty-transport-classes-epoll:4.1.107.Final - https://netty.io/netty-transport-classes-epoll/) * Netty/Transport/Classes/KQueue (io.netty:netty-transport-classes-kqueue:4.1.107.Final - https://netty.io/netty-transport-classes-kqueue/) + * Netty/Transport/Native/KQueue (io.netty:netty-transport-native-kqueue:4.1.107.Final - https://netty.io/netty-transport-native-kqueue/) * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.107.Final - https://netty.io/netty-transport-native-epoll/) * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:jar:4.1.107.Final - https://netty.io/netty-transport-native-epoll/) * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.107.Final - https://netty.io/netty-transport-native-unix-common/) @@ -943,6 +929,7 @@ The license texts of these dependencies can be found in the licenses directory. * Netty/Transport/SCTP (io.netty:netty-transport-sctp:4.1.107.Final - https://netty.io/netty-transport-sctp/) * Netty/Transport/UDT (io.netty:netty-transport-udt:4.1.107.Final - https://netty.io/netty-transport-udt/) * Netty/Transport (io.netty:netty-transport:4.1.107.Final - https://netty.io/netty-transport/) + * Netty (io.netty:netty:3.10.6.Final - http://netty.io/) * Netty/Buffer (io.netty:netty-buffer:4.1.107.Final - https://netty.io/netty-buffer/) * Netty/Codec (io.netty:netty-codec:4.1.107.Final - https://netty.io/netty-codec/) * Netty/Common (io.netty:netty-common:4.1.107.Final - https://netty.io/netty-common/) @@ -957,6 +944,8 @@ The license texts of these dependencies can be found in the licenses directory. * Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:9.8.1 - https://bitbucket.org/connect2id/nimbus-jose-jwt) * Objenesis (org.objenesis:objenesis:2.5.1 - http://objenesis.org) * Objenesis (org.objenesis:objenesis:3.3 - http://objenesis.org/objenesis) + * okhttp (com.squareup.okhttp3:okhttp:4.9.3 - https://square.github.io/okhttp/) + * Okio (com.squareup.okio:okio:2.8.0 - https://github.com/square/okio/) * opencsv (net.sf.opencsv:opencsv:2.3 - http://opencsv.sf.net) * Open JSON (com.tdunning:json:1.8 - https://github.com/tdunning/open-json) * OpenTelemetry Java (io.opentelemetry:opentelemetry-api:1.15.0 - https://github.com/open-telemetry/opentelemetry-java) @@ -964,6 +953,8 @@ The license texts of these dependencies can be found in the licenses directory. * OpenTelemetry Java (io.opentelemetry:opentelemetry-semconv:1.15.0-alpha - https://github.com/open-telemetry/opentelemetry-java) * ORC Core (org.apache.orc:orc-core:1.5.8 - http://orc.apache.org/orc-core) * ORC Shims (org.apache.orc:orc-shims:1.5.8 - http://orc.apache.org/orc-shims) + * org.jetbrains.kotlin:kotlin-stdlib (org.jetbrains.kotlin:kotlin-stdlib:1.4.10 - https://kotlinlang.org/) + * org.jetbrains.kotlin:kotlin-stdlib-common (org.jetbrains.kotlin:kotlin-stdlib-common:1.4.10 - https://kotlinlang.org/) * Plexus :: Component Annotations (org.codehaus.plexus:plexus-component-annotations:1.7.1 - http://codehaus-plexus.github.io/plexus-containers/plexus-component-annotations/) * Plexus Common Utilities (org.codehaus.plexus:plexus-utils:3.1.0 - http://codehaus-plexus.github.io/plexus-utils/) * Plexus Interpolation API (org.codehaus.plexus:plexus-interpolation:1.25 - http://codehaus-plexus.github.io/plexus-interpolation/) @@ -996,11 +987,9 @@ The license texts of these dependencies can be found in the licenses directory. Apache License, Version 2.0, Eclipse Public License - Version 1.0 - * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-client) * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-continuation) * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-http) * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-io) - * Jetty :: Rewrite Handler (org.eclipse.jetty:jetty-rewrite:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-rewrite) * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-security) * Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-server) * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-servlet) @@ -1070,15 +1059,12 @@ The license texts of these dependencies can be found in the licenses directory. Common Development and Distribution License * Expression Language 3.0 (org.glassfish:javax.el:3.0.1-b12 - http://uel.java.net) - * JavaServer Pages(TM) API (javax.servlet.jsp:javax.servlet.jsp-api:2.3.1 - http://jsp.java.net) * Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - http://servlet-spec.java.net) * javax.annotation API (javax.annotation:javax.annotation-api:1.3.2 - http://jcp.org/en/jsr/detail?id=250) - * JSP implementation (org.glassfish.web:javax.servlet.jsp:2.3.2 - http://jsp.java.net) Common Development and Distribution License (CDDL) v1.1 * Java Transaction API (javax.transaction:jta:1.1 - http://java.sun.com/products/jta) - * jsp-api (javax.servlet.jsp:jsp-api:2.1 - no url defined) * transaction-api (javax.transaction:transaction-api:1.1 - no url defined) Common Development and Distribution License (CDDL) v1.1, The GNU General Public License (GPL), Version 2, With Classpath Exception @@ -1089,6 +1075,7 @@ The license texts of these dependencies can be found in the licenses directory. * jersey-core (com.sun.jersey:jersey-core:1.19.4 - https://jersey.java.net/jersey-core/) * jersey-guice (com.sun.jersey.contribs:jersey-guice:1.19.4 - https://jersey.java.net/jersey-contribs/jersey-guice/) * jersey-json (com.github.pjfanning:jersey-json:1.20 - https://github.com/pjfanning/jersey-1.x) + * jersey-server (com.sun.jersey:jersey-server:1.19.4 - https://jersey.java.net/jersey-server/) * jersey-servlet (com.sun.jersey:jersey-servlet:1.19.4 - https://jersey.java.net/jersey-servlet/) Eclipse Distribution License, Version 1.0 @@ -1122,6 +1109,7 @@ The license texts of these dependencies can be found in the licenses directory. * HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-utils) * jakarta.ws.rs-api (jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 - https://github.com/eclipse-ee4j/jaxrs-api) * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:1.3.5 - https://projects.eclipse.org/projects/ee4j.ca) + * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:2.1.1 - https://projects.eclipse.org/projects/ee4j.ca) * Jakarta Expression Language 3.0 (org.glassfish:jakarta.el:3.0.4 - https://projects.eclipse.org/projects/ee4j.el) * Jakarta Expression Language 3.0 API (jakarta.el:jakarta.el-api:3.0.3 - https://projects.eclipse.org/projects/ee4j.el) * Jakarta Servlet (jakarta.servlet:jakarta.servlet-api:4.0.4 - https://projects.eclipse.org/projects/ee4j.servlet) @@ -1149,10 +1137,6 @@ The license texts of these dependencies can be found in the licenses directory. * sqlline (sqlline:sqlline:1.3.0 - http://github.com/julianhyde/sqlline) - Mozilla Public License Version 2.0 - - * jamon-runtime (org.jamon:jamon-runtime:2.4.1 - http://www.jamon.org/jamon-java-parent/jamon-runtime/) - Public Domain * AOP alliance (aopalliance:aopalliance:1.0 - http://aopalliance.sourceforge.net) @@ -1160,3 +1144,7 @@ The license texts of these dependencies can be found in the licenses directory. The Go license * re2j (com.google.re2j:re2j:1.1 - http://github.com/google/re2j) + + Revised BSD + + * JSch (com.jcraft:jsch:0.1.55 - http://www.jcraft.com/jsch/) \ No newline at end of file diff --git a/examples/storm-hdfs-examples/pom.xml b/examples/storm-hdfs-examples/pom.xml index af5f32d44..9f9baf417 100644 --- a/examples/storm-hdfs-examples/pom.xml +++ b/examples/storm-hdfs-examples/pom.xml @@ -42,7 +42,10 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${guava.version}</version> + </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> </dependency> </dependencies> diff --git a/external/storm-autocreds/pom.xml b/external/storm-autocreds/pom.xml index d030dfe5a..593996552 100644 --- a/external/storm-autocreds/pom.xml +++ b/external/storm-autocreds/pom.xml @@ -15,7 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>storm</artifactId> <groupId>org.apache.storm</groupId> @@ -43,57 +44,8 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> + <artifactId>hadoop-auth</artifactId> <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - <exclusion> - <artifactId>jersey-core</artifactId> - <groupId>com.sun.jersey</groupId> - </exclusion> - <exclusion> - <artifactId>jersey-client</artifactId> - <groupId>com.sun.jersey</groupId> - </exclusion> - <exclusion> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils-core</artifactId> - </exclusion> - <exclusion> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - </exclusion> - <exclusion> - <groupId>com.microsoft.sqlserver</groupId> - <artifactId>mssql-jdbc</artifactId> - </exclusion> - <exclusion> - <groupId>com.zaxxer</groupId> - <artifactId>HikariCP-java7</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcache_1.0_spec</artifactId> - </exclusion> - <exclusion> - <groupId>org.ehcache</groupId> - <artifactId>ehcache</artifactId> - </exclusion> <exclusion> <groupId>ch.qos.reload4j</groupId> <artifactId>reload4j</artifactId> @@ -102,52 +54,27 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-reload4j</artifactId> </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-annotations</artifactId> - <version>${hbase.version}</version> - <exclusions> - <exclusion> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - </exclusion> - <!-- https://jira.apache.org/jira/browse/HBASE-12909 --> <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${hbase.version}</version> - <exclusions> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.curator</groupId> + <artifactId>apache-curator</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> </exclusion> <exclusion> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </exclusion> - <!-- https://jira.apache.org/jira/browse/HBASE-12909 --> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.apache.kerby</groupId> + <artifactId>kerb-admin</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <!-- Needed for TokenUtil, which moved here from hbase-client --> <groupId>org.apache.hbase</groupId> - <artifactId>hbase-server</artifactId> + <artifactId>hbase-client</artifactId> <version>${hbase.version}</version> <exclusions> <exclusion> @@ -167,67 +94,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> - <!-- https://jira.apache.org/jira/browse/STORM-3828 --> - <exclusion> - <groupId>org.glassfish</groupId> - <artifactId>javax.el</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-hcatalog-streaming</artifactId> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <groupId>org.pentaho</groupId> - <artifactId>pentaho-aggdesigner-algorithm</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-avatica</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-all</artifactId> - </exclusion> - <exclusion> - <!-- Not needed for runtime ops --> - <groupId>org.apache.hive</groupId> - <artifactId>hive-cli</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -264,16 +130,16 @@ <groupId>org.apache.hive</groupId> <artifactId>hive-cli</artifactId> </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>*</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> </dependency> - <dependency> - <groupId>org.glassfish</groupId> - <artifactId>javax.el</artifactId> - </dependency> </dependencies> <build> <plugins> diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java index 189d32ab4..518f2130b 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java @@ -25,7 +25,6 @@ import java.util.HashMap; import java.util.Map; import javax.security.auth.Subject; -import org.apache.storm.Config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java index 2ad58198c..95e312d20 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java @@ -33,12 +33,11 @@ import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.UserProvider; -import org.apache.hadoop.hbase.security.token.TokenUtil; +import org.apache.hadoop.hbase.security.token.ClientTokenUtil; import org.apache.hadoop.security.Credentials; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; -import org.apache.storm.Config; import org.apache.storm.common.AbstractHadoopNimbusPluginAutoCreds; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -93,7 +92,7 @@ public class AutoHBaseNimbus extends AbstractHadoopNimbusPluginAutoCreds { if (user.isHBaseSecurityEnabled(hbaseConf)) { final Connection connection = ConnectionFactory.createConnection(hbaseConf, user); - TokenUtil.obtainAndCacheToken(connection, user); + ClientTokenUtil.obtainAndCacheToken(connection, user); LOG.info("Obtained HBase tokens, adding to user credentials."); diff --git a/external/storm-blobstore-migration/pom.xml b/external/storm-blobstore-migration/pom.xml index 59a7f839c..a9f0be6b7 100644 --- a/external/storm-blobstore-migration/pom.xml +++ b/external/storm-blobstore-migration/pom.xml @@ -68,65 +68,32 @@ limitations under the License. </exclusions> </dependency> <dependency> - <artifactId>hadoop-hdfs</artifactId> <groupId>org.apache.hadoop</groupId> - <version>${hdfs.version}</version> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> <exclusions> + <!-- bring in a lot of stuff which isn't needed here --> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> + <groupId>*</groupId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <artifactId>hadoop-client</artifactId> - <groupId>org.apache.hadoop</groupId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - </exclusions> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> </dependency> <dependency> - <artifactId>hadoop-common</artifactId> - <groupId>org.apache.hadoop</groupId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - </exclusion> - </exclusions> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> </dependency> <dependency> <groupId>org.apache.avro</groupId> @@ -135,7 +102,6 @@ limitations under the License. <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${guava.version}</version> </dependency> </dependencies> <build> diff --git a/external/storm-hdfs-blobstore/pom.xml b/external/storm-hdfs-blobstore/pom.xml index 268e4df44..75b571ee8 100644 --- a/external/storm-hdfs-blobstore/pom.xml +++ b/external/storm-hdfs-blobstore/pom.xml @@ -26,14 +26,6 @@ </parent> <artifactId>storm-hdfs-blobstore</artifactId> - - <developers> - <developer> - <id>ptgoetz</id> - <name>P. Taylor Goetz</name> - <email>ptgo...@gmail.com</email> - </developer> - </developers> <dependencies> <dependency> @@ -50,202 +42,41 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</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>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minikdc</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-kerberos-codec</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <exclusions> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-json</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>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - </exclusion> - <exclusion> - <!-- This is leaking from hadoop-annotations. --> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> + <groupId>*</groupId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> </dependency> <dependency> - <groupId>org.apache.storm</groupId> - <artifactId>storm-hdfs</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - </exclusions> - <type>test-jar</type> - <scope>test</scope> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${guava.version}</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> diff --git a/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtension.java b/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtension.java new file mode 100644 index 000000000..8bf6b0b3c --- /dev/null +++ b/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtension.java @@ -0,0 +1,98 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.storm.hdfs.testing; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hdfs.MiniDFSCluster; +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; + +import java.io.File; +import java.util.function.Supplier; + +import static org.apache.hadoop.test.GenericTestUtils.DEFAULT_TEST_DATA_DIR; +import static org.apache.hadoop.test.GenericTestUtils.SYSPROP_TEST_DATA_DIR; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class MiniDFSClusterExtension implements BeforeEachCallback, AfterEachCallback { + + private static final String TEST_BUILD_DATA = "test.build.data"; + + private final Supplier<Configuration> hadoopConfSupplier; + private Configuration hadoopConf; + private MiniDFSCluster dfscluster; + + public MiniDFSClusterExtension() { + this(() -> new Configuration()); + } + + public MiniDFSClusterExtension(Supplier<Configuration> hadoopConfSupplier) { + this.hadoopConfSupplier = hadoopConfSupplier; + } + + public Configuration getHadoopConf() { + return hadoopConf; + } + + public MiniDFSCluster getDfscluster() { + return dfscluster; + } + + @Override + public void beforeEach(ExtensionContext arg0) throws Exception { + System.setProperty(TEST_BUILD_DATA, "target/test/data"); + hadoopConf = hadoopConfSupplier.get(); + String tempDir = getTestDir("dfs").getAbsolutePath() + File.separator; + hadoopConf.set("hdfs.minidfs.basedir", tempDir); + dfscluster = new MiniDFSCluster.Builder(hadoopConf).numDataNodes(3).build(); + dfscluster.waitActive(); + } + + @Override + public void afterEach(ExtensionContext arg0) throws Exception { + dfscluster.shutdown(); + System.clearProperty(TEST_BUILD_DATA); + } + + /** + * Get an uncreated directory for tests. + * We use this method to get rid of getTestDir() in GenericTestUtils in Hadoop code + * which uses assert from junit4. + * @return the absolute directory for tests. Caller is expected to create it. + */ + public static File getTestDir(String subdir) { + return new File(getTestDir(), subdir).getAbsoluteFile(); + } + + /** + * Get the (created) base directory for tests. + * @return the absolute directory + */ + public static File getTestDir() { + String prop = System.getProperty(SYSPROP_TEST_DATA_DIR, DEFAULT_TEST_DATA_DIR); + if (prop.isEmpty()) { + // corner case: property is there but empty + prop = DEFAULT_TEST_DATA_DIR; + } + File dir = new File(prop).getAbsoluteFile(); + dir.mkdirs(); + assertTrue(dir.exists(), "File " + dir + " should exist"); + return dir; + } +} diff --git a/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtensionClassLevel.java b/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtensionClassLevel.java new file mode 100644 index 000000000..1fd13d930 --- /dev/null +++ b/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtensionClassLevel.java @@ -0,0 +1,70 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.storm.hdfs.testing; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hdfs.MiniDFSCluster; +import org.junit.jupiter.api.extension.AfterAllCallback; +import org.junit.jupiter.api.extension.BeforeAllCallback; +import org.junit.jupiter.api.extension.ExtensionContext; + +import java.io.File; +import java.util.function.Supplier; + +import static org.apache.storm.hdfs.testing.MiniDFSClusterExtension.getTestDir; + +public class MiniDFSClusterExtensionClassLevel implements BeforeAllCallback, AfterAllCallback { + + private static final String TEST_BUILD_DATA = "test.build.data"; + + private final Supplier<Configuration> hadoopConfSupplier; + private Configuration hadoopConf; + private MiniDFSCluster dfscluster; + + public MiniDFSClusterExtensionClassLevel() { + this(() -> new Configuration()); + } + + public MiniDFSClusterExtensionClassLevel(Supplier<Configuration> hadoopConfSupplier) { + this.hadoopConfSupplier = hadoopConfSupplier; + } + + public Configuration getHadoopConf() { + return hadoopConf; + } + + public MiniDFSCluster getDfscluster() { + return dfscluster; + } + + @Override + public void beforeAll(ExtensionContext arg0) throws Exception { + System.setProperty(TEST_BUILD_DATA, "target/test/data"); + hadoopConf = hadoopConfSupplier.get(); + String tempDir = getTestDir("dfs").getAbsolutePath() + File.separator; + hadoopConf.set("hdfs.minidfs.basedir", tempDir); + dfscluster = new MiniDFSCluster.Builder(hadoopConf).numDataNodes(3).build(); + dfscluster.waitActive(); + } + + @Override + public void afterAll(ExtensionContext arg0) throws Exception { + dfscluster.shutdown(); + System.clearProperty(TEST_BUILD_DATA); + } +} diff --git a/external/storm-hdfs-oci/pom.xml b/external/storm-hdfs-oci/pom.xml index ce77ab1d8..1ea95abb5 100644 --- a/external/storm-hdfs-oci/pom.xml +++ b/external/storm-hdfs-oci/pom.xml @@ -41,58 +41,32 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> - <scope>compile</scope> <exclusions> <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</groupId> - </exclusion> - <exclusion> - <artifactId>protobuf-java</artifactId> - <groupId>com.google.protobuf</groupId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-json</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.apache.avro</groupId> - <artifactId>avro</artifactId> + <artifactId>*</artifactId> + <groupId>*</groupId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> </dependencies> diff --git a/external/storm-hdfs-oci/src/main/java/org/apache/storm/container/oci/HdfsManifestToResourcesPlugin.java b/external/storm-hdfs-oci/src/main/java/org/apache/storm/container/oci/HdfsManifestToResourcesPlugin.java index ec796ce28..0ad78032c 100644 --- a/external/storm-hdfs-oci/src/main/java/org/apache/storm/container/oci/HdfsManifestToResourcesPlugin.java +++ b/external/storm-hdfs-oci/src/main/java/org/apache/storm/container/oci/HdfsManifestToResourcesPlugin.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -73,7 +72,7 @@ public class HdfsManifestToResourcesPlugin implements OciManifestToResourcesPlug CacheLoader<Path, FileStatus> cacheLoader = new CacheLoader<Path, FileStatus>() { @Override - public FileStatus load(@Nonnull Path path) throws Exception { + public FileStatus load(Path path) throws Exception { return statBlob(path); } }; diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml index f5dc27fef..a3dcdf7f0 100644 --- a/external/storm-hdfs/pom.xml +++ b/external/storm-hdfs/pom.xml @@ -26,21 +26,6 @@ </parent> <artifactId>storm-hdfs</artifactId> - - <developers> - <developer> - <id>ptgoetz</id> - <name>P. Taylor Goetz</name> - <email>ptgo...@gmail.com</email> - </developer> - </developers> - - <repositories> - <repository> - <id>confluent</id> - <url>https://packages.confluent.io/maven</url> - </repository> - </repositories> <dependencies> <dependency> @@ -57,7 +42,6 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.apache.storm</groupId> <artifactId>storm-client</artifactId> @@ -73,198 +57,63 @@ </exclusion> </exclusions> </dependency> - + <dependency> + <groupId>org.apache.storm</groupId> + <artifactId>storm-autocreds</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> + <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> + <!-- bring in a lot of stuff which isn't needed here --> <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> + <groupId>*</groupId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - </exclusions> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> </dependency> <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minikdc</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-kerberos-codec</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - </exclusions> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - - </exclusions> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.storm</groupId> - <artifactId>storm-autocreds</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> - </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-junit-jupiter</artifactId> @@ -281,37 +130,6 @@ <forkCount>1</forkCount> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <executions> - <execution> - <id>cleanup</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - <configuration> - <excludeDefaultDirectories>true</excludeDefaultDirectories> - <filesets> - <fileset> - <directory>./build/</directory> - </fileset> - </filesets> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> diff --git a/external/storm-hive/pom.xml b/external/storm-hive/pom.xml index 46fc9eff9..b8deced15 100644 --- a/external/storm-hive/pom.xml +++ b/external/storm-hive/pom.xml @@ -15,304 +15,179 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>storm</artifactId> - <groupId>org.apache.storm</groupId> - <version>2.6.2-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> + <parent> + <artifactId>storm</artifactId> + <groupId>org.apache.storm</groupId> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> - <packaging>jar</packaging> - <artifactId>storm-hive</artifactId> - <name>storm-hive</name> - <developers> - <developer> - <id>harshach</id> - <name>Sriharsha Chintalapani</name> - <email>m...@harsha.io</email> - </developer> - </developers> + <packaging>jar</packaging> + <artifactId>storm-hive</artifactId> + <name>storm-hive</name> + <developers> + <developer> + <id>harshach</id> + <name>Sriharsha Chintalapani</name> + <email>m...@harsha.io</email> + </developer> + </developers> - <dependencies> - <dependency> - <groupId>org.apache.storm</groupId> - <artifactId>storm-client</artifactId> - <version>${project.version}</version> - <scope>${provided.scope}</scope> - </dependency> - <dependency> - <!-- This is here to remove jdk.tools as a dependency --> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.storm</groupId> - <artifactId>storm-client</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-hcatalog-streaming</artifactId> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <groupId>org.pentaho</groupId> - <artifactId>pentaho-aggdesigner-algorithm</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-avatica</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-hcatalog-core</artifactId> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <groupId>org.pentaho</groupId> - <artifactId>pentaho-aggdesigner-algorithm</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-avatica</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-core</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-cli</artifactId> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-avatica</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.pentaho</groupId> - <artifactId>pentaho-aggdesigner-algorithm</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>net.minidev</groupId> - <artifactId>json-smart</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest</artifactId> - </dependency> - <dependency> - <!-- This exact version is required by Hive, so we need to override our modern library version here--> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - <version>0.9.3</version> - <scope>compile</scope> - <exclusions> - <!-- We already include a more modern version of httpclient / httpcore --> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.storm</groupId> - <artifactId>storm-autocreds</artifactId> - <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>org.apache.storm</groupId> + <artifactId>storm-client</artifactId> + <version>${project.version}</version> + <scope>${provided.scope}</scope> + </dependency> + <dependency> + <groupId>org.apache.storm</groupId> + <artifactId>storm-client</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-streaming</artifactId> + <version>${hive.version}</version> + <exclusions> + <exclusion> + <groupId>org.pentaho</groupId> + <artifactId>pentaho-aggdesigner-algorithm</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-avatica</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <!-- Not needed for runtime ops --> + <groupId>org.apache.hive</groupId> + <artifactId>hive-cli</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.curator</groupId> + <artifactId>apache-curator</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>net.minidev</groupId> + <artifactId>json-smart</artifactId> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + </dependency> + <dependency> + <groupId>org.apache.storm</groupId> + <artifactId>storm-autocreds</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${guava.version}</version> </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <reuseForks>true</reuseForks> - <forkCount>1</forkCount> - </configuration> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <executions> - <execution> - <id>cleanup</id> - <phase>test-compile</phase> - <goals> - <goal>clean</goal> - </goals> - <configuration> - <excludeDefaultDirectories>true</excludeDefaultDirectories> - <filesets> - <fileset> - <directory>./metastore_db/</directory> - </fileset> - </filesets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--Note - the version would be inherited--> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <reuseForks>true</reuseForks> + <forkCount>1</forkCount> + </configuration> + </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>cleanup</id> + <phase>test-compile</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <excludeDefaultDirectories>true</excludeDefaultDirectories> + <filesets> + <fileset> + <directory>./metastore_db/</directory> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--Note - the version would be inherited--> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> </project> diff --git a/pom.xml b/pom.xml index 7d2c70bcd..87cefb5de 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ <commons-exec.version>1.3</commons-exec.version> <commons-collections.version>4.4</commons-collections.version> <commons-fileupload.version>1.5</commons-fileupload.version> - <commons-codec.version>1.11</commons-codec.version> + <commons-codec.version>1.15</commons-codec.version> <commons-text.version>1.11.0</commons-text.version> <commons-cli.version>1.4</commons-cli.version> <curator.version>5.6.0</curator.version> @@ -1194,6 +1194,21 @@ <artifactId>error_prone_annotations</artifactId> <version>${error_prone_annotations.version}</version> </dependency> + <dependency> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + <version>5.4.0</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.2</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + <version>2.9.0</version> + </dependency> </dependencies> </dependencyManagement> @@ -1218,17 +1233,6 @@ <id>clojars</id> <url>https://clojars.org/repo/</url> </repository> - <!-- - STORM-3948: This repository is declared by hive-2.3.9 (parent pom). As of today (08/14/23) this Maven Repository isn't available anymore. - hive-2.3.10 already removed it, so we only need to wait for a 2.3.10 release here. As long is that didn't happen, - we work around by overriding the repository with the same id targeting Maven Central. - TODO: Remove this repository declaration after hive-2.3.10 is available. - --> - <repository> - <id>conjars</id> - <name>STORM-3948-Workaround-Offline-Conjars-Repo</name> - <url>https://repo1.maven.org/maven2/</url> - </repository> </repositories> <build>