Skip to content

Commit 134dca6

Browse files
committed
Merge branch '1.8.x' into 1.9.x
2 parents 277c8dd + bd470ce commit 134dca6

File tree

31 files changed

+422
-3
lines changed

31 files changed

+422
-3
lines changed

config/checkstyle/checkstyle-suppressions.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<suppress checks="IllegalImport" files="samples[\\/].+" />
99
<suppress checks="IllegalImport" files="test[\\/]java[\\/]io[\\/]micrometer[\\/]core[\\/]instrument[\\/]binder[\\/]jersey[\\/]server.+" />
1010
<suppress checks="IllegalImport" files="test[\\/]java[\\/]io[\\/]micrometer[\\/]jersey.+" />
11+
<suppress checks="IllegalImport" files="test[\\/]java[\\/]io[\\/]micrometer[\\/]core[\\/]instrument.+Tests.java" />
1112

1213
<suppress checks="JavadocPackageCheck" files="benchmarks[\\/].+" />
1314
<suppress checks="JavadocPackageCheck" files="samples[\\/].+" />

dependencies.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ def VERSIONS = [
5252
'org.awaitility:awaitility:latest.release',
5353
'org.eclipse.jetty:jetty-client:9.+',
5454
'org.eclipse.jetty:jetty-server:9.+',
55+
'org.eclipse.jetty:jetty-servlet:9.+',
5556
'org.ehcache:ehcache:latest.release',
5657
'org.glassfish.jersey.core:jersey-server:2.+',
5758
'org.glassfish.jersey.inject:jersey-hk2:2.+',

implementations/micrometer-registry-appoptics/gradle.lockfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

implementations/micrometer-registry-atlas/gradle.lockfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

implementations/micrometer-registry-azure-monitor/gradle.lockfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

implementations/micrometer-registry-cloudwatch/gradle.lockfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

implementations/micrometer-registry-cloudwatch2/gradle.lockfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

implementations/micrometer-registry-datadog/gradle.lockfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

implementations/micrometer-registry-elastic/gradle.lockfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

implementations/micrometer-registry-ganglia/gradle.lockfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)