From 4feaa7f2dad168f834219183313380ee14308dba Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Thu, 14 Sep 2023 14:42:54 -0700 Subject: [PATCH] Fix build failures caused by antora changes --- .github/workflows/deploy-docs.yml | 2 +- build.gradle | 16 +-- config/checkstyle/checkstyle-suppressions.xml | 1 + docs/antora.yml | 2 +- docs/build.gradle | 95 +++++++++------ docs/gradle.lockfile | 111 ------------------ .../context/DefaultContextSnapshotTests.java | 4 +- .../ObservationThreadLocalAccessor.java | 4 +- .../context/ObservationThreadLocalHolder.java | 4 +- .../ObservationConfiguringTests.java | 2 +- .../observation/ObservationHandlerTests.java | 2 +- .../ObservationInstrumentingTests.java | 3 +- .../observation/ObservationTestingTests.java | 2 +- .../resources/docs-generator-build.gradle | 2 +- .../src/test/resources/docs-generator-pom.xml | 17 +++ gradle.properties | 2 - settings.gradle | 4 +- 17 files changed, 95 insertions(+), 178 deletions(-) delete mode 100644 docs/gradle.lockfile diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index e4d12b67e8..ba18129c4a 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: docs-build fetch-depth: 1 diff --git a/build.gradle b/build.gradle index e0169d6b22..3d39c2b34c 100644 --- a/build.gradle +++ b/build.gradle @@ -35,10 +35,8 @@ buildscript { // TODO: remove this hack, see: https://github.com/nebula-plugins/nebula-release-plugin/issues/213 def releaseStage = findProperty('release.stage') -if (!project.hasProperty("antora")) { - apply plugin: 'com.netflix.nebula.release' - release.defaultVersionStrategy = nebula.plugin.release.git.opinion.Strategies.SNAPSHOT -} +apply plugin: 'com.netflix.nebula.release' +release.defaultVersionStrategy = nebula.plugin.release.git.opinion.Strategies.SNAPSHOT apply plugin: 'io.github.gradle-nexus.publish-plugin' apply from: 'dependencies.gradle' @@ -298,11 +296,8 @@ subprojects { apply plugin: 'com.netflix.nebula.maven-apache-license' apply plugin: 'com.netflix.nebula.publish-verification' apply plugin: 'com.netflix.nebula.contacts' - - if (!project.hasProperty("antora")) { - apply plugin: 'com.netflix.nebula.info' - apply plugin: 'com.netflix.nebula.project' - } + apply plugin: 'com.netflix.nebula.info' + apply plugin: 'com.netflix.nebula.project' if (project.name != 'micrometer-bom') { apply plugin: 'biz.aQute.bnd.builder' @@ -415,8 +410,7 @@ subprojects { } def check = tasks.findByName('check') - boolean antora = project.hasProperty("antora") - if (check && !antora) project.rootProject.tasks.releaseCheck.dependsOn check + if (check) project.rootProject.tasks.releaseCheck.dependsOn check } nexusPublishing { diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml index de6300e345..afa2ac6d9b 100644 --- a/config/checkstyle/checkstyle-suppressions.xml +++ b/config/checkstyle/checkstyle-suppressions.xml @@ -10,6 +10,7 @@ + diff --git a/docs/antora.yml b/docs/antora.yml index a971073ee3..4694ee6a60 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -6,7 +6,7 @@ nav: ext: collector: run: - command: gradlew -q -PbuildSrc.skipTests=true -Pantora "-Dorg.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError" :docs:generateAntoraResources + command: ./gradlew -q -PbuildSrc.skipTests=true "-Dorg.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError" :docs:generateAntoraResources local: true scan: dir: ./build/generated-antora-resources diff --git a/docs/build.gradle b/docs/build.gradle index a243920674..25d20a2161 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -1,11 +1,48 @@ -plugins { - id 'java' - id 'io.spring.antora.generate-antora-yml' version '0.0.1' - id 'org.antora' version '1.0.0' - id 'java-library' +buildscript { + dependencyLocking { + lockAllConfigurations() + } + + repositories { + mavenCentral() + gradlePluginPortal() + } + + dependencies { + classpath 'io.spring.gradle.antora:spring-antora-plugin:0.0.1' + classpath 'org.antora:gradle-antora-plugin:1.0.0' + } +} + +apply plugin: 'java' +apply plugin: 'io.spring.antora.generate-antora-yml' +apply plugin: 'org.antora' + +description = 'Micrometer Docs' + +repositories { + mavenCentral() } -description = "Micrometer Docs" +dependencies { + implementation project(':micrometer-core') + implementation 'io.micrometer:context-propagation' + implementation 'ch.qos.logback:logback-classic' + implementation 'org.slf4j:slf4j-api' + + testImplementation project(':micrometer-test') + testImplementation project(':micrometer-observation-test') + testImplementation 'org.aspectj:aspectjweaver' + testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation 'org.mockito:mockito-inline' + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.springframework:spring-context' + testImplementation 'io.projectreactor:reactor-core' + testImplementation 'io.projectreactor:reactor-test' + testImplementation 'io.netty:netty-transport' + testImplementation 'org.apache.httpcomponents.client5:httpclient5' + testImplementation 'io.javalin:javalin:latest.release' +} antora { version = '3.2.0-alpha.2' @@ -26,23 +63,18 @@ antora { ] } - -tasks.named("generateAntoraYml") { - asciidocAttributes = project.provider( { - return ["micrometer-version": project.version.toString()] - } ) +tasks.named('generateAntoraYml') { + asciidocAttributes = project.provider { + return ['micrometer-version': project.version.toString()] + } } -tasks.create("generateAntoraResources") { +tasks.create('generateAntoraResources') { dependsOn 'generateAntoraYml' } -tasks.named("antora") { - dependsOn "generateAntoraResources" -} - -tasks.named("antora") { - dependsOn "test" +tasks.named('antora') { + dependsOn 'generateAntoraResources', 'test' } jar { @@ -53,27 +85,14 @@ javadoc { enabled = false } -repositories { - mavenCentral() +tasks.withType(AbstractPublishToMaven).configureEach { + enabled = false } -dependencies { - implementation project(":micrometer-core") - implementation 'io.micrometer:context-propagation' - implementation 'ch.qos.logback:logback-classic' - implementation 'org.slf4j:slf4j-api' - - testImplementation project(":micrometer-test") - testImplementation project(":micrometer-observation-test") - testImplementation 'org.aspectj:aspectjweaver' - testImplementation 'org.junit.jupiter:junit-jupiter' - testImplementation 'org.mockito:mockito-inline' - testImplementation 'org.assertj:assertj-core' - testImplementation 'org.springframework:spring-context' - testImplementation 'io.projectreactor:reactor-core' - testImplementation 'io.projectreactor:reactor-test' - testImplementation 'io.netty:netty-transport' - testImplementation 'org.apache.httpcomponents.client5:httpclient5' - testImplementation 'io.javalin:javalin:latest.release' +downloadBaseline { + enabled = false } +japicmp { + enabled = false +} diff --git a/docs/gradle.lockfile b/docs/gradle.lockfile deleted file mode 100644 index b6cac04773..0000000000 --- a/docs/gradle.lockfile +++ /dev/null @@ -1,111 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -antlr:antlr:2.7.7=nohttp -ch.qos.logback:logback-classic:1.2.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-classic:1.2.3=checkstyle,nohttp,nohttp-cli -ch.qos.logback:logback-core:1.2.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.3=checkstyle,nohttp,nohttp-cli -com.github.tomakehurst:wiremock-jre8-standalone:2.33.2=testCompileClasspath,testRuntimeClasspath -com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,nohttp,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.3.4=nohttp -com.google.errorprone:error_prone_annotations:2.7.1=checkstyle -com.google.guava:failureaccess:1.0.1=checkstyle,nohttp -com.google.guava:guava:29.0-jre=nohttp -com.google.guava:guava:31.0.1-jre=checkstyle -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,nohttp -com.google.j2objc:j2objc-annotations:1.3=checkstyle,nohttp -com.puppycrawl.tools:checkstyle:8.33=nohttp -com.puppycrawl.tools:checkstyle:9.3=checkstyle -commons-beanutils:commons-beanutils:1.9.4=checkstyle,nohttp -commons-collections:commons-collections:3.2.2=checkstyle,nohttp -commons-logging:commons-logging:1.2=nohttp -info.picocli:picocli:3.9.5=nohttp-cli -info.picocli:picocli:4.3.1=nohttp -info.picocli:picocli:4.6.2=checkstyle -io.javalin:javalin:5.6.2=testCompileClasspath,testRuntimeClasspath -io.micrometer:context-propagation:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-bom:4.1.96.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.96.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.96.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.96.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.96.Final=testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-bom:2022.0.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-core:3.5.9=testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-test:3.5.9=testCompileClasspath,testRuntimeClasspath -io.spring.javaformat:spring-javaformat-checkstyle:0.0.39=checkstyle -io.spring.javaformat:spring-javaformat-config:0.0.39=checkstyle -io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp -io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli -io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli -jakarta.annotation:jakarta.annotation-api:2.1.1=testCompileClasspath,testRuntimeClasspath -jakarta.transaction:jakarta.transaction-api:2.0.0=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.14.5=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.5=testCompileClasspath,testRuntimeClasspath -net.sf.saxon:Saxon-HE:10.6=checkstyle -net.sf.saxon:Saxon-HE:9.9.1-7=nohttp -org.antlr:antlr4-runtime:4.8-1=nohttp -org.antlr:antlr4-runtime:4.9.3=checkstyle -org.apache.httpcomponents.client5:httpclient5:5.3-alpha1=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.core5:httpcore5-h2:5.2.2=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.core5:httpcore5:5.2.2=testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.aspectj:aspectjweaver:1.8.14=testCompileClasspath,testRuntimeClasspath -org.assertj:assertj-core:3.24.2=testCompileClasspath,testRuntimeClasspath -org.awaitility:awaitility:4.2.0=testRuntimeClasspath -org.checkerframework:checker-qual:2.11.1=nohttp -org.checkerframework:checker-qual:3.12.0=checkstyle -org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.websocket:websocket-core-common:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.websocket:websocket-core-server:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.websocket:websocket-jetty-api:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.websocket:websocket-jetty-common:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.websocket:websocket-jetty-server:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.websocket:websocket-servlet:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-annotations:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-jndi:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-plus:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-webapp:11.0.15=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-xml:11.0.15=testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:2.1=testRuntimeClasspath -org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath -org.javassist:javassist:3.28.0-GA=checkstyle -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21=testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21=testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21=testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.8.21=testCompileClasspath,testRuntimeClasspath -org.jetbrains:annotations:24.0.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.10.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.10.0=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath -org.mockito:mockito-core:5.4.0=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath -org.objenesis:objenesis:3.3=testRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-commons:9.5=testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-tree:9.5=testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm:9.5=testCompileClasspath,testRuntimeClasspath -org.reactivestreams:reactive-streams:1.0.4=testCompileClasspath,testRuntimeClasspath -org.reflections:reflections:0.10.2=checkstyle -org.slf4j:slf4j-api:1.7.26=nohttp,nohttp-cli -org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath -org.slf4j:slf4j-api:2.0.7=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-aop:5.3.29=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-beans:5.3.29=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-context:5.3.29=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-core:5.3.29=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-expression:5.3.29=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-jcl:5.3.29=testCompileClasspath,testRuntimeClasspath -ru.lanwen.wiremock:wiremock-junit5:1.3.1=testCompileClasspath,testRuntimeClasspath -empty=annotationProcessor,baseline,signatures,testAnnotationProcessor diff --git a/docs/src/test/java/io/micrometer/docs/context/DefaultContextSnapshotTests.java b/docs/src/test/java/io/micrometer/docs/context/DefaultContextSnapshotTests.java index ca8dbc2570..643ccd4c6b 100644 --- a/docs/src/test/java/io/micrometer/docs/context/DefaultContextSnapshotTests.java +++ b/docs/src/test/java/io/micrometer/docs/context/DefaultContextSnapshotTests.java @@ -1,11 +1,11 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2023 VMware, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/docs/src/test/java/io/micrometer/docs/context/ObservationThreadLocalAccessor.java b/docs/src/test/java/io/micrometer/docs/context/ObservationThreadLocalAccessor.java index d250e5f169..9c791b260b 100644 --- a/docs/src/test/java/io/micrometer/docs/context/ObservationThreadLocalAccessor.java +++ b/docs/src/test/java/io/micrometer/docs/context/ObservationThreadLocalAccessor.java @@ -1,11 +1,11 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2023 VMware, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/docs/src/test/java/io/micrometer/docs/context/ObservationThreadLocalHolder.java b/docs/src/test/java/io/micrometer/docs/context/ObservationThreadLocalHolder.java index 918c1dc04c..6e33456179 100644 --- a/docs/src/test/java/io/micrometer/docs/context/ObservationThreadLocalHolder.java +++ b/docs/src/test/java/io/micrometer/docs/context/ObservationThreadLocalHolder.java @@ -1,11 +1,11 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2023 VMware, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/docs/src/test/java/io/micrometer/docs/observation/ObservationConfiguringTests.java b/docs/src/test/java/io/micrometer/docs/observation/ObservationConfiguringTests.java index 732667b7f7..2c0e6ef266 100644 --- a/docs/src/test/java/io/micrometer/docs/observation/ObservationConfiguringTests.java +++ b/docs/src/test/java/io/micrometer/docs/observation/ObservationConfiguringTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 VMware, Inc. + * Copyright 2023 VMware, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/test/java/io/micrometer/docs/observation/ObservationHandlerTests.java b/docs/src/test/java/io/micrometer/docs/observation/ObservationHandlerTests.java index 9520db315c..b03be0d4e6 100644 --- a/docs/src/test/java/io/micrometer/docs/observation/ObservationHandlerTests.java +++ b/docs/src/test/java/io/micrometer/docs/observation/ObservationHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 VMware, Inc. + * Copyright 2023 VMware, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/test/java/io/micrometer/docs/observation/ObservationInstrumentingTests.java b/docs/src/test/java/io/micrometer/docs/observation/ObservationInstrumentingTests.java index 3e352d3536..bef477a64c 100644 --- a/docs/src/test/java/io/micrometer/docs/observation/ObservationInstrumentingTests.java +++ b/docs/src/test/java/io/micrometer/docs/observation/ObservationInstrumentingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 VMware, Inc. + * Copyright 2023 VMware, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ */ package io.micrometer.docs.observation; - import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; import com.github.tomakehurst.wiremock.junit5.WireMockTest; import io.javalin.Javalin; diff --git a/docs/src/test/java/io/micrometer/docs/observation/ObservationTestingTests.java b/docs/src/test/java/io/micrometer/docs/observation/ObservationTestingTests.java index 4ca8644488..3ee4149e89 100644 --- a/docs/src/test/java/io/micrometer/docs/observation/ObservationTestingTests.java +++ b/docs/src/test/java/io/micrometer/docs/observation/ObservationTestingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 VMware, Inc. + * Copyright 2023 VMware, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/test/resources/docs-generator-build.gradle b/docs/src/test/resources/docs-generator-build.gradle index 07df8aa134..0eb0e1fc6f 100644 --- a/docs/src/test/resources/docs-generator-build.gradle +++ b/docs/src/test/resources/docs-generator-build.gradle @@ -1,5 +1,5 @@ /* - * Copyright 2022 VMware, Inc. + * Copyright 2023 VMware, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/test/resources/docs-generator-pom.xml b/docs/src/test/resources/docs-generator-pom.xml index 5232d5e8ae..1df612e0fc 100644 --- a/docs/src/test/resources/docs-generator-pom.xml +++ b/docs/src/test/resources/docs-generator-pom.xml @@ -1,4 +1,21 @@ + diff --git a/gradle.properties b/gradle.properties index 900dff588e..8692f09dbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,6 @@ org.gradle.parallel=true org.gradle.vfs.watch=true compatibleVersion=1.11.0 -# Required by antora -version=1.12.0-SNAPSHOT kotlin.stdlib.default.dependency=false diff --git a/settings.gradle b/settings.gradle index b01664663d..19941d914c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,7 +23,7 @@ gradleEnterprise { server = 'https://ge.micrometer.io' } -include 'docs', 'micrometer-commons', 'micrometer-core', 'micrometer-observation' +include 'micrometer-commons', 'micrometer-core', 'micrometer-observation' ['core', 'boot2', 'boot2-reactive', 'spring-integration', 'hazelcast', 'hazelcast3', 'javalin', 'jersey3'].each { sample -> include "micrometer-samples-$sample" @@ -44,5 +44,5 @@ include 'micrometer-test', 'micrometer-observation-test' include 'micrometer-bom' include 'micrometer-jetty11' - include 'micrometer-osgi-test' +include 'docs'