Repository: storm Updated Branches: refs/heads/master 9e97a0758 -> 4cd851bd4
STORM-3061: Remove unused core dependencies Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5cdb9c0a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5cdb9c0a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5cdb9c0a Branch: refs/heads/master Commit: 5cdb9c0acf2dbfff2c1bebd4b5a6931ed98558bc Parents: 9e97a07 Author: Robert (Bobby) Evans <[email protected]> Authored: Wed May 23 10:12:06 2018 -0500 Committer: Robert (Bobby) Evans <[email protected]> Committed: Wed May 23 15:05:54 2018 -0500 ---------------------------------------------------------------------- bin/storm.py | 4 ---- pom.xml | 7 ------- storm-core/pom.xml | 9 --------- 3 files changed, 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/5cdb9c0a/bin/storm.py ---------------------------------------------------------------------- diff --git a/bin/storm.py b/bin/storm.py index d47fdb0..e11a8c0 100755 --- a/bin/storm.py +++ b/bin/storm.py @@ -705,7 +705,6 @@ def nimbus(klass="org.apache.storm.daemon.nimbus.Nimbus"): cppaths = [CLUSTER_CONF_DIR] jvmopts = parse_args(confvalue("nimbus.childopts", cppaths)) + [ "-Dlogfile.name=nimbus.log", - "-DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector", "-Dlog4j.configurationFile=" + os.path.join(get_log4j2_conf_dir(), "cluster.xml"), ] exec_storm_class( @@ -770,7 +769,6 @@ def ui(): cppaths = [CLUSTER_CONF_DIR] jvmopts = parse_args(confvalue("ui.childopts", cppaths)) + [ "-Dlogfile.name=ui.log", - "-DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector", "-Dlog4j.configurationFile=" + os.path.join(get_log4j2_conf_dir(), "cluster.xml") ] exec_storm_class( @@ -793,7 +791,6 @@ def logviewer(): cppaths = [CLUSTER_CONF_DIR] jvmopts = parse_args(confvalue("logviewer.childopts", cppaths)) + [ "-Dlogfile.name=logviewer.log", - "-DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector", "-Dlog4j.configurationFile=" + os.path.join(get_log4j2_conf_dir(), "cluster.xml") ] @@ -838,7 +835,6 @@ def drpc(): cppaths = [CLUSTER_CONF_DIR] jvmopts = parse_args(confvalue("drpc.childopts", cppaths)) + [ "-Dlogfile.name=drpc.log", - "-DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector", "-Dlog4j.configurationFile=" + os.path.join(get_log4j2_conf_dir(), "cluster.xml") ] allextrajars = get_wildcard_dir(STORM_WEBAPP_LIB_DIR) http://git-wip-us.apache.org/repos/asf/storm/blob/5cdb9c0a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0b18947..71c8a7e 100644 --- a/pom.xml +++ b/pom.xml @@ -249,7 +249,6 @@ <!-- dependency versions --> <clojure.version>1.7.0</clojure.version> - <java_jmx.version>0.3.1</java_jmx.version> <compojure.version>1.1.9</compojure.version> <hiccup.version>0.3.6</hiccup.version> <commons-compress.version>1.4.1</commons-compress.version> @@ -274,7 +273,6 @@ <httpclient.version>4.3.3</httpclient.version> <clojure.tools.cli.version>0.2.4</clojure.tools.cli.version> <jctools.version>2.0.1</jctools.version> - <disruptor.version>3.3.2</disruptor.version> <jgrapht.version>0.9.0</jgrapht.version> <guava.version>16.0.1</guava.version> <auto-service.version>1.0-rc3</auto-service.version> @@ -913,11 +911,6 @@ <version>${jctools.version}</version> </dependency> <dependency> - <groupId>com.lmax</groupId> - <artifactId>disruptor</artifactId> - <version>${disruptor.version}</version> - </dependency> - <dependency> <groupId>org.jgrapht</groupId> <artifactId>jgrapht-core</artifactId> <version>${jgrapht.version}</version> http://git-wip-us.apache.org/repos/asf/storm/blob/5cdb9c0a/storm-core/pom.xml ---------------------------------------------------------------------- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 179e0b9..44b9212 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -140,11 +140,6 @@ <artifactId>data.codec</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.clojure</groupId> - <artifactId>java.jmx</artifactId> - <version>${java_jmx.version}</version> - </dependency> <!--java--> <dependency> @@ -226,10 +221,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>com.lmax</groupId> - <artifactId>disruptor</artifactId> - </dependency> - <dependency> <groupId>org.jgrapht</groupId> <artifactId>jgrapht-core</artifactId> <scope>compile</scope>
