You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2021/03/01 18:19:39 UTC
[geode] branch support/1.12 updated: GEODE-8981: Bump micrometer
from 1.2.1 to 1.6.3 also bumps HdrHistogram from 2.1.11 to 2.1.12 as
required for this version of micrometer
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 8d4f6ea GEODE-8981: Bump micrometer from 1.2.1 to 1.6.3 also bumps HdrHistogram from 2.1.11 to 2.1.12 as required for this version of micrometer
8d4f6ea is described below
commit 8d4f6ea05241e1d805e737ca91cef0dea504ef99
Author: Owen Nichols <on...@apache.org>
AuthorDate: Mon Mar 1 10:11:30 2021 -0800
GEODE-8981: Bump micrometer from 1.2.1 to 1.6.3
also bumps HdrHistogram from 2.1.11 to 2.1.12 as required for this version of micrometer
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../org/apache/geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
geode-assembly/src/integrationTest/resources/assembly_content.txt | 4 ++--
geode-assembly/src/integrationTest/resources/dependency_classpath.txt | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 1669aa6..097de21 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -214,7 +214,7 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
- <version>1.2.1</version>
+ <version>1.6.3</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index ff71c4d..bd026ab 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -41,7 +41,7 @@ class DependencyConstraints implements Plugin<Project> {
deps.put("javax.transaction-api.version", "1.3")
deps.put("jgroups.version", "3.6.14.Final")
deps.put("log4j.version", "2.12.1")
- deps.put("micrometer.version", "1.2.1")
+ deps.put("micrometer.version", "1.6.3")
deps.put("shiro.version", "1.7.1")
deps.put("slf4j-api.version", "1.7.28")
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 76966c5..5e81e9b 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -956,7 +956,7 @@ javadoc/package-list
javadoc/script.js
javadoc/serialized-form.html
javadoc/stylesheet.css
-lib/HdrHistogram-2.1.11.jar
+lib/HdrHistogram-2.1.12.jar
lib/HikariCP-3.4.1.jar
lib/LatencyUtils-2.0.3.jar
lib/antlr-2.7.7.jar
@@ -1036,7 +1036,7 @@ lib/lucene-analyzers-phonetic-6.6.6.jar
lib/lucene-core-6.6.6.jar
lib/lucene-queries-6.6.6.jar
lib/lucene-queryparser-6.6.6.jar
-lib/micrometer-core-1.2.1.jar
+lib/micrometer-core-1.6.3.jar
lib/mx4j-3.0.2.jar
lib/mx4j-remote-3.0.2.jar
lib/mx4j-tools-3.0.1.jar
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 3b5af8e..3191842 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -42,7 +42,7 @@ commons-io-2.6.jar
httpclient-4.5.13.jar
commons-logging-1.2.jar
classgraph-4.8.52.jar
-micrometer-core-1.2.1.jar
+micrometer-core-1.6.3.jar
fastutil-8.3.0.jar
javax.resource-api-1.7.1.jar
jetty-webapp-9.4.34.v20201102.jar
@@ -68,7 +68,7 @@ swagger-annotations-1.5.23.jar
spring-core-5.2.9.RELEASE.jar
javax.activation-api-1.2.0.jar
jline-2.12.jar
-HdrHistogram-2.1.11.jar
+HdrHistogram-2.1.12.jar
LatencyUtils-2.0.3.jar
javax.transaction-api-1.3.jar
spring-jcl-5.2.9.RELEASE.jar