hystrix 1.5.13, prepare for 1.1.3 release

yammer · Jul 13, 2017 · 23a9dc7 · 23a9dc7
1 parent 49024f8
commit 23a9dc7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,11 @@
-Next
+1.1.3, 1.1.3.{dw9, dw8, dw7} :: July 13, 2017
 ---
+* [Hystrix 1.5.13](https://github.com/Netflix/Hystrix/blob/master/CHANGELOG.md#version-1513-maven-central-bintray)
 * [Dropwizard 1.1.2](https://github.com/dropwizard/dropwizard/releases/tag/v1.1.2)
 * Assertj-core 3.8.0
 * Mockito-core 2.8.47
-* Error-prone-core 2.0.21
+* Error_prone_core 2.0.21
+* Adding jcenter/bintray repository
 
 1.1.2, 1.1.2.{dw9, dw8, dw7} :: May. 19, 2017
 ---

diff --git a/pom.xml b/pom.xml
@@ -69,6 +69,17 @@
         </repository>
     </distributionManagement>
 
+    <repositories>
+        <repository>
+            <id>jcenter.bintray.com</id>
+            <url>http://jcenter.bintray.com/</url>
+            <snapshots>
+                <enabled>false</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -129,7 +140,7 @@
                     <dependency>
                         <groupId>org.codehaus.plexus</groupId>
                         <artifactId>plexus-compiler-javac-errorprone</artifactId>
-                        <version>2.8.1</version>
+                        <version>2.8.2</version>
                     </dependency>
                     <dependency>
                         <groupId>com.google.errorprone</groupId>

diff --git a/tenacity-bom/pom.xml b/tenacity-bom/pom.xml
@@ -23,7 +23,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <dropwizard.version>1.1.2</dropwizard.version>
-        <hystrix.version>1.5.12</hystrix.version>
+        <hystrix.version>1.5.13</hystrix.version>
 
         <assertj.core.version>3.8.0</assertj.core.version>
         <assertj.guava.version>3.1.0</assertj.guava.version>

diff --git a/tenacity-core/src/main/java/com/yammer/tenacity/core/metrics/YammerMetricsPublisher.java b/tenacity-core/src/main/java/com/yammer/tenacity/core/metrics/YammerMetricsPublisher.java
@@ -21,6 +21,6 @@ public HystrixMetricsPublisherCommand getMetricsPublisherForCommand(HystrixComma
 
     @Override
     public HystrixMetricsPublisherThreadPool getMetricsPublisherForThreadPool(HystrixThreadPoolKey threadPoolKey, HystrixThreadPoolMetrics metrics, HystrixThreadPoolProperties properties) {
-        return new HystrixCodaHaleMetricsPublisherThreadPool(threadPoolKey, metrics, properties, metricRegistry);
+        return new HystrixCodaHaleMetricsPublisherThreadPool("", threadPoolKey, metrics, properties, metricRegistry);
     }
 }
diff --git a/...ty-core/src/main/java/com/yammer/tenacity/core/metrics/YammerMetricsPublisherCommand.java b/...ty-core/src/main/java/com/yammer/tenacity/core/metrics/YammerMetricsPublisherCommand.java
@@ -10,7 +10,7 @@ public class YammerMetricsPublisherCommand extends HystrixCodaHaleMetricsPublish
     protected final MetricRegistry metricRegistry;
 
     public YammerMetricsPublisherCommand(HystrixCommandKey commandKey, HystrixCommandGroupKey commandGroupKey, HystrixCommandMetrics metrics, HystrixCircuitBreaker circuitBreaker, HystrixCommandProperties properties, MetricRegistry metricRegistry) {
-        super(commandKey, commandGroupKey, metrics, circuitBreaker, properties, metricRegistry);
+        super("", commandKey, commandGroupKey, metrics, circuitBreaker, properties, metricRegistry);
         this.metrics = metrics;
         this.metricRegistry = metricRegistry;
     }