-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix build failures caused by antora changes
- Loading branch information
1 parent
c3ba206
commit 5ce33ad
Showing
7 changed files
with
71 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,90 @@ | ||
| 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' | ||
| } | ||
| } | ||
|
|
||
| description = "Micrometer Tracing Docs" | ||
| apply plugin: 'java' | ||
| apply plugin: 'io.spring.antora.generate-antora-yml' | ||
| apply plugin: 'org.antora' | ||
|
|
||
| description = 'Micrometer Tracing Docs' | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation project(':micrometer-tracing') | ||
| implementation 'ch.qos.logback:logback-classic' | ||
| implementation 'org.slf4j:slf4j-api' | ||
|
|
||
| testImplementation 'io.zipkin.reporter2:zipkin-sender-urlconnection' | ||
|
|
||
| testImplementation project(':micrometer-tracing-test') | ||
| testImplementation project(':micrometer-tracing-integration-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' | ||
| } | ||
|
|
||
| antora { | ||
| version = '3.2.0-alpha.2' | ||
| playbook = 'antora-playbook.yml' | ||
| options = ['--clean', '--stacktrace'] | ||
| environment = [ | ||
| 'ALGOLIA_API_KEY': 'da671ceec1f84f80f280884a6a91bde5', | ||
| 'ALGOLIA_APP_ID': 'WB1FQYI187', | ||
| 'ALGOLIA_INDEX_NAME': 'micrometer' | ||
| 'ALGOLIA_API_KEY': 'da671ceec1f84f80f280884a6a91bde5', | ||
| 'ALGOLIA_APP_ID': 'WB1FQYI187', | ||
| 'ALGOLIA_INDEX_NAME': 'micrometer' | ||
| ] | ||
|
|
||
| dependencies = [ | ||
| '@antora/atlas-extension': '1.0.0-alpha.1', | ||
| '@antora/collector-extension': '1.0.0-alpha.3', | ||
| '@asciidoctor/tabs': '1.0.0-beta.3', | ||
| '@springio/antora-extensions': '1.4.2', | ||
| '@springio/asciidoctor-extensions': '1.0.0-alpha.8', | ||
| '@antora/atlas-extension': '1.0.0-alpha.1', | ||
| '@antora/collector-extension': '1.0.0-alpha.3', | ||
| '@asciidoctor/tabs': '1.0.0-beta.3', | ||
| '@springio/antora-extensions': '1.4.2', | ||
| '@springio/asciidoctor-extensions': '1.0.0-alpha.8', | ||
| ] | ||
| } | ||
|
|
||
|
|
||
| tasks.named("generateAntoraYml") { | ||
| asciidocAttributes = project.provider( { | ||
| return ["micrometer-tracing-version": project.version.toString()] | ||
| } ) | ||
| tasks.named('generateAntoraYml') { | ||
| asciidocAttributes = project.provider { | ||
| return ['micrometer-tracing-version': project.version.toString()] | ||
| } | ||
| } | ||
|
|
||
| tasks.create("generateAntoraResources") { | ||
| dependsOn 'generateAntoraYml' | ||
| tasks.create('generateAntoraResources') { | ||
| dependsOn 'generateAntoraYml' | ||
| } | ||
|
|
||
| tasks.named("antora") { | ||
| dependsOn "generateAntoraResources" | ||
| tasks.named('antora') { | ||
| dependsOn 'generateAntoraResources', 'test' | ||
| } | ||
|
|
||
| tasks.named("antora") { | ||
| dependsOn "test" | ||
| nohttp { | ||
| source.exclude "modules/ROOT/**/build/**" | ||
| } | ||
|
|
||
| jar { | ||
| enabled = false | ||
| enabled = false | ||
| } | ||
|
|
||
| javadoc { | ||
| enabled = false | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| enabled = false | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation project(":micrometer-tracing") | ||
| implementation 'ch.qos.logback:logback-classic' | ||
| implementation 'org.slf4j:slf4j-api' | ||
|
|
||
| testImplementation 'io.zipkin.reporter2:zipkin-sender-urlconnection' | ||
|
|
||
| testImplementation project(":micrometer-tracing-test") | ||
| testImplementation project(":micrometer-tracing-integration-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' | ||
| tasks.withType(AbstractPublishToMaven).configureEach { | ||
| enabled = false | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters