diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e339a813d38..55c06c7278f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - run: ./gradlew build ${{ runner.os == 'Windows' && '--exclude-task antora' || ''}} + run: ./gradlew build - name: Send notification uses: ./.github/actions/send-notification if: always() diff --git a/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java index b9f124ff285..6bb73305f6d 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java @@ -141,8 +141,9 @@ public class AntoraConventions { if (project.getGradle().getStartParameter().getLogLevel() != LogLevel.DEBUG) { antoraExtension.getOptions().add("--quiet"); } - antoraExtension.getOptions().addAll("--stacktrace"); - antoraExtension.getOptions().addAll("--log-level", "all"); + else { + antoraExtension.getOptions().addAll("--log-level", "all"); + } } private void configureNodeExtension(Project project, NodeExtension nodeExtension) { diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index f35de295292..12b2cefe21e 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -294,9 +294,13 @@ def antoraRootAggregateContent = tasks.register("antoraRootAggregateContent", Zi } from(project.configurations.configurationProperties) { eachFile { - it.path = it.file.toString() - .replaceFirst('/build/(?:classes|resources)/java/main/', '/') - .replaceFirst('^.*/([^/]+)/META-INF/(spring-configuration-metadata\\.json)$', 'modules/ROOT/partials/$1/$2') + it.path = rootProject + .projectDir + .toPath() + .relativize(it.file.toPath()) + .toString() + .replace('\\', '/') + .replaceAll('.*\\/([^\\/]+)\\/build.*', 'modules/ROOT/partials/$1/spring-configuration-metadata.json') } } from(runRemoteSpringApplicationExample) {