This is an automated email from the ASF dual-hosted git repository. davidlim pushed a commit to branch 0.13.0-incubating in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
commit 71841c5152af95bc2cf444e59f910724252f95ea Author: David Lim <[email protected]> AuthorDate: Fri Oct 19 14:50:05 2018 -0600 fix distribution to not include contrib extensions by default, don't pull the entire AWS SDK bundle (#6494) --- aws-common/pom.xml | 6 +- distribution/pom.xml | 107 ++++++++++++--------- extensions-core/avro-extensions/pom.xml | 6 ++ extensions-core/druid-kerberos/pom.xml | 12 +++ extensions-core/hdfs-storage/pom.xml | 12 +++ indexing-hadoop/pom.xml | 5 - .../common/stats/RowIngestionMetersTotals.java | 2 +- pom.xml | 11 ++- 8 files changed, 104 insertions(+), 57 deletions(-) diff --git a/aws-common/pom.xml b/aws-common/pom.xml index a8e2c88..831e809 100644 --- a/aws-common/pom.xml +++ b/aws-common/pom.xml @@ -39,7 +39,11 @@ </dependency> <dependency> <groupId>com.amazonaws</groupId> - <artifactId>aws-java-sdk-bundle</artifactId> + <artifactId>aws-java-sdk-ec2</artifactId> + </dependency> + <dependency> + <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-s3</artifactId> </dependency> <!-- Tests --> diff --git a/distribution/pom.xml b/distribution/pom.xml index e7ad4ef..d9d7bc7 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -183,6 +183,66 @@ </arguments> </configuration> </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>apache-druid-${project.parent.version}</finalName> + <tarLongFileMode>posix</tarLongFileMode> + <descriptors> + <descriptor>src/assembly/assembly.xml</descriptor> + </descriptors> + </configuration> + </execution> + <execution> + <id>source-release-assembly-druid</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>apache-druid-${project.version}-src</finalName> + <tarLongFileMode>posix</tarLongFileMode> + <descriptors> + <descriptor>src/assembly/source-assembly.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <executions> + <execution> + <id>download-licenses</id> + <goals> + <goal>download-licenses</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>bundle-contrib-exts</id> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> <execution> <id>pull-deps-contrib-exts</id> <phase>package</phase> @@ -255,53 +315,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distro-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>apache-druid-${project.parent.version}</finalName> - <tarLongFileMode>posix</tarLongFileMode> - <descriptors> - <descriptor>src/assembly/assembly.xml</descriptor> - </descriptors> - </configuration> - </execution> - <execution> - <id>source-release-assembly-druid</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>apache-druid-${project.version}-src</finalName> - <tarLongFileMode>posix</tarLongFileMode> - <descriptors> - <descriptor>src/assembly/source-assembly.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <executions> - <execution> - <id>download-licenses</id> - <goals> - <goal>download-licenses</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </profile> diff --git a/extensions-core/avro-extensions/pom.xml b/extensions-core/avro-extensions/pom.xml index 1272847..08d2c1f 100644 --- a/extensions-core/avro-extensions/pom.xml +++ b/extensions-core/avro-extensions/pom.xml @@ -90,6 +90,12 @@ <groupId>org.schemarepo</groupId> <artifactId>schema-repo-api</artifactId> <version>${schemarepo.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.schemarepo</groupId> diff --git a/extensions-core/druid-kerberos/pom.xml b/extensions-core/druid-kerberos/pom.xml index 4acabd1..aac05a9 100644 --- a/extensions-core/druid-kerberos/pom.xml +++ b/extensions-core/druid-kerberos/pom.xml @@ -160,6 +160,18 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/extensions-core/hdfs-storage/pom.xml b/extensions-core/hdfs-storage/pom.xml index 3b13479..e60a590 100644 --- a/extensions-core/hdfs-storage/pom.xml +++ b/extensions-core/hdfs-storage/pom.xml @@ -141,6 +141,18 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index a213e80..c9fdb84 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -86,11 +86,6 @@ <!-- Tests --> <dependency> - <groupId>com.amazonaws</groupId> - <artifactId>aws-java-sdk-bundle</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <scope>test</scope> diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMetersTotals.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMetersTotals.java index e7c8f5c..022548f 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMetersTotals.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMetersTotals.java @@ -19,7 +19,7 @@ package org.apache.druid.indexing.common.stats; -import com.amazonaws.thirdparty.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; public class RowIngestionMetersTotals diff --git a/pom.xml b/pom.xml index afec96b..c05dd90 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ <hadoop.compile.version>2.8.3</hadoop.compile.version> <hive.version>2.0.0</hive.version> <powermock.version>1.6.6</powermock.version> - <aws.sdk.bundle.version>1.11.199</aws.sdk.bundle.version> + <aws.sdk.version>1.11.199</aws.sdk.version> <caffeine.version>2.5.5</caffeine.version> <!-- When upgrading ZK, edit docs and integration tests as well (integration-tests/docker-base/setup.sh) --> <zookeeper.version>3.4.11</zookeeper.version> @@ -209,8 +209,13 @@ </dependency> <dependency> <groupId>com.amazonaws</groupId> - <artifactId>aws-java-sdk-bundle</artifactId> - <version>${aws.sdk.bundle.version}</version> + <artifactId>aws-java-sdk-ec2</artifactId> + <version>${aws.sdk.version}</version> + </dependency> + <dependency> + <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-s3</artifactId> + <version>${aws.sdk.version}</version> </dependency> <dependency> <groupId>com.ning</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
