ccaominh commented on issue #8230: Fix dependency analyze warnings URL: https://github.com/apache/incubator-druid/pull/8230#issuecomment-528660058 Updated diff after resolving merge conflicts (diff is same as https://github.com/apache/incubator-druid/pull/8230#issuecomment-528104856, except druid version is now 0.17.0): ``` diff -r before2/LICENSE after3/LICENSE 331,333d330 < This product bundles Apache Commons CLI version 1.3.1. < * commons-cli:commons-cli < 352,354d348 < This product bundles Apache Commons Pool version 1.6. < * commons-pool:commons-pool < 389,390d382 < * io.netty:netty-buffer < * io.netty:netty-codec 392d383 < * io.netty:netty-codec-http 394,395d384 < * io.netty:netty-common < * io.netty:netty-handler 399d387 < * io.netty:netty-transport 403c391,399 < This product bundles fastutil version 8.1.0. --- > This product bundles Netty version 4.1.30.Final. > * io.netty:netty-buffer > * io.netty:netty-codec > * io.netty:netty-codec-http > * io.netty:netty-common > * io.netty:netty-handler > * io.netty:netty-transport > > This product bundles fastutil version 8.2.3. 739,741d734 < This product bundles snappy-java version 1.1.7.2. < * org.xerial.snappy:snappy-java < 1019c1012 < This product bundles Jersey version 1.15, copyright Oracle and/or its affiliates. which is available under CDDL 1.1. --- > This product bundles Jersey version 1.19.3, copyright Oracle and/or its affiliates. which is available under CDDL 1.1. diff -r before2/NOTICE after3/NOTICE 237,244d236 < ================= commons-cli-1.3.1.jar ================= < Apache Commons CLI < Copyright 2001-2015 The Apache Software Foundation < < < < < 306,313d297 < ================= commons-pool-1.6.jar ================= < Apache Commons Pool < Copyright 2001-2012 The Apache Software Foundation < < < < < 519,520d502 < netty-buffer.jar < netty-codec.jar 522d503 < netty-codec-http.jar 524,525d504 < netty-common.jar < netty-handler.jar 529d507 < netty-transport.jar 2383,2404d2360 < ================= snappy-java-1.1.7.2.jar ================= < This product includes software developed by Google < Snappy: http://code.google.com/p/snappy/ (New BSD License) < < This product includes software developed by Apache < PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/ < (Apache 2.0 license) < < This library containd statically linked libstdc++. This inclusion is allowed by < "GCC RUntime Library Exception" < http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html < < == Contributors == < * Tatu Saloranta < * Providing benchmark suite < * Alec Wysoker < * Performance and memory usage improvement < < < < < Binary files before2/extensions/druid-avro-extensions/druid-avro-extensions-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-avro-extensions/druid-avro-extensions-0.17.0-incubating-SNAPSHOT.jar differ Only in before2/extensions/druid-avro-extensions: jersey-client-1.15.jar Only in after3/extensions/druid-avro-extensions: jersey-client-1.19.3.jar Binary files before2/extensions/druid-basic-security/druid-basic-security-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-basic-security/druid-basic-security-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/druid-bloom-filter/druid-bloom-filter-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-bloom-filter/druid-bloom-filter-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/druid-datasketches/druid-datasketches-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-datasketches/druid-datasketches-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/druid-ec2-extensions/druid-ec2-extensions-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-ec2-extensions/druid-ec2-extensions-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/druid-google-extensions/druid-google-extensions-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-google-extensions/druid-google-extensions-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/druid-hdfs-storage/druid-hdfs-storage-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-hdfs-storage/druid-hdfs-storage-0.17.0-incubating-SNAPSHOT.jar differ Only in before2/extensions/druid-hdfs-storage: hadoop-hdfs-client-2.8.3.jar Only in before2/extensions/druid-hdfs-storage: hadoop-yarn-common-2.8.3.jar Only in before2/extensions/druid-hdfs-storage: jackson-jaxrs-1.9.13.jar Only in before2/extensions/druid-hdfs-storage: jackson-xc-1.9.13.jar Only in before2/extensions/druid-hdfs-storage: javax.activation-api-1.2.0.jar Only in before2/extensions/druid-hdfs-storage: jaxb-api-2.3.1.jar Only in before2/extensions/druid-hdfs-storage: jersey-client-1.9.jar Only in before2/extensions/druid-hdfs-storage: okhttp-2.4.0.jar Only in before2/extensions/druid-hdfs-storage: okio-1.4.0.jar Only in before2/extensions/druid-hdfs-storage: servlet-api-2.5.jar Binary files before2/extensions/druid-histogram/druid-histogram-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-histogram/druid-histogram-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/druid-kafka-extraction-namespace/druid-kafka-extraction-namespace-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-kafka-extraction-namespace/druid-kafka-extraction-namespace-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/druid-kafka-extraction-namespace/druid-lookups-cached-global-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-kafka-extraction-namespace/druid-lookups-cached-global-0.17.0-incubating-SNAPSHOT.jar differ Only in after3/extensions/druid-kafka-extraction-namespace: mapdb-1.0.8.jar Binary files before2/extensions/druid-kafka-indexing-service/druid-kafka-indexing-service-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-kafka-indexing-service/druid-kafka-indexing-service-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/druid-kerberos/druid-kerberos-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-kerberos/druid-kerberos-0.17.0-incubating-SNAPSHOT.jar differ Only in before2/extensions/druid-kerberos: jersey-server-1.19.3.jar Binary files before2/extensions/druid-kinesis-indexing-service/druid-kinesis-indexing-service-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-kinesis-indexing-service/druid-kinesis-indexing-service-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/druid-lookups-cached-global/druid-lookups-cached-global-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-lookups-cached-global/druid-lookups-cached-global-0.17.0-incubating-SNAPSHOT.jar differ Only in after3/extensions/druid-lookups-cached-global: mapdb-1.0.8.jar Binary files before2/extensions/druid-lookups-cached-single/druid-lookups-cached-single-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-lookups-cached-single/druid-lookups-cached-single-0.17.0-incubating-SNAPSHOT.jar differ Only in before2/extensions/druid-orc-extensions: aopalliance-1.0.jar Binary files before2/extensions/druid-orc-extensions/druid-orc-extensions-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-orc-extensions/druid-orc-extensions-0.17.0-incubating-SNAPSHOT.jar differ Only in before2/extensions/druid-orc-extensions: gmbal-api-only-3.0.0-b023.jar Only in before2/extensions/druid-orc-extensions: grizzly-framework-2.1.2.jar Only in before2/extensions/druid-orc-extensions: grizzly-http-2.1.2.jar Only in before2/extensions/druid-orc-extensions: grizzly-http-server-2.1.2.jar Only in before2/extensions/druid-orc-extensions: grizzly-http-servlet-2.1.2.jar Only in before2/extensions/druid-orc-extensions: grizzly-rcm-2.1.2.jar Only in before2/extensions/druid-orc-extensions: guice-4.1.0.jar Only in before2/extensions/druid-orc-extensions: guice-servlet-4.1.0.jar Only in before2/extensions/druid-orc-extensions: hadoop-annotations-2.8.3.jar Only in before2/extensions/druid-orc-extensions: hadoop-mapreduce-client-core-2.2.0.jar Only in before2/extensions/druid-orc-extensions: hadoop-yarn-api-2.2.0.jar Only in before2/extensions/druid-orc-extensions: hadoop-yarn-common-2.2.0.jar Only in before2/extensions/druid-orc-extensions: jackson-jaxrs-1.9.2.jar Only in before2/extensions/druid-orc-extensions: jackson-xc-1.9.2.jar Only in before2/extensions/druid-orc-extensions: javax.inject-1.jar Only in before2/extensions/druid-orc-extensions: javax.servlet-3.1.jar Only in before2/extensions/druid-orc-extensions: javax.servlet-api-3.1.0.jar Only in before2/extensions/druid-orc-extensions: jaxb-impl-2.2.3-1.jar Only in before2/extensions/druid-orc-extensions: jersey-client-1.9.jar Only in before2/extensions/druid-orc-extensions: jersey-grizzly2-1.9.jar Only in before2/extensions/druid-orc-extensions: jersey-guice-1.19.3.jar Only in before2/extensions/druid-orc-extensions: jersey-json-1.19.3.jar Only in before2/extensions/druid-orc-extensions: jersey-servlet-1.19.3.jar Only in before2/extensions/druid-orc-extensions: jersey-test-framework-core-1.9.jar Only in before2/extensions/druid-orc-extensions: jersey-test-framework-grizzly2-1.9.jar Only in before2/extensions/druid-orc-extensions: jettison-1.1.jar Only in before2/extensions/druid-orc-extensions: management-api-3.0.0-b012.jar Only in before2/extensions/druid-orc-extensions: netty-3.10.6.Final.jar Only in before2/extensions/druid-orc-extensions: slf4j-log4j12-1.7.10.jar Binary files before2/extensions/druid-parquet-extensions/druid-parquet-extensions-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-parquet-extensions/druid-parquet-extensions-0.17.0-incubating-SNAPSHOT.jar differ Only in after3/extensions/druid-parquet-extensions: snappy-java-1.1.2.6.jar Only in before2/extensions/druid-parquet-extensions: snappy-java-1.1.7.2.jar Binary files before2/extensions/druid-protobuf-extensions/druid-protobuf-extensions-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-protobuf-extensions/druid-protobuf-extensions-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/druid-s3-extensions/druid-s3-extensions-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-s3-extensions/druid-s3-extensions-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/druid-stats/druid-stats-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/druid-stats/druid-stats-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/mysql-metadata-storage/mysql-metadata-storage-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/mysql-metadata-storage/mysql-metadata-storage-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/postgresql-metadata-storage/postgresql-metadata-storage-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/postgresql-metadata-storage/postgresql-metadata-storage-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/extensions/simple-client-sslcontext/simple-client-sslcontext-0.17.0-incubating-SNAPSHOT.jar and after3/extensions/simple-client-sslcontext/simple-client-sslcontext-0.17.0-incubating-SNAPSHOT.jar differ Only in before2/lib: commons-cli-1.3.1.jar Only in before2/lib: commons-pool-1.6.jar Binary files before2/lib/druid-aws-common-0.17.0-incubating-SNAPSHOT.jar and after3/lib/druid-aws-common-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/lib/druid-console-0.17.0-incubating-SNAPSHOT.jar and after3/lib/druid-console-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/lib/druid-core-0.17.0-incubating-SNAPSHOT.jar and after3/lib/druid-core-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/lib/druid-gcp-common-0.17.0-incubating-SNAPSHOT.jar and after3/lib/druid-gcp-common-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/lib/druid-hll-0.17.0-incubating-SNAPSHOT.jar and after3/lib/druid-hll-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/lib/druid-indexing-hadoop-0.17.0-incubating-SNAPSHOT.jar and after3/lib/druid-indexing-hadoop-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/lib/druid-indexing-service-0.17.0-incubating-SNAPSHOT.jar and after3/lib/druid-indexing-service-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/lib/druid-processing-0.17.0-incubating-SNAPSHOT.jar and after3/lib/druid-processing-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/lib/druid-server-0.17.0-incubating-SNAPSHOT.jar and after3/lib/druid-server-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/lib/druid-services-0.17.0-incubating-SNAPSHOT.jar and after3/lib/druid-services-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/lib/druid-sql-0.17.0-incubating-SNAPSHOT.jar and after3/lib/druid-sql-0.17.0-incubating-SNAPSHOT.jar differ Binary files before2/lib/extendedset-0.17.0-incubating-SNAPSHOT.jar and after3/lib/extendedset-0.17.0-incubating-SNAPSHOT.jar differ Only in before2/lib: fastutil-8.1.0.jar Only in after3/lib: fastutil-8.2.3.jar Only in before2/lib: mapdb-1.0.8.jar Only in before2/lib: netty-all-4.1.30.Final.jar Only in before2/lib: netty-buffer-4.1.29.Final.jar Only in after3/lib: netty-buffer-4.1.30.Final.jar Only in before2/lib: netty-codec-4.1.29.Final.jar Only in after3/lib: netty-codec-4.1.30.Final.jar Only in before2/lib: netty-codec-http-4.1.29.Final.jar Only in after3/lib: netty-codec-http-4.1.30.Final.jar Only in before2/lib: netty-common-4.1.29.Final.jar Only in after3/lib: netty-common-4.1.30.Final.jar Only in before2/lib: netty-handler-4.1.29.Final.jar Only in after3/lib: netty-handler-4.1.30.Final.jar Only in before2/lib: netty-transport-4.1.29.Final.jar Only in after3/lib: netty-transport-4.1.30.Final.jar ```
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
