You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/03/30 16:08:17 UTC
[1/2] storm git commit: STORM-3009: Upgrade to Dropwizard 1.3.0,
and ensure storm-webapp has only one SLF4j binding on the classpath
Repository: storm
Updated Branches:
refs/heads/master 4bca4ad8d -> f8dc5a6ee
STORM-3009: Upgrade to Dropwizard 1.3.0, and ensure storm-webapp has only one SLF4j binding on the classpath
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dd780d1b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dd780d1b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dd780d1b
Branch: refs/heads/master
Commit: dd780d1b94ba4a3ae5cc4588905047fa76883330
Parents: adf4efb
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Sun Mar 25 19:13:14 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Sun Mar 25 20:10:29 2018 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
storm-webapp/pom.xml | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/dd780d1b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a1db623..b1976d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,7 +320,7 @@
<wagonVersion>1.0</wagonVersion>
<azure-eventhubs.version>0.13.1</azure-eventhubs.version>
<jersey.version>2.24.1</jersey.version>
- <dropwizard.version>1.1.2</dropwizard.version>
+ <dropwizard.version>1.3.0</dropwizard.version>
<j2html.version>1.0.0</j2html.version>
<jool.version>0.9.12</jool.version>
<caffeine.version>2.3.5</caffeine.version>
http://git-wip-us.apache.org/repos/asf/storm/blob/dd780d1b/storm-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/storm-webapp/pom.xml b/storm-webapp/pom.xml
index 1c7ecfc..9337261 100644
--- a/storm-webapp/pom.xml
+++ b/storm-webapp/pom.xml
@@ -43,12 +43,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>compile</scope>
@@ -56,6 +50,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
+ <!-- This is present in the Storm /lib directory, and should not also be present in /lib-webapp since both are on the classpath -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
@@ -88,16 +88,16 @@
<version>${dropwizard.version}</version>
<exclusions>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
</exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
</exclusion>
<exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-access</artifactId>
</exclusion>
</exclusions>
</dependency>
[2/2] storm git commit: Merge branch 'STORM-3009' of
https://github.com/srdo/storm into STORM-3009
Posted by bo...@apache.org.
Merge branch 'STORM-3009' of https://github.com/srdo/storm into STORM-3009
STORM-3009: Upgrade to Dropwizard 1.3.0
This closes #2606
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f8dc5a6e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f8dc5a6e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f8dc5a6e
Branch: refs/heads/master
Commit: f8dc5a6ee4e781e207160dfca12efcbcc6734d57
Parents: 4bca4ad dd780d1
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Fri Mar 30 10:43:12 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Fri Mar 30 10:43:12 2018 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
storm-webapp/pom.xml | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------