[bookkeeper] branch master updated: Fix unable download twitter dependencies

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new b689d83  Fix unable download twitter dependencies
b689d83 is described below

commit b689d8313654de21759b2e2d47210b75434038c3
Author: yong.zhang <zh...@gmail.com>
AuthorDate: Wed Feb 27 15:21:49 2019 +0800

    Fix unable download twitter dependencies
    
    ---
    
    Fixes #1962
    
    *Motivation*
    
    There are some twitter dependencies can't download from repo
    
    *Modifications*
    
    - remove some using in StatsLoggerBenchmark.java
    - update some config in pom.xml
    
    Descriptions of the changes in this PR:
    
    You can add -Dtwitter to choose add twitter dependencies.
    
    ### Motivation
    
    (Explain: why you're making that change, what is the problem you're trying to solve)
    
    ### Changes
    
    (Describe: what changes you have made)
    
    Master Issue: #1962
    
    
    
    
    Reviewers: Enrico Olivelli <eo...@gmail.com>, Jia Zhai <zh...@apache.org>, Sijie Guo <si...@apache.org>
    
    This closes #1966 from zymap/master
---
 bookkeeper-server/pom.xml                           | 20 --------------------
 bookkeeper-stats-providers/pom.xml                  | 21 ++++++++++++++++++---
 microbenchmarks/pom.xml                             | 10 ----------
 .../bookkeeper/stats/StatsLoggerBenchmark.java      |  4 ----
 4 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
index a2d8538..1b13196 100644
--- a/bookkeeper-server/pom.xml
+++ b/bookkeeper-server/pom.xml
@@ -242,26 +242,6 @@
   </build>
   <profiles>
     <profile>
-      <id>twitter-science-provider</id>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.bookkeeper.stats</groupId>
-          <artifactId>twitter-science-provider</artifactId>
-          <version>${project.parent.version}</version>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>codahale-metrics-provider</id>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.bookkeeper.stats</groupId>
-          <artifactId>codahale-metrics-provider</artifactId>
-          <version>${project.parent.version}</version>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
       <id>twitter-http-server</id>
       <dependencies>
         <dependency>
diff --git a/bookkeeper-stats-providers/pom.xml b/bookkeeper-stats-providers/pom.xml
index b36d369..75af272 100644
--- a/bookkeeper-stats-providers/pom.xml
+++ b/bookkeeper-stats-providers/pom.xml
@@ -26,10 +26,25 @@
   <packaging>pom</packaging>
   <name>Apache BookKeeper :: Stats Providers</name>
   <modules>
-    <module>twitter-finagle-provider</module>
-    <module>twitter-science-provider</module>
-    <module>twitter-ostrich-provider</module>
     <module>codahale-metrics-provider</module>
     <module>prometheus-metrics-provider</module>
   </modules>
+
+  <profiles>
+    <profile>
+      <id>twitter</id>
+      <activation>
+        <property>
+          <name>twitter</name>
+        </property>
+      </activation>
+      <modules>
+        <!-- only building twitter stats providers when `-Dtwitter` is provided -->
+        <module>twitter-finagle-provider</module>
+        <module>twitter-science-provider</module>
+        <module>twitter-ostrich-provider</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml
index 8ec203c..8aa66a7 100644
--- a/microbenchmarks/pom.xml
+++ b/microbenchmarks/pom.xml
@@ -63,16 +63,6 @@
       <artifactId>codahale-metrics-provider</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.bookkeeper.stats</groupId>
-      <artifactId>twitter-science-provider</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.bookkeeper.stats</groupId>
-      <artifactId>twitter-ostrich-provider</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java b/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java
index 0a2cd06..3986ffa 100644
--- a/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java
+++ b/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java
@@ -30,8 +30,6 @@ import org.apache.bookkeeper.stats.StatsProvider;
 import org.apache.bookkeeper.stats.codahale.CodahaleMetricsProvider;
 import org.apache.bookkeeper.stats.codahale.FastCodahaleMetricsProvider;
 import org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider;
-import org.apache.bookkeeper.stats.twitter.ostrich.OstrichProvider;
-import org.apache.bookkeeper.stats.twitter.science.TwitterStatsProvider;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Level;
@@ -60,8 +58,6 @@ public class StatsLoggerBenchmark {
         providers.put("Prometheus", PrometheusMetricsProvider::new);
         providers.put("Codahale", CodahaleMetricsProvider::new);
         providers.put("FastCodahale", FastCodahaleMetricsProvider::new);
-        providers.put("Twitter", TwitterStatsProvider::new);
-        providers.put("Ostrich", OstrichProvider::new);
     }
 
     @State(Scope.Benchmark)