Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-26 04:55:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2448 from metamx/fixBigJarHadoopPlace

Browse Source 
Fix dependencies.
This commit is contained in:
Fangjin Yang 2016-02-11 10:47:00 -08:00
commit d435a9b1e9
6 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/hdfs-storage/pom.xml
View File

@ -35,25 +35,30 @@
<dependency> <dependency>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid-api</artifactId> <artifactId>druid-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid-common</artifactId> <artifactId>druid-common</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- override jets3t from hadoop-core --> <!-- override jets3t from hadoop-core -->
<dependency> <dependency>
<groupId>net.java.dev.jets3t</groupId> <groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId> <artifactId>jets3t</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!-- override httpclient / httpcore version from jets3t --> <!-- override httpclient / httpcore version from jets3t -->
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId> <artifactId>httpcore</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
@ -63,10 +68,12 @@
<dependency> <dependency>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>emitter</artifactId> <artifactId>emitter</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!-- Tests --> <!-- Tests -->

4
extensions/mysql-metadata-storage/pom.xml
View File

@ -36,16 +36,19 @@
<dependency> <dependency>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid-api</artifactId> <artifactId>druid-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid-common</artifactId> <artifactId>druid-common</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid-server</artifactId> <artifactId>druid-server</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
@ -55,6 +58,7 @@
<dependency> <dependency>
<groupId>org.jdbi</groupId> <groupId>org.jdbi</groupId>
<artifactId>jdbi</artifactId> <artifactId>jdbi</artifactId>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

4
extensions/postgresql-metadata-storage/pom.xml
View File

@ -36,16 +36,19 @@
<dependency> <dependency>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid-api</artifactId> <artifactId>druid-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid-common</artifactId> <artifactId>druid-common</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid-server</artifactId> <artifactId>druid-server</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
@ -55,6 +58,7 @@
<dependency> <dependency>
<groupId>org.jdbi</groupId> <groupId>org.jdbi</groupId>
<artifactId>jdbi</artifactId> <artifactId>jdbi</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

8
extensions/s3-extensions/pom.xml
View File

@ -36,39 +36,47 @@
<dependency> <dependency>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid-api</artifactId> <artifactId>druid-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid-aws-common</artifactId> <artifactId>druid-aws-common</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- override jets3t from hadoop-core --> <!-- override jets3t from hadoop-core -->
<dependency> <dependency>
<groupId>net.java.dev.jets3t</groupId> <groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId> <artifactId>jets3t</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!-- jets3t requires log4j 1.2 compatability --> <!-- jets3t requires log4j 1.2 compatability -->
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId> <artifactId>log4j-1.2-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!-- override httpclient / httpcore version from jets3t --> <!-- override httpclient / httpcore version from jets3t -->
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId> <artifactId>httpcore</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>emitter</artifactId> <artifactId>emitter</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!-- Tests --> <!-- Tests -->

2
indexing-service/src/main/java/io/druid/indexing/common/task/HadoopTask.java
View File

@ -87,7 +87,7 @@ public abstract class HadoopTask extends AbstractTask
return false; return false;
} }
final String fName = Paths.get(input.toURI()).getFileName().toString(); final String fName = Paths.get(input.toURI()).getFileName().toString();
return fName.startsWith("druid") && fName.endsWith(".jar"); return fName.startsWith("druid") && fName.endsWith(".jar") && !fName.endsWith("selfcontained.jar");
} }
catch (URISyntaxException e) { catch (URISyntaxException e) {
throw Throwables.propagate(e); throw Throwables.propagate(e);

4
services/src/main/java/io/druid/cli/PullDependencies.java
View File

@ -121,8 +121,8 @@ public class PullDependencies implements Runnable
"com.fasterxml.jackson.core", "com.fasterxml.jackson.core",
"com.fasterxml.jackson.dataformat", "com.fasterxml.jackson.dataformat",
"com.fasterxml.jackson.datatype", "com.fasterxml.jackson.datatype",
"io.netty", "org.roaringbitmap",
"org.roaringbitmap" "net.java.dev.jets3t"
); );
private TeslaAether aether; private TeslaAether aether;