Skip to content

Commit 2a497ab

Browse files
shakuzenshakuzen
committed
japicmp for 1.9.x branch
1 parent 71bad06 commit 2a497ab

3 files changed

Lines changed: 35 additions & 34 deletions

File tree

‎build.gradle‎

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,12 @@ subprojects {
103103
javadoc {
104104
if (project.name.contains('samples')) {
105105
enabled = false
106-
}
107-
else {
106+
} else {
108107
configure(options) {
109108
tags(
110-
'apiNote:a:API Note:',
111-
'implSpec:a:Implementation Requirements:',
112-
'implNote:a:Implementation Note:'
109+
'apiNote:a:API Note:',
110+
'implSpec:a:Implementation Requirements:',
111+
'implNote:a:Implementation Note:'
113112
)
114113
options.addBooleanOption('Xdoclint:all,-missing', true)
115114
}
@@ -121,20 +120,20 @@ subprojects {
121120
runtimeClasspath {
122121
metaInf {
123122
[
124-
'Build-Date',
125-
'Build-Date-UTC',
126-
'Built-By',
127-
'Built-OS',
128-
'Build-Host',
129-
'Build-Job',
130-
'Build-Number',
131-
'Build-Id',
132-
'Change',
133-
'Full-Change',
134-
'Branch',
135-
'Module-Origin',
136-
'Created-By',
137-
'Build-Java-Version'
123+
'Build-Date',
124+
'Build-Date-UTC',
125+
'Built-By',
126+
'Built-OS',
127+
'Build-Host',
128+
'Build-Job',
129+
'Build-Number',
130+
'Build-Id',
131+
'Change',
132+
'Full-Change',
133+
'Branch',
134+
'Module-Origin',
135+
'Created-By',
136+
'Build-Java-Version'
138137
].each {
139138
ignoreAttribute it
140139
ignoreProperty it
@@ -261,7 +260,7 @@ subprojects {
261260
description = 'Resolves dependencies of all configurations and writes them into the lock file.'
262261
outputs.upToDateWhen { false }
263262
doFirst {
264-
assert gradle.startParameter.writeDependencyLocks || gradle.startParameter.lockedDependenciesToUpdate : 'Execute resolveAndLockAll --write-locks or --update-locks <dependencies>'
263+
assert gradle.startParameter.writeDependencyLocks || gradle.startParameter.lockedDependenciesToUpdate: 'Execute resolveAndLockAll --write-locks or --update-locks <dependencies>'
265264
}
266265
doLast {
267266
project.configurations.findAll { it.canBeResolved }*.resolve()
@@ -275,7 +274,7 @@ subprojects {
275274
}
276275
}
277276

278-
if(!['samples', 'benchmarks'].find{project.name.contains(it)}) {
277+
if (!['samples', 'benchmarks'].find { project.name.contains(it) }) {
279278
apply plugin: 'nebula.maven-publish'
280279
apply plugin: 'nebula.maven-manifest'
281280
apply plugin: 'nebula.maven-developer'
@@ -318,7 +317,7 @@ subprojects {
318317
String rootUrl
319318
if (compatibleVersion.contains('-M') || compatibleVersion.contains('-RC')) {
320319
rootUrl = 'https://repo.spring.io/milestone/'
321-
} else if (compatibleVersion.contains('-SNAPSHOT') ) {
320+
} else if (compatibleVersion.contains('-SNAPSHOT')) {
322321
rootUrl = 'https://repo.spring.io/snapshot/'
323322
} else {
324323
rootUrl = repositories.mavenCentral().url
@@ -340,8 +339,9 @@ subprojects {
340339

341340
packageExcludes = ['io.micrometer.shaded.*', 'io.micrometer.statsd.internal']
342341

343-
// For 1.8.x branch only.
344-
classExcludes = ['io.micrometer.core.instrument.util.JsonUtils']
342+
// For 1.9.x branch only.
343+
classExcludes = ['io.micrometer.core.ipc.http.ReactorNettySender',
344+
'io.micrometer.core.tck.RegistryResolver']
345345

346346
// TODO remove methodExcludes when gh-3181 is resolved
347347
methodExcludes = ['io.micrometer.stackdriver.StackdriverConfig#metricTypePrefix()',
@@ -355,14 +355,9 @@ subprojects {
355355
'io.micrometer.core.instrument.LongTaskTimer#record(java.util.function.DoubleSupplier)',
356356
'io.micrometer.signalfx.SignalFxConfig#publishDeltaHistogram()',
357357

358-
// For 1.8.x branch only.
359-
'io.micrometer.core.instrument.binder.mongodb.MongoCommandTagsProvider#commandStarted(com.mongodb.event.CommandStartedEvent)',
360-
'io.micrometer.dynatrace.DynatraceConfig#apiVersion()',
361-
'io.micrometer.dynatrace.DynatraceConfig#defaultDimensions()',
362-
'io.micrometer.dynatrace.DynatraceConfig#enrichWithDynatraceMetadata()',
363-
'io.micrometer.dynatrace.DynatraceConfig#metricKeyPrefix()',
364-
'io.micrometer.elastic.ElasticConfig#apiKeyCredentials()',
365-
'io.micrometer.stackdriver.StackdriverConfig#useSemanticMetricTypes()'
358+
// For 1.9.x branch only.
359+
'io.micrometer.dynatrace.DynatraceConfig#useDynatraceSummaryInstruments()',
360+
'io.micrometer.signalfx.SignalFxConfig#publishCumulativeHistogram()'
366361
]
367362
onlyIf { compatibleVersion != 'SKIP' }
368363
}
@@ -400,7 +395,7 @@ nexusPublishing {
400395
}
401396
}
402397

403-
task deleteLockFiles (type: Delete) {
398+
task deleteLockFiles(type: Delete) {
404399
delete fileTree(dir: '.', include: '**/*.lockfile')
405400
}
406401

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ org.gradle.jvmargs=-Xmx1g
33
org.gradle.parallel=true
44
org.gradle.vfs.watch=true
55

6-
compatibleVersion=1.7.12
6+
compatibleVersion=1.8.9
77

88
nebula.dependencyLockPluginEnabled=false

‎implementations/micrometer-registry-otlp/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,9 @@ dependencies {
88

99
testImplementation project(':micrometer-test')
1010
}
11+
12+
// new module in 1.9. This can be removed in later branches.
13+
if ("$project.version".startsWith("1.9.")) {
14+
japicmp.enabled = false
15+
downloadBaseline.enabled = false
16+
}

0 commit comments

Comments
 (0)