HHH-16097 Cleanup unneeded o.h.userguide.model package and documentation.gradle dependencies

Author: mbellade

documentation/documentation.gradle

@@ -12,10 +12,9 @@ plugins {
  */
 
 
-apply from: rootProject.file( 'gradle/java-module.gradle' )
+apply from: rootProject.file( 'gradle/module.gradle' )
 apply from: rootProject.file( 'gradle/releasable.gradle' )
 
-apply plugin: 'org.hibernate.matrix-test'
 apply plugin: 'org.hibernate.orm.build.reports'
 
 tasks.build.dependsOn 'buildDocs'
@@ -38,46 +37,16 @@ dependencies {
 	reportAggregation project(':hibernate-ant')
 	reportAggregation project(':hibernate-enhance-maven-plugin')
 	reportAggregation project(':hibernate-jpamodelgen')
-
-	implementation project( ':hibernate-core' )
-
-	annotationProcessor project( ':hibernate-jpamodelgen' )
-
-	testImplementation project(':hibernate-testing')
-	testImplementation project(':hibernate-envers')
-	testImplementation project(':hibernate-spatial')
-	testImplementation project(':hibernate-jcache')
-	testImplementation project( path: ':hibernate-core', configuration: 'tests' )
-
-	testImplementation 'org.apache.commons:commons-lang3:3.4'
-	testImplementation 'org.osgi:org.osgi.core:4.3.1'
-
-	testImplementation testLibs.mockito
-	testImplementation testLibs.mockitoInline
-
-	testImplementation jakartaLibs.jaxbApi
-	testImplementation jakartaLibs.jaxb
-	testImplementation jakartaLibs.jsonb
-	testImplementation libs.jacksonXml
-
-	testRuntimeOnly testLibs.wildFlyTxnClient
-	testRuntimeOnly(libs.ehcache3) {
-		capabilities {
-			requireCapability 'org.ehcache.modules:ehcache-xml-jakarta'
-		}
-	}
-	// Needed for JSON tests
-	testRuntimeOnly libs.jackson
 }
 
 
 if ( project.ormVersion.isSnapshot ) {
 	// only run the ci build tasks for SNAPSHOT versions
-	task ciBuild( dependsOn: [clean, test] )
+	task ciBuild( dependsOn: [clean] )
 	tasks.release.enabled false
 }
 else {
-	tasks.release.dependsOn clean, test
+	tasks.release.dependsOn clean
 }
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -303,12 +272,3 @@ tasks.withType(AsciidoctorTask).all {
 		backends 'html5'
 	}
 }
-
-// resources inherently exclude sources
-sourceSets.test.resources {
-	setSrcDirs( ['src/test/java','src/test/resources'] )
-}
-
-
-checkstyleMain.exclude '**/org/hibernate/userguide/model/*'
-

documentation/src/main/asciidoc/userguide/chapters/query/hql/QueryLanguage.adoc

@@ -197,9 +197,9 @@ A single HQL `update` statement might result in multiple SQL update statements e
 ====
 [source, JAVA, indent=0]
 ----
-include::{example-dir-hql}/../batch/BatchTest.java[tags=batch-bulk-jpql-update-example]
+include::{example-dir-hql}/../batch/BatchTests.java[tags=batch-bulk-jpql-update-example]
 
-include::{example-dir-hql}/../batch/BatchTest.java[tags=batch-bulk-hql-update-example]
+include::{example-dir-hql}/../batch/BatchTests.java[tags=batch-bulk-hql-update-example]
 ----
 ====
 
@@ -225,7 +225,7 @@ Adding the keyword `versioned`—writing `update versioned`—specifies
 ====
 [source, JAVA, indent=0]
 ----
-include::{example-dir-hql}/../batch/BatchTest.java[tags=batch-bulk-hql-update-version-example]
+include::{example-dir-hql}/../batch/BatchTests.java[tags=batch-bulk-hql-update-version-example]
 ----
 ====
 
@@ -296,7 +296,7 @@ include::{example-dir-hql}/HQLTest.java[tags=hql-insert-example]
 
 [source, SQL, indent=0]
 ----
-include::{example-dir-hql}/../batch/BatchTest.java[tags=batch-bulk-hql-insert-example]
+include::{example-dir-hql}/../batch/BatchTests.java[tags=batch-bulk-hql-insert-example]
 ----
 ====
 
@@ -865,7 +865,7 @@ This function truncates a date, time, or datetime to the temporal unit specified
 The syntax is `truncate(datetime, field)`. Supported temporal units are: `year`, `month`, `day`, `hour`, `minute` or `second`.
 
 Truncating a date, time or datetime value translates to obtaining a value of the same type in which all temporal units smaller than `field` have been pruned.
-For hours, minutes and second this means setting them to `00`. For months and days, this means setting them to `01'.
+For hours, minutes and second this means setting them to `00`. For months and days, this means setting them to `01`.
 
 [[hql-string-functions]]
 ==== Functions for working with strings