From a4ea9e542fc6c5ead6378829e37738a8690d7479 Mon Sep 17 00:00:00 2001 From: Marco Belladelli Date: Wed, 27 Nov 2024 15:31:43 +0100 Subject: [PATCH 1/3] Update `nu.studer.credentials` gradle plugin to version 2.2 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 15ab92bf1c80..9c5fd348fa72 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { plugins { id 'me.champeau.buildscan-recipes' version '0.2.3' id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' - id 'nu.studer.credentials' version '2.1' + id 'nu.studer.credentials' version '2.2' id 'org.hibernate.build.xjc' version '2.0.1' apply false id 'org.hibernate.build.maven-repo-auth' version '3.0.3' apply false id 'biz.aQute.bnd' version '5.1.1' apply false From 277a9d34f9c6275173402fb55ab4c06705c24b47 Mon Sep 17 00:00:00 2001 From: Marco Belladelli Date: Thu, 5 Dec 2024 12:00:01 +0100 Subject: [PATCH 2/3] Update and migrate to asciidoc gradle plugin `3.3.2` Older versions cannot correctly resolve dependencies --- build.gradle | 2 +- documentation/documentation.gradle | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 9c5fd348fa72..0a85bee8bad8 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { classpath 'org.hibernate.build.gradle:hibernate-matrix-testing:3.0.0.Final' classpath 'org.hibernate.build.gradle:version-injection-plugin:1.0.0' classpath 'gradle.plugin.com.github.lburgazzoli:gradle-karaf-plugin:0.5.1' - classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.7' + classpath 'org.asciidoctor:asciidoctor-gradle-jvm:3.3.2' classpath 'de.thetaphi:forbiddenapis:3.0.1' } } diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index 38a0dbbb8e42..74ff3786e578 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -1,5 +1,5 @@ import org.apache.tools.ant.filters.ReplaceTokens -import org.asciidoctor.gradle.AsciidoctorTask +import org.asciidoctor.gradle.jvm.AsciidoctorTask /* * Hibernate, Relational Persistence for Idiomatic Java @@ -32,7 +32,7 @@ rootProject.subprojects { subproject -> apply from: rootProject.file( 'gradle/java-module.gradle' ) -apply plugin: 'org.asciidoctor.convert' +apply plugin: 'org.asciidoctor.jvm.convert' apply plugin: 'hibernate-matrix-testing' @@ -184,8 +184,6 @@ task renderTopicalGuides(type: AsciidoctorTask, group: 'Documentation') { description = 'Renders the Topical Guides in HTML format using Asciidoctor.' sourceDir = file( 'src/main/asciidoc/topical' ) outputDir = new File("$buildDir/asciidoc/topical/html_single") - backends "html5" - separateOutputDirs false options logDocuments: true attributes icons: 'font', experimental: true, @@ -209,8 +207,6 @@ task renderGettingStartedGuides(type: AsciidoctorTask, group: 'Documentation') { include 'index.adoc' } outputDir = new File("$buildDir/asciidoc/quickstart/html_single") - backends "html5" - separateOutputDirs false options logDocuments: true attributes icons: 'font', experimental: true, 'source-highlighter': 'prettify' } @@ -239,8 +235,6 @@ task renderUserGuide(type: AsciidoctorTask, group: 'Documentation') { include 'Hibernate_User_Guide.adoc' } outputDir = new File("$buildDir/asciidoc/userguide/html_single") - backends "html5" - separateOutputDirs false options logDocuments: true attributes icons: 'font', experimental: true, 'source-highlighter': 'prettify', @@ -276,8 +270,6 @@ task renderIntegrationGuide(type: AsciidoctorTask, group: 'Documentation') { include 'Hibernate_Integration_Guide.adoc' } outputDir = new File("$buildDir/asciidoc/integrationguide/html_single") - backends "html5" - separateOutputDirs false options logDocuments: true attributes icons: 'font', experimental: true, @@ -324,3 +316,10 @@ buildDocsForPublishing.dependsOn renderIntegrationGuide checkstyleMain.exclude '**/org/hibernate/userguide/model/*' +tasks.withType(AsciidoctorTask).configureEach { + baseDirFollowsSourceDir() + outputOptions { + separateOutputDirs = false + backends 'html5' + } +} From 5098961359ea71e1f62a4a6404c6e000f84a5781 Mon Sep 17 00:00:00 2001 From: Marco Belladelli Date: Thu, 5 Dec 2024 16:25:32 +0100 Subject: [PATCH 3/3] Update deprecated `actions/upload-artifact` --- .github/workflows/contributor-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/contributor-build.yml b/.github/workflows/contributor-build.yml index ab5cc301e1c3..426e6aebaacb 100644 --- a/.github/workflows/contributor-build.yml +++ b/.github/workflows/contributor-build.yml @@ -83,7 +83,7 @@ jobs: run: ./ci/build-github.sh shell: bash - name: Upload test reports (if Gradle failed) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: test-reports-java8-${{ matrix.rdbms }}