-
Notifications
You must be signed in to change notification settings - Fork 3.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update dependencies #4313
Update dependencies #4313
Changes from 6 commits
f8ff083
dab641a
8ebc20d
0076ca3
e5fac2b
0ebfafd
10bd7ed
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,17 +58,18 @@ | |
</scm> | ||
|
||
<properties> | ||
<!-- Curator cannot be updated to 2.12.0 yet, see https://github.com/druid-io/druid/pull/4103 --> | ||
<apache.curator.version>2.11.0</apache.curator.version> | ||
<avatica.version>1.9.0</avatica.version> | ||
<calcite.version>1.11.0</calcite.version> | ||
<guava.version>16.0.1</guava.version> | ||
<guice.version>4.1.0</guice.version> | ||
<jetty.version>9.3.16.v20170120</jetty.version> | ||
<jersey.version>1.19</jersey.version> | ||
<jetty.version>9.3.19.v20170502</jetty.version> | ||
<jersey.version>1.19.3</jersey.version> | ||
<!-- Watch out for Hadoop compatibility when updating to >= 2.5; see https://github.com/druid-io/druid/pull/1669 --> | ||
<jackson.version>2.4.6</jackson.version> | ||
<log4j.version>2.5</log4j.version> | ||
<netty.version>4.1.6.Final</netty.version> | ||
<netty.version>4.1.11.Final</netty.version> | ||
<slf4j.version>1.7.12</slf4j.version> | ||
<!-- If compiling with different hadoop version also modify default hadoop coordinates in TaskConfig.java --> | ||
<hadoop.compile.version>2.7.3</hadoop.compile.version> | ||
|
@@ -140,17 +141,23 @@ | |
<dependency> | ||
<groupId>com.metamx</groupId> | ||
<artifactId>emitter</artifactId> | ||
<version>0.4.1</version> | ||
<version>0.4.5</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.metamx</groupId> | ||
<artifactId>http-client</artifactId> | ||
<version>1.0.6</version> | ||
<version>1.1.0</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.metamx</groupId> | ||
<artifactId>server-metrics</artifactId> | ||
<version>0.2.8</version> | ||
<exclusions> | ||
<exclusion> | ||
<groupId>com.metamx</groupId> | ||
<artifactId>java-util</artifactId> | ||
</exclusion> | ||
</exclusions> | ||
</dependency> | ||
<dependency> | ||
<groupId>commons-codec</groupId> | ||
|
@@ -165,7 +172,7 @@ | |
<dependency> | ||
<groupId>commons-io</groupId> | ||
<artifactId>commons-io</artifactId> | ||
<version>2.4</version> | ||
<version>2.5</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>commons-logging</groupId> | ||
|
@@ -180,9 +187,9 @@ | |
<dependency> | ||
<groupId>com.amazonaws</groupId> | ||
<artifactId>aws-java-sdk</artifactId> | ||
<!-- to use S3a via HDFS pusher/puller we need this version due to | ||
https://issues.apache.org/jira/browse/HADOOP-12420 --> | ||
<version>1.10.56</version> | ||
<!-- Cannot update to AWS SDK 1.11+ because of Jackson incompatibility. | ||
Need to update Druid to use Jackson 2.6+ --> | ||
<version>1.10.77</version> | ||
<exclusions> | ||
<exclusion> | ||
<groupId>javax.mail</groupId> | ||
|
@@ -200,6 +207,14 @@ | |
<groupId>commons-codec</groupId> | ||
<artifactId>commons-codec</artifactId> | ||
</exclusion> | ||
<exclusion> | ||
<groupId>com.amazonaws</groupId> | ||
<artifactId>aws-java-sdk-swf-libraries</artifactId> | ||
</exclusion> | ||
<exclusion> | ||
<groupId>com.amazonaws</groupId> | ||
<artifactId>aws-java-sdk-models</artifactId> | ||
</exclusion> | ||
</exclusions> | ||
</dependency> | ||
<dependency> | ||
|
@@ -233,7 +248,7 @@ | |
<dependency> | ||
<groupId>org.apache.zookeeper</groupId> | ||
<artifactId>zookeeper</artifactId> | ||
<version>3.4.9</version> | ||
<version>3.4.10</version> | ||
<exclusions> | ||
<exclusion> | ||
<groupId>org.slf4j</groupId> | ||
|
@@ -243,6 +258,10 @@ | |
<groupId>log4j</groupId> | ||
<artifactId>log4j</artifactId> | ||
</exclusion> | ||
<exclusion> | ||
<groupId>io.netty</groupId> | ||
<artifactId>netty</artifactId> | ||
</exclusion> | ||
</exclusions> | ||
</dependency> | ||
<dependency> | ||
|
@@ -314,7 +333,7 @@ | |
<dependency> | ||
<groupId>com.ibm.icu</groupId> | ||
<artifactId>icu4j</artifactId> | ||
<version>4.8.1</version> | ||
<version>54.1.1</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.mozilla</groupId> | ||
|
@@ -416,6 +435,11 @@ | |
<artifactId>jersey-server</artifactId> | ||
<version>${jersey.version}</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.sun.jersey</groupId> | ||
<artifactId>jersey-json</artifactId> | ||
<version>${jersey.version}</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.eclipse.jetty</groupId> | ||
<artifactId>jetty-server</artifactId> | ||
|
@@ -441,6 +465,11 @@ | |
<artifactId>jetty-util</artifactId> | ||
<version>${jetty.version}</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.eclipse.jetty</groupId> | ||
<artifactId>jetty-security</artifactId> | ||
<version>${jetty.version}</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>io.netty</groupId> | ||
<artifactId>netty-all</artifactId> | ||
|
@@ -449,7 +478,7 @@ | |
<dependency> | ||
<groupId>joda-time</groupId> | ||
<artifactId>joda-time</artifactId> | ||
<version>2.8.2</version> | ||
<version>2.9.9</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.code.findbugs</groupId> | ||
|
@@ -498,12 +527,12 @@ | |
<dependency> | ||
<groupId>com.lmax</groupId> | ||
<artifactId>disruptor</artifactId> | ||
<version>3.3.0</version> | ||
<version>3.3.6</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>net.spy</groupId> | ||
<artifactId>spymemcached</artifactId> | ||
<version>2.11.7</version> | ||
<version>2.12.3</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.antlr</groupId> | ||
|
@@ -586,12 +615,12 @@ | |
<dependency> | ||
<groupId>org.apache.httpcomponents</groupId> | ||
<artifactId>httpclient</artifactId> | ||
<version>4.5.1</version> | ||
<version>4.5.3</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.httpcomponents</groupId> | ||
<artifactId>httpcore</artifactId> | ||
<version>4.4.3</version> | ||
<version>4.4.6</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.hadoop</groupId> | ||
|
@@ -622,7 +651,7 @@ | |
<dependency> | ||
<groupId>it.unimi.dsi</groupId> | ||
<artifactId>fastutil</artifactId> | ||
<version>7.0.13</version> | ||
<version>7.2.0</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>net.sf.opencsv</groupId> | ||
|
@@ -654,6 +683,36 @@ | |
<artifactId>asm-commons</artifactId> | ||
<version>5.2</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.codehaus.jackson</groupId> | ||
<artifactId>jackson-core-asl</artifactId> | ||
<version>1.9.13</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.codehaus.jackson</groupId> | ||
<artifactId>jackson-mapper-asl</artifactId> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. what are these brought in for? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Specifying the version in dependencyManagement. There are conflicts in subprojects, where different dependencies want different version of this lib. |
||
<version>1.9.13</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>javax.servlet</groupId> | ||
<artifactId>javax.servlet-api</artifactId> | ||
<version>3.1.0</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>javax.activation</groupId> | ||
<artifactId>activation</artifactId> | ||
<version>1.1.1</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>commons-pool</groupId> | ||
<artifactId>commons-pool</artifactId> | ||
<version>1.6</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.codehaus.plexus</groupId> | ||
<artifactId>plexus-utils</artifactId> | ||
<version>3.0.15</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.calcite</groupId> | ||
<artifactId>calcite-core</artifactId> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can't exclude this though.
server-metrics
uses themetamx
origin ofjava-utl
, things in druid.io only use theio.druid
forkThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's to resolve conflict, I added this because some other library needs newer version of java-util than server-metrics depend on, maybe emitter or http-client