Port forward missing dependency updates from 5.3

.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 }}

build.gradle

@@ -14,15 +14,15 @@ 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'
 	}
 }
 
 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

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'
+	}
+}