You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by as...@apache.org on 2025/08/26 10:36:50 UTC

(grails-doc) branch gh-pages updated: Deploying to documentation branch - 10:36:42

This is an automated email from the ASF dual-hosted git repository.

asf-ci-deploy pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/grails-doc.git


The following commit(s) were added to refs/heads/gh-pages by this push:
     new 49098aa696 Deploying to documentation branch - 10:36:42
49098aa696 is described below

commit 49098aa6962dffb8b554559abde8279309debc32
Author: matrei <ma...@users.noreply.github.com>
AuthorDate: Tue Aug 26 10:36:43 2025 +0000

    Deploying to documentation branch - 10:36:42
---
 snapshot/api/deprecated-list.html                  |   2 +-
 .../api/grails/beans/util/LazyMetaPropertyMap.html |   2 +-
 .../api/grails/core/ArtefactHandlerAdapter.html    |   2 +-
 .../api/grails/core/DefaultGrailsApplication.html  |   2 +-
 .../api/grails/databinding/SimpleDataBinder.html   |  16 +-
 snapshot/api/grails/events/Events.html             |   6 +-
 .../transactions/GrailsTransactionTemplate.html    |   4 +-
 .../gorm/transactions/TransactionService.html      |  14 +-
 .../api/grails/orm/HibernateCriteriaBuilder.html   |   2 +-
 snapshot/api/grails/orm/PagedResultList.html       |   2 +-
 .../HibernateDatastoreSpringInitializer.html       |   3 +-
 snapshot/api/grails/plugin/cache/CacheEvict.html   |   2 +-
 snapshot/api/grails/plugin/cache/CachePut.html     |   2 +-
 .../cache/GrailsConcurrentLinkedMapCache.html      |   8 +-
 .../grails/plugin/geb/ContainerFileDetector.html   |   2 +-
 .../plugin/geb/GrailsContainerGebExtension.html    |   3 +-
 .../plugin/geb/WebDriverContainerHolder.html       |   3 +-
 .../plugin/geb/support/delegate/PageDelegate.html  |   2 +-
 .../plugin/json/builder/JsonGenerator.Options.html |   2 +-
 .../api/grails/plugin/json/view/api/JsonView.html  |  10 +-
 ...aultHalViewHelper.HalStreamingJsonDelegate.html |   4 +-
 .../rest/render/xml/XmlCollectionRenderer.html     |   2 +-
 .../api/grails/testing/web/GrailsWebUnitTest.html  |   1 -
 snapshot/api/grails/ui/shell/GrailsShell.html      |   4 +-
 .../api/grails/util/ClosureToMapPopulator.html     |   2 +-
 snapshot/api/grails/util/GrailsStringUtils.html    |   2 +-
 .../api/grails/validation/ConstrainedDelegate.html |   1 -
 ...ypeCheckingExtension.BuilderMethodReplacer.html |  14 -
 .../api/grails/web/mapping/ResponseRedirector.html |   2 +-
 .../context/GrailsWebApplicationContext.html       |   2 +-
 snapshot/api/index-all.html                        | 248 +++++++------
 .../data/testing/tck/base/GrailsDataTckSpec.html   |   3 +-
 .../archive/PackagedSpringApplicationLauncher.html |   4 +-
 .../grails/cli/boot/SpringApplicationLauncher.html |   4 +-
 ...SpringApplicationWebApplicationInitializer.html |   2 +-
 .../org/grails/cli/command/AbstractCommand.html    |   2 +-
 snapshot/api/org/grails/cli/command/Command.html   |  14 +-
 .../cli/command/CommandException.Option.html       |  10 +-
 .../org/grails/cli/command/CommandException.html   |  10 +-
 .../api/org/grails/cli/command/CommandFactory.html |   2 +-
 .../api/org/grails/cli/command/CommandRunner.html  |  24 +-
 .../api/org/grails/cli/command/HelpExample.html    |   2 +-
 .../grails/cli/command/OptionParsingCommand.html   |   2 +-
 .../ArchiveCommand.ArchiveOptionHandler.html       |   2 +-
 .../org/grails/cli/command/archive/JarCommand.html |   2 +-
 .../archive/ResourceMatcher.MatchedResource.html   |   2 +-
 .../org/grails/cli/command/archive/WarCommand.html |   2 +-
 .../cli/command/archive/package-summary.html       |   4 +-
 .../org/grails/cli/command/grab/GrabCommand.html   |   2 +-
 .../grails/cli/command/grab/package-summary.html   |   2 +-
 .../grails/cli/command/install/InstallCommand.html |   2 +-
 .../cli/command/install/UninstallCommand.html      |   2 +-
 .../cli/command/install/package-summary.html       |   4 +-
 .../grails/cli/command/options/SourceOptions.html  |   6 +-
 .../org/grails/cli/command/package-summary.html    |   2 +-
 .../cli/command/run/SpringApplicationRunner.html   |   2 +-
 .../run/SpringApplicationRunnerConfiguration.html  |   4 +-
 snapshot/api/org/grails/cli/compiler/AstUtils.html |  10 +-
 .../cli/compiler/CompilerAutoConfiguration.html    |  10 +-
 .../DependencyAutoConfigurationTransformation.html |   2 +-
 .../grails/cli/compiler/DependencyCustomizer.html  |  22 +-
 .../DependencyManagementBomTransformation.html     |   2 +-
 ...edGroovyClassLoader.ExtendedClassCollector.html |   2 +-
 .../cli/compiler/GenericBomAstTransformation.html  |   2 +-
 .../cli/compiler/GroovyBeansTransformation.html    |   2 +-
 .../org/grails/cli/compiler/GroovyCompiler.html    |   6 +-
 .../cli/compiler/GroovyCompilerConfiguration.html  |  14 +-
 .../grails/cli/compiler/GroovyCompilerScope.html   |   4 +-
 .../compiler/RepositoryConfigurationFactory.html   |   2 +-
 ...ResolveDependencyCoordinatesTransformation.html |   4 +-
 .../dependencies/ArtifactCoordinatesResolver.html  |   6 +-
 .../dependencies/Dependency.Exclusion.html         |   6 +-
 .../cli/compiler/dependencies/Dependency.html      |  12 +-
 .../dependencies/DependencyManagement.html         |   6 +-
 .../grape/DependencyResolutionFailedException.html |   2 +-
 .../compiler/grape/RepositoryConfiguration.html    |   8 +-
 .../RepositorySystemSessionAutoConfiguration.html  |   2 +-
 .../grails/cli/compiler/maven/MavenSettings.html   |   2 +-
 .../org/grails/cli/compiler/package-summary.html   |   2 +-
 snapshot/api/org/grails/cli/gradle/GradleUtil.html |   8 +-
 .../grails/cli/groovy/DependencyManagementBom.html |   4 +-
 .../grails/cli/groovy/EnableGroovyTemplates.html   |   2 +-
 .../api/org/grails/cli/groovy/package-summary.html |   2 +-
 .../api/org/grails/cli/util/ResourceUtils.html     |   8 +-
 .../grails/compiler/injection/GrailsASTUtils.html  |   4 +-
 .../converters/CurrencyValueConverter.html         |   2 +-
 .../datastore/bson/json/JsonReader.Context.html    |  10 +-
 .../org/grails/datastore/bson/json/JsonReader.html |  10 +-
 .../datastore/bson/json/JsonWriter.Context.html    |   6 +-
 .../org/grails/datastore/bson/json/JsonWriter.html |   8 +-
 .../DataSourceConnectionSourceFactory.html         |   2 +-
 .../gorm/jdbc/connections/package-summary.html     |   2 +-
 .../gorm/mongo/extensions/MongoExtensions.html     |  74 ++--
 .../datastore/gorm/mongo/simple/EnumType.html      |   4 +-
 .../PersistenceContextInterceptorAggregator.html   |   2 +-
 .../DetachedCriteriaASTTransformation.html         |   2 +-
 .../GlobalDetachedCriteriaASTTransformation.html   |   2 +-
 .../gorm/services/DefaultTransactionService.html   |  14 +-
 .../gorm/timestamp/DefaultTimestampProvider.html   |   4 +-
 .../transactions/transform/RollbackTransform.html  |   2 +-
 .../transform/TransactionalTransform.html          |  28 --
 .../gorm/validation/constraints/MaxConstraint.html |   2 +-
 .../validation/constraints/RangeConstraint.html    |   2 +-
 .../datastore/mapping/engine/EntityPersister.html  |   4 +-
 .../mapping/mongo/config/MongoCollection.html      |   8 +-
 .../mapping/mongo/config/MongoMappingContext.html  |  10 +-
 .../mongo/engine/MongoCodecEntityPersister.html    |   4 +-
 .../mapping/query/api/BuildableCriteria.html       |   2 +-
 .../datastore/mapping/query/api/Criteria.html      |   2 +-
 .../mapping/reflect/ClosureToMapPopulator.html     |   2 +-
 .../datastore/mapping/reflect/ReflectionUtils.html |   2 +-
 .../compiler/transform/LineNumberTransform.html    |   2 +-
 .../gsp/jsp/GroovyPagesJspApplicationContext.html  |  16 +-
 .../org/grails/gsp/jsp/GroovyPagesPageContext.html |   8 +-
 .../api/org/grails/gsp/jsp/JspFragmentImpl.html    |   2 +-
 snapshot/api/org/grails/gsp/jsp/JspTagImpl.html    |   6 +-
 .../api/org/grails/gsp/jsp/JspWriterDelegate.html  |   2 +-
 .../orm/hibernate/AbstractHibernateDatastore.html  |  10 +-
 .../orm/hibernate/AbstractHibernateSession.html    |   2 +-
 .../orm/hibernate/GrailsHibernateTemplate.html     |  16 +-
 .../GrailsHibernateTransactionManager.html         |  22 +-
 .../grails/orm/hibernate/HibernateDatastore.html   |  12 +-
 .../access/TraitPropertyAccessStrategy.html        |  20 +-
 .../orm/hibernate/cfg/GrailsDomainBinder.html      | 382 ++++++++++-----------
 .../cfg/HibernateMappingContextConfiguration.html  |   6 +-
 .../HibernateConnectionSourceFactory.html          |  14 +-
 ...ceSettings.HibernateSettings.FlushSettings.html |   4 +-
 .../event/listener/HibernateEventListener.html     |  54 +--
 .../org/grails/orm/hibernate/package-summary.html  |   2 +-
 .../query/AbstractHibernateCriteriaBuilder.html    |  22 +-
 .../hibernate/query/AbstractHibernateQuery.html    |   4 +-
 .../grails/orm/hibernate/query/HibernateQuery.html |   4 +-
 .../AbstractClosureEventTriggeringInterceptor.html |   4 +-
 .../hibernate/support/ClosureEventListener.html    |  58 ++--
 .../support/ClosureEventTriggeringInterceptor.html |  60 ++--
 .../HibernateDialectDetectorFactoryBean.html       |   8 +-
 .../hibernate/support/HibernateVersionSupport.html |  10 +-
 .../HibernateJtaTransactionManagerAdapter.html     |   8 +-
 .../grails/plugin/cache/GrailsCacheManager.html    |   4 +-
 .../GrailsOpenSessionInViewInterceptor.html        |   4 +-
 .../databasemigration/liquibase/GormDatabase.html  |  10 +-
 .../controllers/metaclass/RenderDynamicMethod.html |   2 +-
 .../web/mapping/factory/UrlMappingFactoryBean.html |   2 +-
 .../web/servlet/context/BootStrapClassRunner.html  |   2 +-
 .../org/grails/plugins/web/taglib/FormTagLib.html  |   2 +-
 .../grails/spring/GrailsApplicationContext.html    |  12 +-
 ...sourceBundleMessageSource.PropertiesHolder.html |   2 +-
 .../ReloadableResourceBundleMessageSource.html     |  58 ++--
 .../org/grails/taglib/encoder/WithCodecHelper.html |   3 +-
 .../grails/testing/spock/AutowiredInterceptor.html |   3 +-
 .../transaction/ChainedTransactionManager.html     |   4 +-
 .../ChainedTransactionManagerPostProcessor.html    |   8 +-
 .../ConvertersConfigurationHolder.html             |   2 +-
 .../DataBindingEventMulticastListener.html         |   2 +-
 .../AbstractStructuredBindingEditor.html           |   2 +-
 .../org/grails/web/json/parser/ParseException.html |  16 +-
 .../web/mapping/DefaultUrlMappingsHolder.html      |   4 +-
 .../web/mapping/ResponseCodeUrlMappingVisitor.html |  16 +-
 .../reporting/UrlMappingsReportCommand.html        |   2 +-
 .../org/grails/web/servlet/GrailsFlashScope.html   |   2 +-
 .../web/servlet/view/GroovyPageViewResolver.html   |   2 +-
 snapshot/api/reactor/bus/EventBus.html             |   1 -
 .../transactions/GrailsTransactionTemplate.html    |   4 +-
 .../gorm/transactions/TransactionService.html      |  14 +-
 snapshot/grails-data/api/index-all.html            |  10 +-
 .../bootstrap/AbstractDatastoreInitializer.html    |   8 +-
 .../DataSourceConnectionSourceFactory.html         |   2 +-
 .../SpringDataSourceConnectionSourceFactory.html   |   6 +-
 .../gorm/jdbc/connections/package-summary.html     |   2 +-
 .../PersistenceContextInterceptorAggregator.html   |   2 +-
 .../DetachedCriteriaASTTransformation.html         |   2 +-
 .../GlobalDetachedCriteriaASTTransformation.html   |   2 +-
 .../gorm/services/DefaultTransactionService.html   |  14 +-
 .../gorm/timestamp/DefaultTimestampProvider.html   |   4 +-
 .../transactions/transform/RollbackTransform.html  |   2 +-
 .../transform/TransactionalTransform.html          |  28 --
 .../gorm/validation/constraints/MaxConstraint.html |   2 +-
 .../validation/constraints/RangeConstraint.html    |   2 +-
 .../datastore/mapping/core/AbstractDatastore.html  |   6 +-
 .../datastore/mapping/engine/BeanEntityAccess.html |   4 +-
 .../datastore/mapping/engine/EntityPersister.html  |   4 +-
 .../mapping/query/api/BuildableCriteria.html       |   2 +-
 .../datastore/mapping/query/api/Criteria.html      |   2 +-
 .../mapping/reflect/ClosureToMapPopulator.html     |   2 +-
 .../datastore/mapping/reflect/ReflectionUtils.html |   2 +-
 .../developer-manual/gettingStarted.html           |   2 +-
 .../grails-data/developer-manual/introduction.html |   2 +-
 .../grails-data/developer-manual/stepByStep.html   |   2 +-
 snapshot/grails-data/developer-manual/testing.html |   2 +-
 .../developer-manual/understandingApi.html         |   2 +-
 .../understandingApi/datastoreBasics.html          |   2 +-
 .../understandingApi/gormApis.html                 |   2 +-
 .../understandingApi/gormEnhancer.html             |   2 +-
 .../understandingApi/implementingCrud.html         |   2 +-
 .../understandingApi/implementingQueries.html      |   2 +-
 .../understandingApi/secondaryIndexes.html         |   2 +-
 .../transactions/GrailsTransactionTemplate.html    |   4 +-
 .../gorm/transactions/TransactionService.html      |  14 +-
 .../api/grails/orm/HibernateCriteriaBuilder.html   |   2 +-
 .../hibernate5/api/grails/orm/PagedResultList.html |   2 +-
 .../HibernateDatastoreSpringInitializer.html       |   3 +-
 snapshot/grails-data/hibernate5/api/index-all.html |  38 +-
 .../datastore/bson/json/JsonReader.Context.html    |  10 +-
 .../org/grails/datastore/bson/json/JsonReader.html |  10 +-
 .../datastore/bson/json/JsonWriter.Context.html    |   6 +-
 .../org/grails/datastore/bson/json/JsonWriter.html |   8 +-
 .../gorm/mongo/extensions/MongoExtensions.html     |  74 ++--
 .../datastore/gorm/mongo/simple/EnumType.html      |   4 +-
 .../PersistenceContextInterceptorAggregator.html   |   2 +-
 .../DetachedCriteriaASTTransformation.html         |   2 +-
 .../GlobalDetachedCriteriaASTTransformation.html   |   2 +-
 .../gorm/services/DefaultTransactionService.html   |  14 +-
 .../gorm/timestamp/DefaultTimestampProvider.html   |   4 +-
 .../transactions/transform/RollbackTransform.html  |   2 +-
 .../transform/TransactionalTransform.html          |  28 --
 .../datastore/mapping/engine/EntityPersister.html  |   4 +-
 .../mapping/mongo/config/MongoCollection.html      |   8 +-
 .../mapping/mongo/config/MongoMappingContext.html  |  10 +-
 .../mongo/engine/MongoCodecEntityPersister.html    |   4 +-
 .../mapping/query/api/BuildableCriteria.html       |   2 +-
 .../datastore/mapping/query/api/Criteria.html      |   2 +-
 .../mapping/reflect/ClosureToMapPopulator.html     |   2 +-
 .../datastore/mapping/reflect/ReflectionUtils.html |   2 +-
 .../orm/hibernate/GrailsHibernateTemplate.html     |   4 +-
 .../orm/hibernate/cfg/GrailsDomainBinder.html      |  78 ++---
 .../query/AbstractHibernateCriteriaBuilder.html    |  30 +-
 .../HibernateJtaTransactionManagerAdapter.html     |   6 +-
 .../api/grails/orm/HibernateCriteriaBuilder.html   |   4 +-
 .../mongodb/api/grails/orm/PagedResultList.html    |   2 +-
 .../HibernateDatastoreSpringInitializer.html       |   3 +-
 snapshot/grails-data/mongodb/api/index-all.html    |  36 +-
 .../datastore/gorm/mongo/simple/EnumType.html      |   4 +-
 .../mapping/mongo/config/MongoCollection.html      |  36 +-
 ...PersistentEntity.DocumentCollectionMapping.html |   4 +-
 .../engine/AbstractMongoObectEntityPersister.html  |  10 +-
 .../mapping/mongo/engine/MongoEntityPersister.html |   2 +-
 .../hibernate/AbstractHibernateGormStaticApi.html  |  18 +-
 .../orm/hibernate/AbstractHibernateSession.html    |   4 +-
 .../orm/hibernate/GrailsHibernateTemplate.html     |   8 +-
 .../orm/hibernate/HibernateGormStaticApi.html      |   6 +-
 .../orm/hibernate/cfg/GrailsDomainBinder.html      | 122 +++----
 .../query/AbstractHibernateCriteriaBuilder.html    |  38 +-
 ...ractHibernateQuery.HibernateProjectionList.html |  42 +--
 .../hibernate/query/AbstractHibernateQuery.html    |   4 +-
 .../HibernateJtaTransactionManagerAdapter.html     |   6 +-
 snapshot/grails-data/whats-new-manual/index.html   |   2 +-
 246 files changed, 1269 insertions(+), 1388 deletions(-)

diff --git a/snapshot/api/deprecated-list.html b/snapshot/api/deprecated-list.html
index 8d81dca92f..f19281c1ae 100644
--- a/snapshot/api/deprecated-list.html
+++ b/snapshot/api/deprecated-list.html
@@ -511,7 +511,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                 </td>
             </tr>
             <tr class="altColor">
-                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../FlushMode.html'>FlushMode</a> flushMode)
+                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode)
                     <div class="block"><i>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</i></div>
                 </td>
             </tr>
diff --git a/snapshot/api/grails/beans/util/LazyMetaPropertyMap.html b/snapshot/api/grails/beans/util/LazyMetaPropertyMap.html
index a58d9312cf..375da6f2e0 100644
--- a/snapshot/api/grails/beans/util/LazyMetaPropertyMap.html
+++ b/snapshot/api/grails/beans/util/LazyMetaPropertyMap.html
@@ -106,7 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 @groovy.transform.CompileStatic
 public class LazyMetaPropertyMap
 extends java.lang.Object
diff --git a/snapshot/api/grails/core/ArtefactHandlerAdapter.html b/snapshot/api/grails/core/ArtefactHandlerAdapter.html
index d3f6644e3c..63ca27e1cf 100644
--- a/snapshot/api/grails/core/ArtefactHandlerAdapter.html
+++ b/snapshot/api/grails/core/ArtefactHandlerAdapter.html
@@ -106,7 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings( "deprecation" )
+<pre>@java.lang.SuppressWarnings("deprecation")
 public abstract class ArtefactHandlerAdapter
 extends java.lang.Object
 implements <a href='../../grails/core/ArtefactHandler.html'>ArtefactHandler</a></pre>
diff --git a/snapshot/api/grails/core/DefaultGrailsApplication.html b/snapshot/api/grails/core/DefaultGrailsApplication.html
index 0370f47c49..6023b2d2a3 100644
--- a/snapshot/api/grails/core/DefaultGrailsApplication.html
+++ b/snapshot/api/grails/core/DefaultGrailsApplication.html
@@ -1154,7 +1154,7 @@ implements <a href='../../org.springframework.beans.factory.BeanClassLoaderAware
                         <a name="initArtefactHandlers()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.SuppressWarnings( "deprecation" )<br>protected&nbsp;void <strong>initArtefactHandlers</strong>()</h4>
+                                <h4>@java.lang.SuppressWarnings("deprecation")<br>protected&nbsp;void <strong>initArtefactHandlers</strong>()</h4>
                                 <p> Initialises the default set of ArtefactHandler instances.
       <DL><DT><B>See Also:</B></DT><DD><a href='../../grails/core/ArtefactHandler.html' title='ArtefactHandler'>ArtefactHandler</a></DD></DL></p>
                             </li>
diff --git a/snapshot/api/grails/databinding/SimpleDataBinder.html b/snapshot/api/grails/databinding/SimpleDataBinder.html
index e83719e645..09af215706 100644
--- a/snapshot/api/grails/databinding/SimpleDataBinder.html
+++ b/snapshot/api/grails/databinding/SimpleDataBinder.html
@@ -745,8 +745,8 @@ implements <a href='../../grails/web/databinding/DataBinder.html'>DataBinder</a>
                         <ul class="blockListLast">
                             <li class="blockList">
                                 <h4>void <strong>bind</strong>(java.lang.Object obj, <a href='../../grails/databinding/DataBindingSource.html'>DataBindingSource</a> source, java.util.List whiteList)</h4>
-                                <p> <DL><DT><B>Parameters:</B></DT><DD><code>obj</code> -  The object being bound to</DD><DD><code>source</code> -  The data binding source</DD><DD><code>whiteList</code> -  A list of property names to be included during this 
- data binding.  All other properties represented in the binding source 
+                                <p> <DL><DT><B>Parameters:</B></DT><DD><code>obj</code> -  The object being bound to</DD><DD><code>source</code> -  The data binding source</DD><DD><code>whiteList</code> -  A list of property names to be included during this
+ data binding.  All other properties represented in the binding source
  will be ignored</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='../../grails/databinding/DataBindingSource.html' title='DataBindingSource'>DataBindingSource</a></DD></DL></p>
                             </li>
                         </ul>
@@ -755,8 +755,8 @@ implements <a href='../../grails/web/databinding/DataBinder.html'>DataBinder</a>
                         <ul class="blockListLast">
                             <li class="blockList">
                                 <h4>void <strong>bind</strong>(java.lang.Object obj, <a href='../../grails/databinding/DataBindingSource.html'>DataBindingSource</a> source, java.util.List whiteList, java.util.List blackList)</h4>
-                                <p> <DL><DT><B>Parameters:</B></DT><DD><code>obj</code> -  The object being bound to</DD><DD><code>source</code> -  The data binding source</DD><DD><code>whiteList</code> -  A list of property names to be included during this 
- data binding.  All other properties represented in the binding source 
+                                <p> <DL><DT><B>Parameters:</B></DT><DD><code>obj</code> -  The object being bound to</DD><DD><code>source</code> -  The data binding source</DD><DD><code>whiteList</code> -  A list of property names to be included during this
+ data binding.  All other properties represented in the binding source
  will be ignored</DD><DD><code>blackList</code> -  A list of properties names to be excluded during
  this data binding.</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='../../grails/databinding/DataBindingSource.html' title='DataBindingSource'>DataBindingSource</a></DD></DL></p>
                             </li>
@@ -778,8 +778,8 @@ implements <a href='../../grails/web/databinding/DataBinder.html'>DataBinder</a>
  data binding.  For example, if filter is &quot;person&quot; and the binding
  source contains data for properties &quot;person.name&quot; and &quot;author.name&quot;
  the value of &quot;person.name&quot; will be bound to obj.name.  The value of
- &quot;author.name&quot; will be ignored.</DD><DD><code>whiteList</code> -  A list of property names to be included during this 
- data binding.  All other properties represented in the binding source 
+ &quot;author.name&quot; will be ignored.</DD><DD><code>whiteList</code> -  A list of property names to be included during this
+ data binding.  All other properties represented in the binding source
  will be ignored</DD><DD><code>blackList</code> -  A list of properties names to be excluded during
  this data binding.</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='../../grails/databinding/DataBindingSource.html' title='DataBindingSource'>DataBindingSource</a></DD></DL></p>
                             </li>
@@ -793,8 +793,8 @@ implements <a href='../../grails/web/databinding/DataBinder.html'>DataBinder</a>
  data binding.  For example, if filter is &quot;person&quot; and the binding
  source contains data for properties &quot;person.name&quot; and &quot;author.name&quot;
  the value of &quot;person.name&quot; will be bound to obj.name.  The value of
- &quot;author.name&quot; will be ignored.</DD><DD><code>whiteList</code> -  A list of property names to be included during this 
- data binding.  All other properties represented in the binding source 
+ &quot;author.name&quot; will be ignored.</DD><DD><code>whiteList</code> -  A list of property names to be included during this
+ data binding.  All other properties represented in the binding source
  will be ignored</DD><DD><code>blackList</code> -  A list of properties names to be excluded during
  this data binding.</DD><DD><code>listener</code> -  A listener which will be notified of data binding events triggered
  by this binding</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='../../grails/databinding/DataBindingSource.html' title='DataBindingSource'>DataBindingSource</a></DD><DD><a href='../../grails/databinding/events/DataBindingListener.html' title='DataBindingListener'>DataBindingListener</a></DD></DL></p>
diff --git a/snapshot/api/grails/events/Events.html b/snapshot/api/grails/events/Events.html
index 5189cccd56..48b285914e 100644
--- a/snapshot/api/grails/events/Events.html
+++ b/snapshot/api/grails/events/Events.html
@@ -428,9 +428,9 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>&lt;E extends Event&lt;?&gt;&gt; Registration&lt;java.lang.Object, Consumer&lt;E&gt;&gt; <strong>on</strong>(<a href='../../reactor/bus/selector/Selector.html'>Selector</a> sel, Consumer&lt;E&gt; consumer)</h4>
                                 <p> Register a <a href='../../reactor/fn/Consumer.html' title='Consumer'>Consumer</a> to be triggered when a notification matches the given Selector. <DL><DT><B>Parameters:</B></DT><DD><code>sel
-</code> -  		The Selector to be used for matching</DD><DD><code>consumer
-</code> -  		The Consumer to be triggered</DD><DD><code><E>
-</code> -  		The type of the <a href='../../grails/events/Event.html' title='Event'>Event</a></DD></DL><DL><DT><B>Returns:</B></DT><DD>A <a href='../../grails/events/subscriber/Subscription.html' title='Subscription'>Subscription</a> object that allows the caller to interact with the given mapping</DD></DL></p>
+</code> -          The Selector to be used for matching</DD><DD><code>consumer
+</code> -          The Consumer to be triggered</DD><DD><code><E>
+</code> -          The type of the <a href='../../grails/events/Event.html' title='Event'>Event</a></DD></DL><DL><DT><B>Returns:</B></DT><DD>A <a href='../../grails/events/subscriber/Subscription.html' title='Subscription'>Subscription</a> object that allows the caller to interact with the given mapping</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/grails/gorm/transactions/GrailsTransactionTemplate.html b/snapshot/api/grails/gorm/transactions/GrailsTransactionTemplate.html
index 30b0128fa2..f0cf13a85d 100644
--- a/snapshot/api/grails/gorm/transactions/GrailsTransactionTemplate.html
+++ b/snapshot/api/grails/gorm/transactions/GrailsTransactionTemplate.html
@@ -358,7 +358,7 @@ extends java.lang.Object</pre>
                         <a name="execute(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; T <strong>execute</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; action)</h4>
+                                <h4>&lt;T&gt; T <strong>execute</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; action)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -366,7 +366,7 @@ extends java.lang.Object</pre>
                         <a name="executeAndRollback(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; T <strong>executeAndRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; action)</h4>
+                                <h4>&lt;T&gt; T <strong>executeAndRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; action)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/grails/gorm/transactions/TransactionService.html b/snapshot/api/grails/gorm/transactions/TransactionService.html
index 420ea6ed4b..fd003ee356 100644
--- a/snapshot/api/grails/gorm/transactions/TransactionService.html
+++ b/snapshot/api/grails/gorm/transactions/TransactionService.html
@@ -219,7 +219,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withNewTransaction(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withNewTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withNewTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a new transaction with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -227,7 +227,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withNewTransaction(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withNewTransaction</strong>(<a href='../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withNewTransaction</strong>(<a href='../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a new transaction with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>definition</code> -  The transaction definition</DD><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -235,7 +235,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withRollback(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction that is automatically rolled back with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -243,7 +243,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withRollback(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withRollback</strong>(<a href='../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withRollback</strong>(<a href='../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction that is automatically rolled back with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>definition</code> -  The transaction definition</DD><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -251,7 +251,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withTransaction(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -259,7 +259,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withTransaction(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(<a href='../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(<a href='../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction with the given definition <DL><DT><B>Parameters:</B></DT><DD><code>definition</code> -  The transaction definition</DD><DD><code>callable</code> -  The callable The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result of the callable</DD></DL></p>
                             </li>
                         </ul>
@@ -267,7 +267,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withTransaction(java.util.Map, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(java.util.Map definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(java.util.Map definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction with the given definition <DL><DT><B>Parameters:</B></DT><DD><code>definition</code> -  The transaction definition as a map</DD><DD><code>callable</code> -  The callable The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result of the callable</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/grails/orm/HibernateCriteriaBuilder.html b/snapshot/api/grails/orm/HibernateCriteriaBuilder.html
index f321819db0..9981acc51f 100644
--- a/snapshot/api/grails/orm/HibernateCriteriaBuilder.html
+++ b/snapshot/api/grails/orm/HibernateCriteriaBuilder.html
@@ -932,7 +932,7 @@ extends <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaB
                                 <p> Join an association using the specified join-type, assigning an alias
  to the joined association.
  The joinType is expected to be one of CriteriaSpecification.INNER_JOIN (the default),
- CriteriaSpecificationFULL_JOIN, or CriteriaSpecificationLEFT_JOIN.<DL><DT><B>throws:</B></DT><DD>HibernateException Indicates a problem creating the sub criteria</DD></DL>
+ CriteriaSpecificationFULL_JOIN, or CriteriaSpecificationLEFT_JOIN.<DL><DT><B>throws:</B></DT><DD>org.hibernate.HibernateException Indicates a problem creating the sub criteria</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>associationPath</code> -  A dot-seperated property path</DD><DD><code>alias</code> -            The alias to assign to the joined association (for later reference).</DD><DD><code>joinType</code> -         The type of join to use.</DD></DL><DL><DT><B>Returns:</B></DT><DD>this (for method chaining)</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#createAlias(java.lang.String, java.lang.String)'>createAlias(String, String)</a></DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/grails/orm/PagedResultList.html b/snapshot/api/grails/orm/PagedResultList.html
index ed73f83279..b460195339 100644
--- a/snapshot/api/grails/orm/PagedResultList.html
+++ b/snapshot/api/grails/orm/PagedResultList.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 @java.lang.Deprecated
 public class PagedResultList
 extends <a href='../../grails.gormPagedResultList.html'>grails.gormPagedResultList</a></pre>
diff --git a/snapshot/api/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.html b/snapshot/api/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.html
index a3a1ab28cb..a114667f1c 100644
--- a/snapshot/api/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.html
+++ b/snapshot/api/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.html
@@ -101,8 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@groovy.util.logging.Slf4j
-class HibernateDatastoreSpringInitializer
+<pre>class HibernateDatastoreSpringInitializer
 extends <a href='../../../org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.html'>AbstractDatastoreInitializer</a></pre>
 
     <p> Class that handles the details of initializing GORM for Hibernate <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>3.0</DD></DL></p>
diff --git a/snapshot/api/grails/plugin/cache/CacheEvict.html b/snapshot/api/grails/plugin/cache/CacheEvict.html
index 1c58b709e6..1ee0c9244b 100644
--- a/snapshot/api/grails/plugin/cache/CacheEvict.html
+++ b/snapshot/api/grails/plugin/cache/CacheEvict.html
@@ -265,7 +265,7 @@ public @interface CacheEvict</pre>
                                 <p> Qualifier value for the specified cached operation.
  <p>May be used to determine the target cache (or caches), matching the qualifier
  value.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/grails/plugin/cache/CachePut.html b/snapshot/api/grails/plugin/cache/CachePut.html
index d80d7022f0..a1ecde5c33 100644
--- a/snapshot/api/grails/plugin/cache/CachePut.html
+++ b/snapshot/api/grails/plugin/cache/CachePut.html
@@ -237,7 +237,7 @@ public @interface CachePut</pre>
                                 <p> Name of the caches in which the update takes place.
  <p>May be used to determine the target cache (or caches), matching the
  qualifier value.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/grails/plugin/cache/GrailsConcurrentLinkedMapCache.html b/snapshot/api/grails/plugin/cache/GrailsConcurrentLinkedMapCache.html
index 3242034d2a..c5fe764966 100644
--- a/snapshot/api/grails/plugin/cache/GrailsConcurrentLinkedMapCache.html
+++ b/snapshot/api/grails/plugin/cache/GrailsConcurrentLinkedMapCache.html
@@ -148,13 +148,13 @@ implements <a href='../../../grails/plugin/cache/GrailsCache.html'>GrailsCache</
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsConcurrentLinkedMapCache(java.lang.String, long, boolean)">GrailsConcurrentLinkedMapCache</a></strong>(java.lang.String name, long capacity, boolean allowNullValues)</code><br>Create a new GrailsConcurrentLinkedMapCache with the specified name 
+                                <code><strong><a href="#GrailsConcurrentLinkedMapCache(java.lang.String, long, boolean)">GrailsConcurrentLinkedMapCache</a></strong>(java.lang.String name, long capacity, boolean allowNullValues)</code><br>Create a new GrailsConcurrentLinkedMapCache with the specified name
  and capacity</td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsConcurrentLinkedMapCache(java.lang.String, long)">GrailsConcurrentLinkedMapCache</a></strong>(java.lang.String name, long capacity)</code><br>Create a new GrailsConcurrentLinkedMapCache with the specified name 
+                                <code><strong><a href="#GrailsConcurrentLinkedMapCache(java.lang.String, long)">GrailsConcurrentLinkedMapCache</a></strong>(java.lang.String name, long capacity)</code><br>Create a new GrailsConcurrentLinkedMapCache with the specified name
  and capacity</td>
                         </tr>
                         
@@ -328,7 +328,7 @@ implements <a href='../../../grails/plugin/cache/GrailsCache.html'>GrailsCache</
                         <ul class="blockListLast">
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>GrailsConcurrentLinkedMapCache</strong>(java.lang.String name, long capacity, boolean allowNullValues)</h4>
-                                <p> Create a new GrailsConcurrentLinkedMapCache with the specified name 
+                                <p> Create a new GrailsConcurrentLinkedMapCache with the specified name
  and capacity
      <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  the name of the cache</DD><DD><code>capacity</code> -  of the map</DD><DD><code>allowNullValues</code> -  null values (default is true)</DD></DL></p>
                             </li>
@@ -338,7 +338,7 @@ implements <a href='../../../grails/plugin/cache/GrailsCache.html'>GrailsCache</
                         <ul class="blockListLast">
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>GrailsConcurrentLinkedMapCache</strong>(java.lang.String name, long capacity)</h4>
-                                <p> Create a new GrailsConcurrentLinkedMapCache with the specified name 
+                                <p> Create a new GrailsConcurrentLinkedMapCache with the specified name
  and capacity
      <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  the name of the cache</DD><DD><code>capacity</code> -  of the map</DD></DL></p>
                             </li>
diff --git a/snapshot/api/grails/plugin/geb/ContainerFileDetector.html b/snapshot/api/grails/plugin/geb/ContainerFileDetector.html
index 2a9fd05193..867a8bfcab 100644
--- a/snapshot/api/grails/plugin/geb/ContainerFileDetector.html
+++ b/snapshot/api/grails/plugin/geb/ContainerFileDetector.html
@@ -109,7 +109,7 @@ interface ContainerFileDetector
 extends <a href='../../../org.openqa.selenium.remote.FileDetector.html'>FileDetector</a></pre>
 
     <p> An extension of org.openqa.selenium.remote.FileDetector
- that will get passed additional parameters from the webdriver container holder. 
+ that will get passed additional parameters from the webdriver container holder.
  <p>
  Implementations must provide a zero-argument constructor to ensure compatibility with java.util.ServiceLoader. <DL><DT><B>See Also:</B></DT><DD><a href='../../../grails/plugin/geb/GebRecordingTestListener.html' title='GebRecordingTestListener'>GebRecordingTestListener</a></DD></DL></p>
 
diff --git a/snapshot/api/grails/plugin/geb/GrailsContainerGebExtension.html b/snapshot/api/grails/plugin/geb/GrailsContainerGebExtension.html
index cda4b47afc..9854fdf710 100644
--- a/snapshot/api/grails/plugin/geb/GrailsContainerGebExtension.html
+++ b/snapshot/api/grails/plugin/geb/GrailsContainerGebExtension.html
@@ -106,8 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@groovy.util.logging.Slf4j
-@groovy.transform.CompileStatic
+<pre>@groovy.transform.CompileStatic
 class GrailsContainerGebExtension
 extends java.lang.Object
 implements <a href='../../../org.spockframework.runtime.extension.IGlobalExtension.html'>IGlobalExtension</a></pre>
diff --git a/snapshot/api/grails/plugin/geb/WebDriverContainerHolder.html b/snapshot/api/grails/plugin/geb/WebDriverContainerHolder.html
index d2ed3300a7..ba57b65d31 100644
--- a/snapshot/api/grails/plugin/geb/WebDriverContainerHolder.html
+++ b/snapshot/api/grails/plugin/geb/WebDriverContainerHolder.html
@@ -101,8 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@groovy.util.logging.Slf4j
-@groovy.transform.CompileStatic
+<pre>@groovy.transform.CompileStatic
 class WebDriverContainerHolder
 extends java.lang.Object</pre>
 
diff --git a/snapshot/api/grails/plugin/geb/support/delegate/PageDelegate.html b/snapshot/api/grails/plugin/geb/support/delegate/PageDelegate.html
index 5ec265904d..3091ad182d 100644
--- a/snapshot/api/grails/plugin/geb/support/delegate/PageDelegate.html
+++ b/snapshot/api/grails/plugin/geb/support/delegate/PageDelegate.html
@@ -997,7 +997,7 @@ implements <a href='../../../../../geb.js.AlertAndConfirmSupport.html'>AlertAndC
                         <a name="interact(groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>void <strong>interact</strong>(@groovy.lang.DelegatesTo(strategy: 1, value: InteractDelegate.class)<br>groovy.lang.Closure interactionClosure)</h4>
+                                <h4>@java.lang.Override<br>void <strong>interact</strong>(@groovy.lang.DelegatesTo(strategy: 1, value: InteractDelegate)<br>groovy.lang.Closure interactionClosure)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/grails/plugin/json/builder/JsonGenerator.Options.html b/snapshot/api/grails/plugin/json/builder/JsonGenerator.Options.html
index cfcc0f8318..de7d41eadd 100644
--- a/snapshot/api/grails/plugin/json/builder/JsonGenerator.Options.html
+++ b/snapshot/api/grails/plugin/json/builder/JsonGenerator.Options.html
@@ -523,7 +523,7 @@ extends java.lang.Object</pre>
                         <a name="addConverter(Class, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; public&nbsp;<a href='../../../../Options.html'>Options</a> <strong>addConverter</strong>(java.lang.Class&lt;T&gt; type, @groovy.transform.stc.ClosureParams(value=FromString.class, options={"T","T,String"})<br>groovy.lang.Closure&lt;?&gt; closure)</h4>
+                                <h4>&lt;T&gt; public&nbsp;<a href='../../../../Options.html'>Options</a> <strong>addConverter</strong>(java.lang.Class&lt;T&gt; type, @groovy.transform.stc.ClosureParams(value = FromString.class, options = {"T", "T,String"})<br>groovy.lang.Closure&lt;?&gt; closure)</h4>
                                 <p> Registers a closure that will be called when the specified type or subtype
  is serialized.
 
diff --git a/snapshot/api/grails/plugin/json/view/api/JsonView.html b/snapshot/api/grails/plugin/json/view/api/JsonView.html
index d1c509fcd9..94cc313d80 100644
--- a/snapshot/api/grails/plugin/json/view/api/JsonView.html
+++ b/snapshot/api/grails/plugin/json/view/api/JsonView.html
@@ -497,7 +497,7 @@ extends <a href='../../../../../grails/views/api/GrailsView.html'>GrailsView</a>
                         <a name="json(java.lang.Iterable, groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>java.lang.Object <strong>json</strong>(java.lang.Iterable coll, @groovy.lang.DelegatesTo(value: StreamingJsonBuilder.StreamingJsonDelegate.class, strategy: Closure.DELEGATE_FIRST)<br>groovy.lang.Closure c)</h4>
+                                <h4>java.lang.Object <strong>json</strong>(java.lang.Iterable coll, @groovy.lang.DelegatesTo(value: StreamingJsonBuilder.StreamingJsonDelegate, strategy: Closure.DELEGATE_FIRST)<br>groovy.lang.Closure c)</h4>
                                 <p> A collection and closure passed to a JSON builder will create a root JSON array applying
  the closure to each object in the collection
  <p>
@@ -523,7 +523,7 @@ extends <a href='../../../../../grails/views/api/GrailsView.html'>GrailsView</a>
                         <a name="json(groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>java.lang.Object <strong>json</strong>(@groovy.lang.DelegatesTo(value: StreamingJsonBuilder.StreamingJsonDelegate.class, strategy: Closure.DELEGATE_FIRST)<br>groovy.lang.Closure c)</h4>
+                                <h4>java.lang.Object <strong>json</strong>(@groovy.lang.DelegatesTo(value: StreamingJsonBuilder.StreamingJsonDelegate, strategy: Closure.DELEGATE_FIRST)<br>groovy.lang.Closure c)</h4>
                                 <p> A closure passed to a JSON builder will create a root JSON object
  <p>
  Example:
@@ -544,7 +544,7 @@ extends <a href='../../../../../grails/views/api/GrailsView.html'>GrailsView</a>
                         <a name="json(java.lang.String, groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>void <strong>json</strong>(java.lang.String name, @groovy.lang.DelegatesTo(value: StreamingJsonBuilder.StreamingJsonDelegate.class, strategy: Closure.DELEGATE_FIRST)<br>groovy.lang.Closure c)</h4>
+                                <h4>void <strong>json</strong>(java.lang.String name, @groovy.lang.DelegatesTo(value: StreamingJsonBuilder.StreamingJsonDelegate, strategy: Closure.DELEGATE_FIRST)<br>groovy.lang.Closure c)</h4>
                                 <p> A name and a closure passed to a JSON builder will create a key with a JSON object
  <p>
  Example:
@@ -565,7 +565,7 @@ extends <a href='../../../../../grails/views/api/GrailsView.html'>GrailsView</a>
                         <a name="json(java.lang.String, java.lang.Iterable, groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>void <strong>json</strong>(java.lang.String name, java.lang.Iterable coll, @groovy.lang.DelegatesTo(value: StreamingJsonBuilder.StreamingJsonDelegate.class, strategy: Closure.DELEGATE_FIRST)<br>groovy.lang.Closure c)</h4>
+                                <h4>void <strong>json</strong>(java.lang.String name, java.lang.Iterable coll, @groovy.lang.DelegatesTo(value: StreamingJsonBuilder.StreamingJsonDelegate, strategy: Closure.DELEGATE_FIRST)<br>groovy.lang.Closure c)</h4>
                                 <p> A name, a collection and closure passed to a JSON builder will create a root JSON array applying
  the closure to each object in the collection
  <p>
@@ -591,7 +591,7 @@ extends <a href='../../../../../grails/views/api/GrailsView.html'>GrailsView</a>
                         <a name="json(java.lang.String, java.util.Map, groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>void <strong>json</strong>(java.lang.String name, java.util.Map map, @groovy.lang.DelegatesTo(value: StreamingJsonBuilder.StreamingJsonDelegate.class, strategy: Closure.DELEGATE_FIRST)<br>groovy.lang.Closure callable)</h4>
+                                <h4>void <strong>json</strong>(java.lang.String name, java.util.Map map, @groovy.lang.DelegatesTo(value: StreamingJsonBuilder.StreamingJsonDelegate, strategy: Closure.DELEGATE_FIRST)<br>groovy.lang.Closure callable)</h4>
                                 <p> If you use named arguments and a closure as last argument,
  the key/value pairs of the map (as named arguments)
  and the key/value pairs represented in the closure
diff --git a/snapshot/api/grails/plugin/json/view/api/internal/DefaultHalViewHelper.HalStreamingJsonDelegate.html b/snapshot/api/grails/plugin/json/view/api/internal/DefaultHalViewHelper.HalStreamingJsonDelegate.html
index a6173f61cc..ea4ca0e8b0 100644
--- a/snapshot/api/grails/plugin/json/view/api/internal/DefaultHalViewHelper.HalStreamingJsonDelegate.html
+++ b/snapshot/api/grails/plugin/json/view/api/internal/DefaultHalViewHelper.HalStreamingJsonDelegate.html
@@ -419,7 +419,7 @@ extends <a href='../../../../../../grails/plugin/json/builder/StreamingJsonBuild
                         <a name="call(java.lang.String, java.lang.Object, groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>void <strong>call</strong>(java.lang.String name, java.lang.Object value, @groovy.lang.DelegatesTo(value: StreamingJsonDelegate.class)<br>groovy.lang.Closure callable)</h4>
+                                <h4>@java.lang.Override<br>void <strong>call</strong>(java.lang.String name, java.lang.Object value, @groovy.lang.DelegatesTo(value: StreamingJsonDelegate)<br>groovy.lang.Closure callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -427,7 +427,7 @@ extends <a href='../../../../../../grails/plugin/json/builder/StreamingJsonBuild
                         <a name="call(java.lang.String, groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>void <strong>call</strong>(java.lang.String name, @groovy.lang.DelegatesTo(value: StreamingJsonDelegate.class, strategy: Closure.DELEGATE_FIRST)<br>groovy.lang.Closure value)</h4>
+                                <h4>@java.lang.Override<br>void <strong>call</strong>(java.lang.String name, @groovy.lang.DelegatesTo(value: StreamingJsonDelegate, strategy: Closure.DELEGATE_FIRST)<br>groovy.lang.Closure value)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/grails/rest/render/xml/XmlCollectionRenderer.html b/snapshot/api/grails/rest/render/xml/XmlCollectionRenderer.html
index 193bc9cf43..509f6e46ec 100644
--- a/snapshot/api/grails/rest/render/xml/XmlCollectionRenderer.html
+++ b/snapshot/api/grails/rest/render/xml/XmlCollectionRenderer.html
@@ -111,7 +111,7 @@ class XmlCollectionRenderer
 extends <a href='../../../../grails/rest/render/xml/XmlRenderer.html'>XmlRenderer</a>
 implements <a href='../../../../grails/rest/render/ContainerRenderer.html'>ContainerRenderer</a></pre>
 
-    <p> 
+    <p>
  A XML renderer for a collection of objects
  <DL><DT><B>Since:</B></DT><DD>2.3.1</DD></DL></p>
 
diff --git a/snapshot/api/grails/testing/web/GrailsWebUnitTest.html b/snapshot/api/grails/testing/web/GrailsWebUnitTest.html
index f49612fe28..855f78b5c0 100644
--- a/snapshot/api/grails/testing/web/GrailsWebUnitTest.html
+++ b/snapshot/api/grails/testing/web/GrailsWebUnitTest.html
@@ -108,7 +108,6 @@ if (location.href.indexOf('is-external=true') == -1) {
 
 <pre>@groovy.transform.Trait
 @groovy.transform.CompileStatic
-@groovy.util.logging.Slf4j
 trait GrailsWebUnitTest
 extends java.lang.Object
 implements <a href='../../../org/grails/testing/GrailsUnitTest.html'>GrailsUnitTest</a></pre>
diff --git a/snapshot/api/grails/ui/shell/GrailsShell.html b/snapshot/api/grails/ui/shell/GrailsShell.html
index 15252e160a..92778775fa 100644
--- a/snapshot/api/grails/ui/shell/GrailsShell.html
+++ b/snapshot/api/grails/ui/shell/GrailsShell.html
@@ -194,7 +194,7 @@ extends <a href='../../../grails/boot/GrailsApp.html'>GrailsApp</a></pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>java.lang.Object</code></td>
+                            <td class="colLast"><code>void</code></td>
                             <td class="colLast"><code><strong><a href="#configureApplicationContextClass()">configureApplicationContextClass</a></strong>()</code><br></td>
                         </tr>
                         
@@ -297,7 +297,7 @@ extends <a href='../../../grails/boot/GrailsApp.html'>GrailsApp</a></pre>
                         <a name="configureApplicationContextClass()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>java.lang.Object <strong>configureApplicationContextClass</strong>()</h4>
+                                <h4>void <strong>configureApplicationContextClass</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/grails/util/ClosureToMapPopulator.html b/snapshot/api/grails/util/ClosureToMapPopulator.html
index 281554101e..686af48533 100644
--- a/snapshot/api/grails/util/ClosureToMapPopulator.html
+++ b/snapshot/api/grails/util/ClosureToMapPopulator.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 public class ClosureToMapPopulator
 extends groovy.lang.GroovyObjectSupport</pre>
 
diff --git a/snapshot/api/grails/util/GrailsStringUtils.html b/snapshot/api/grails/util/GrailsStringUtils.html
index 242421b561..c655751d78 100644
--- a/snapshot/api/grails/util/GrailsStringUtils.html
+++ b/snapshot/api/grails/util/GrailsStringUtils.html
@@ -419,7 +419,7 @@ extends <a href='../../org.springframework.util.StringUtils.html'>StringUtils</a
  GrailsStringUtils.trimToNull("xyz")         = "xyz"
  GrailsStringUtils.trimToNull("    xyz    ") = "xyz"
  </pre>
- 
+
   based on https://github.com/apache/commons-lang/blob/master/src/main/java/org/apache/commons/lang3/StringUtils.java#L8838 <DL><DT><B>Parameters:</B></DT><DD><code>str</code> -   the String to be trimmed, may be null</DD></DL><DL><DT><B>Returns:</B></DT><DD>the trimmed String,
   <CODE>null</CODE> if only containing space, empty or null String input</DD></DL><DL><DT><B>Since:</B></DT><DD>7.0.0</DD></DL></p>
                             </li>
diff --git a/snapshot/api/grails/validation/ConstrainedDelegate.html b/snapshot/api/grails/validation/ConstrainedDelegate.html
index b296d7bcf0..137d9d4319 100644
--- a/snapshot/api/grails/validation/ConstrainedDelegate.html
+++ b/snapshot/api/grails/validation/ConstrainedDelegate.html
@@ -107,7 +107,6 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>@groovy.transform.CompileStatic
-@groovy.util.logging.Slf4j
 class ConstrainedDelegate
 extends java.lang.Object
 implements <a href='../../grails/gorm/validation/Constrained.html'>Constrained</a>, <a href='../../grails/gorm/validation/ConstrainedProperty.html'>ConstrainedProperty</a></pre>
diff --git a/snapshot/api/grails/views/compiler/BuilderTypeCheckingExtension.BuilderMethodReplacer.html b/snapshot/api/grails/views/compiler/BuilderTypeCheckingExtension.BuilderMethodReplacer.html
index 9b93b71b9e..f9b322c229 100644
--- a/snapshot/api/grails/views/compiler/BuilderTypeCheckingExtension.BuilderMethodReplacer.html
+++ b/snapshot/api/grails/views/compiler/BuilderTypeCheckingExtension.BuilderMethodReplacer.html
@@ -175,12 +175,6 @@ extends org.codehaus.groovy.ast.ClassCodeExpressionTransformer</pre>
                             <td class="colLast"><code><strong><a href="#transform(org.codehaus.groovy.ast.expr.Expression)">transform</a></strong>(org.codehaus.groovy.ast.expr.Expression exp)</code><br></td>
                         </tr>
                         
-                        <tr class="altColor">
-                            <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>void</code></td>
-                            <td class="colLast"><code><strong><a href="#visitClosureExpression(org.codehaus.groovy.ast.expr.ClosureExpression)">visitClosureExpression</a></strong>(org.codehaus.groovy.ast.expr.ClosureExpression expression)</code><br></td>
-                        </tr>
-                        
                     </table>
                    </ul>
               </li>
@@ -265,14 +259,6 @@ extends org.codehaus.groovy.ast.ClassCodeExpressionTransformer</pre>
                             </li>
                         </ul>
                     
-                        <a name="visitClosureExpression(org.codehaus.groovy.ast.expr.ClosureExpression)"><!-- --></a>
-                        <ul class="blockListLast">
-                            <li class="blockList">
-                                <h4>@java.lang.Override<br>void <strong>visitClosureExpression</strong>(org.codehaus.groovy.ast.expr.ClosureExpression expression)</h4>
-                                <p></p>
-                            </li>
-                        </ul>
-                    
                 </li>
             </ul>
             
diff --git a/snapshot/api/grails/web/mapping/ResponseRedirector.html b/snapshot/api/grails/web/mapping/ResponseRedirector.html
index a5bdef3d01..6cb55a9631 100644
--- a/snapshot/api/grails/web/mapping/ResponseRedirector.html
+++ b/snapshot/api/grails/web/mapping/ResponseRedirector.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>@groovy.transform.CompileStatic
-@groovy.util.logging.Commons
+@groovy.util.logging.Slf4j
 class ResponseRedirector
 extends java.lang.Object</pre>
 
diff --git a/snapshot/api/grails/web/servlet/context/GrailsWebApplicationContext.html b/snapshot/api/grails/web/servlet/context/GrailsWebApplicationContext.html
index 26e3460845..b13967bb86 100644
--- a/snapshot/api/grails/web/servlet/context/GrailsWebApplicationContext.html
+++ b/snapshot/api/grails/web/servlet/context/GrailsWebApplicationContext.html
@@ -340,7 +340,7 @@ implements <a href='../../../../org.springframework.web.context.ConfigurableWebA
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/spring/GrailsApplicationContext.html'>GrailsApplicationContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/spring/GrailsApplicationContext.html#assertBeanFactoryActive()'>assertBeanFactoryActive</a>, <a href='../../../../org/grails/spring/GrailsApplicationContext.html#containsBeanDefinition(java.lang.String)'>containsBeanDefinition</a>, <a href='../../../../org/grails/spring/GrailsApplicationContext.html#getMetaClass()'>getMetaClass</a>, <a href='../../../../org/grails/spring/GrailsApplicationContext.html#ge [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/spring/GrailsApplicationContext.html#assertBeanFactoryActive()'>assertBeanFactoryActive</a>, <a href='../../../../org/grails/spring/GrailsApplicationContext.html#containsBeanDefinition(java.lang.String)'>containsBeanDefinition</a>, <a href='../../../../org/grails/spring/GrailsApplicationContext.html#getMetaClass()'>getMetaClass</a>, <a href='../../../../org/grails/spring/GrailsApplicationContext.html#ge [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/snapshot/api/index-all.html b/snapshot/api/index-all.html
index 4faa44e975..30ae2dd92a 100644
--- a/snapshot/api/index-all.html
+++ b/snapshot/api/index-all.html
@@ -355,7 +355,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html#AbstractHibernateQuery(org.hibernate.Criteria, org.grails.orm.hibernate.AbstractHibernateSession, org.grails.datastore.mapping.model.PersistentEntity, java.lang.String)" title="Constructor in AbstractHibernateQuery">AbstractHibernateQuery(org.hibernate.Criteria, org.grails.orm.hibernate.AbstractHibernateSession, org.grails.datastore.mapping.model.PersistentEntity, java.lang.String)</a></span> - C [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateSession.html" title="Class in org.grails.orm.hibernate">AbstractHibernateSession</a></span> - Class in <a href="./org/grails/orm/hibernate/package-summary.html">org.grails.orm.hibernate</a>
-</dt><dd><div class="block">Session implementation that wraps a Hibernate Session.</div></dd>
+</dt><dd><div class="block">Session implementation that wraps a Hibernate org.hibernate.Session.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateSession.html#AbstractHibernateSession(org.grails.orm.hibernate.AbstractHibernateDatastore, org.hibernate.SessionFactory)" title="Constructor in AbstractHibernateSession">AbstractHibernateSession(org.grails.orm.hibernate.AbstractHibernateDatastore, org.hibernate.SessionFactory)</a></span> - Constructor in <a href="org/grails/orm/hibernate/AbstractHibernateSession.html">AbstractHibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/rest/render/AbstractIncludeExcludeRenderer.html" title="Class in grails.rest.render">AbstractIncludeExcludeRenderer</a></span> - Class in <a href="./grails/rest/render/package-summary.html">grails.rest.render</a>
@@ -907,7 +907,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/boot/GrailsDependencyVersions.html#addDependencyManagement(groovy.xml.slurpersupport.GPathResult)" title="Method in GrailsDependencyVersions">addDependencyManagement(groovy.xml.slurpersupport.GPathResult)</a></span> - Method in <a href="org/grails/cli/boot/GrailsDependencyVersions.html">GrailsDependencyVersions</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/gsp/jsp/GroovyPagesJspApplicationContext.html#addELContextListener(ELContextListener)" title="Method in GroovyPagesJspApplicationContext">addELContextListener(ELContextListener)</a></span> - Method in <a href="org/grails/gsp/jsp/GroovyPagesJspApplicationContext.html">GroovyPagesJspApplicationContext</a>
+<dt><span class="strong"><a href="org/grails/gsp/jsp/GroovyPagesJspApplicationContext.html#addELContextListener(jakarta.el.ELContextListener)" title="Method in GroovyPagesJspApplicationContext">addELContextListener(jakarta.el.ELContextListener)</a></span> - Method in <a href="org/grails/gsp/jsp/GroovyPagesJspApplicationContext.html">GroovyPagesJspApplicationContext</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/databinding/SimpleDataBinder.html#addElementToArrayAt(java.lang.Object, java.lang.Object, java.lang.Object)" title="Method in SimpleDataBinder">addElementToArrayAt(java.lang.Object, java.lang.Object, java.lang.Object)</a></span> - Method in <a href="grails/databinding/SimpleDataBinder.html">SimpleDataBinder</a>
 </dt><dd> <div class="block"></div></dd>
@@ -919,7 +919,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/databinding/SimpleDataBinder.html#addElementToCollectionAt(java.lang.Object, java.lang.String, java.util.Collection, java.lang.Object, java.lang.Object)" title="Method in SimpleDataBinder">addElementToCollectionAt(java.lang.Object, java.lang.String, java.util.Collection, java.lang.Object, java.lang.Object)</a></span> - Method in <a href="grails/databinding/SimpleDataBinder.html">SimpleDataBinder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/gsp/jsp/GroovyPagesJspApplicationContext.html#addELResolver(ELResolver)" title="Method in GroovyPagesJspApplicationContext">addELResolver(ELResolver)</a></span> - Method in <a href="org/grails/gsp/jsp/GroovyPagesJspApplicationContext.html">GroovyPagesJspApplicationContext</a>
+<dt><span class="strong"><a href="org/grails/gsp/jsp/GroovyPagesJspApplicationContext.html#addELResolver(jakarta.el.ELResolver)" title="Method in GroovyPagesJspApplicationContext">addELResolver(jakarta.el.ELResolver)</a></span> - Method in <a href="org/grails/gsp/jsp/GroovyPagesJspApplicationContext.html">GroovyPagesJspApplicationContext</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/compiler/injection/AbstractGrailsArtefactTransformer.html#addEnhancedAnnotation(org.codehaus.groovy.ast.ClassNode)" title="Method in AbstractGrailsArtefactTransformer">addEnhancedAnnotation(org.codehaus.groovy.ast.ClassNode)</a></span> - Method in <a href="org/grails/compiler/injection/AbstractGrailsArtefactTransformer.html">AbstractGrailsArtefactTransformer</a>
 </dt><dd> <div class="block"></div></dd>
@@ -1033,7 +1033,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/compiler/web/ControllerActionTransformer.html#addMethodToInvokeClosure(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.PropertyNode, org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.classgen.GeneratorContext)" title="Method in ControllerActionTransformer">addMethodToInvokeClosure(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.PropertyNode, org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.classgen.Ge [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/Grails [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollec [...]
 </dt><dd> <div class="block">Add a Hibernate filter for multitenancy if the persistent class is multitenant</div></dd>
 <dt><span class="strong"><a href="org/grails/core/lifecycle/ShutdownOperations.html#addOperation(java.lang.Runnable, boolean)" title="Method in ShutdownOperations">addOperation(java.lang.Runnable, boolean)</a></span> - Method in <a href="org/grails/core/lifecycle/ShutdownOperations.html">ShutdownOperations</a>
 </dt><dd> <div class="block">Adds a shutdown operation</div></dd>
@@ -2350,7 +2350,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/buffer/GrailsPrintWriter.html#asType(Class<?>)" title="Method in GrailsPrintWriter">asType(Class&lt;?&gt;)</a></span> - Method in <a href="org/grails/buffer/GrailsPrintWriter.html">GrailsPrintWriter</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#asType(FindIterable, Class<T>)" title="Method in MongoExtensions">asType(FindIterable, Class&lt;T&gt;)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#asType(com.mongodb.client.FindIterable, Class<T>)" title="Method in MongoExtensions">asType(com.mongodb.client.FindIterable, Class&lt;T&gt;)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/config/NavigableMap.NullSafeNavigator.html#asType(java.lang.Class)" title="Method in NavigableMap.NullSafeNavigator">asType(java.lang.Class)</a></span> - Method in <a href="org/grails/config/NavigableMap.NullSafeNavigator.html">NavigableMap.NullSafeNavigator</a>
 </dt><dd> <div class="block"></div></dd>
@@ -2966,45 +2966,45 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"> <DL><DT><B>Parameters:</B></DT><DD><code>obj</code> -  The object being bound to</DD></DL></div></dd>
 <dt><span class="strong"><a href="org/grails/web/databinding/DefaultASTDatabindingHelper.html#BINDABLE_CONSTRAINT_NAME" title="Field in DefaultASTDatabindingHelper">BINDABLE_CONSTRAINT_NAME</a></span> - Field in <a href="org/grails/web/databinding/DefaultASTDatabindingHelper.html">DefaultASTDatabindingHelper</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindClass(org.grails.datastore.mapping.model.PersistentEntity, PersistentClass, InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindClass(org.grails.datastore.mapping.model.PersistentEntity, PersistentClass, InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindClass(org.grails.datastore.mapping.model.PersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindClass(org.grails.datastore.mapping.model.PersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/Gr [...]
 </dt><dd> <div class="block">Binds the specified persistant class to the runtime model based on the
  properties defined in the domain class</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollection(org.grails.datastore.mapping.model.types.ToMany, java.util.Collection, PersistentClass, InFlightMetadataCollector, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">bindCollection(org.grails.datastore.mapping.model.types.ToMany, java.util.Collection, PersistentClass, InFlightMetadataCollector, java.lang.String, java.lang.String)</a></span> - Method in <a href="org [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollection(org.grails.datastore.mapping.model.types.ToMany, java.util.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">bindCollection(org.grails.datastore.mapping.model.types.ToMany, java.util.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlight [...]
 </dt><dd> <div class="block">First pass to bind collection to Hibernate metamodel, sets up second pass</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionForPropertyConfig(java.util.Collection, org.grails.orm.hibernate.cfg.PropertyConfig)" title="Method in GrailsDomainBinder">bindCollectionForPropertyConfig(java.util.Collection, org.grails.orm.hibernate.cfg.PropertyConfig)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, Map<?,?>, java.util.Collection, java.lang.String)" title="Method in GrailsDomainBinder">bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, Map&lt;?,?&gt;, java.util.Collection, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cf [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map<?,?>, java.util.Collection, java.lang.String)" title="Method in GrailsDomainBinder">bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map&lt;?,?&gt;, java.util.Collection, java.lang.String)</a></span> -  [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionTable(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.Table, java.lang.String)" title="Method in GrailsDomainBinder">bindCollectionTable(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.Table, java.lang.String)</a></span> - Method in  [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.Table, java.lang.String)" title="Method in GrailsDomainBinder">bindCollectionTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.Ta [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionWithJoinTable(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)" title="Method in GrailsDomainBinder">bindCollectionWithJoinTable(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.PropertyConfig, java.la [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionWithJoinTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)" title="Method in GrailsDomainBinder">bindCollectionWithJoinTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection, org.gr [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindColumn(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, Column, org.grails.orm.hibernate.cfg.ColumnConfig, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String)" title="Method in GrailsDomainBinder">bindColumn(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, Co [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindColumn(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.grails.orm.hibernate.cfg.ColumnConfig, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String)" title="Method in GrailsDomainBinder">bindColumn(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model. [...]
 </dt><dd> <div class="block">Binds a Column instance to the Hibernate meta model</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindColumnConfigToColumn(org.grails.datastore.mapping.model.PersistentProperty, Column, org.grails.orm.hibernate.cfg.ColumnConfig)" title="Method in GrailsDomainBinder">bindColumnConfigToColumn(org.grails.datastore.mapping.model.PersistentProperty, Column, org.grails.orm.hibernate.cfg.ColumnConfig)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindColumnConfigToColumn(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.grails.orm.hibernate.cfg.ColumnConfig)" title="Method in GrailsDomainBinder">bindColumnConfigToColumn(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.grails.orm.hibernate.cfg.ColumnConfig)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/ [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindComponent(Component, org.grails.datastore.mapping.model.types.Embedded, boolean, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindComponent(Component, org.grails.datastore.mapping.model.types.Embedded, boolean, InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindComponent(org.hibernate.mapping.Component, org.grails.datastore.mapping.model.types.Embedded, boolean, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindComponent(org.hibernate.mapping.Component, org.grails.datastore.mapping.model.types.Embedded, boolean, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span> - Meth [...]
 </dt><dd> <div class="block">Binds a Hibernate component type using the given GrailsDomainClassProperty instance</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindComponentProperty(Component, org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, PersistentClass, java.lang.String, org.grails.orm.hibernate.cfg.Table, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindComponentProperty(Component, org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindComponentProperty(org.hibernate.mapping.Component, org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.PersistentClass, java.lang.String, org.grails.orm.hibernate.cfg.Table, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindComponentProperty(org.hibernate.mappi [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCompositeId(org.grails.datastore.mapping.model.PersistentEntity, RootClass, org.grails.orm.hibernate.cfg.CompositeIdentity, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindCompositeId(org.grails.datastore.mapping.model.PersistentEntity, RootClass, org.grails.orm.hibernate.cfg.CompositeIdentity, InFlightMetadataCollector, java.lang.String)</a></span> - Method i [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCompositeId(org.grails.datastore.mapping.model.PersistentEntity, org.hibernate.mapping.RootClass, org.grails.orm.hibernate.cfg.CompositeIdentity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindCompositeId(org.grails.datastore.mapping.model.PersistentEntity, org.hibernate.mapping.RootClass, org.grails.orm.hibernate.cfg.CompositeIdentity, [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCompositeIdentifierToManyToOne(org.grails.datastore.mapping.model.types.Association, SimpleValue, org.grails.orm.hibernate.cfg.CompositeIdentity, org.grails.datastore.mapping.model.PersistentEntity, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">bindCompositeIdentifierToManyToOne(org.grails.datastore.mapping.model.types.Association, SimpleValue, org.grails.orm.hibernate.c [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCompositeIdentifierToManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.SimpleValue, org.grails.orm.hibernate.cfg.CompositeIdentity, org.grails.datastore.mapping.model.PersistentEntity, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">bindCompositeIdentifierToManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.map [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/artefact/Controller.html#bindData(java.lang.Class, java.util.Collection, jakarta.servlet.ServletRequest)" title="Method in Controller">bindData(java.lang.Class, java.util.Collection, jakarta.servlet.ServletRequest)</a></span> - Method in <a href="grails/artefact/Controller.html">Controller</a>
 </dt><dd> <div class="block">Binds data for the given type to the given collection from the request</div></dd>
 <dt><span class="strong"><a href="grails/web/databinding/DataBinder.html#bindData(java.lang.Class, java.util.Collection, grails.databinding.CollectionDataBindingSource)" title="Method in DataBinder">bindData(java.lang.Class, java.util.Collection, grails.databinding.CollectionDataBindingSource)</a></span> - Method in <a href="grails/web/databinding/DataBinder.html">DataBinder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindDependentKeyValue(org.grails.datastore.mapping.model.PersistentProperty, DependantValue, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindDependentKeyValue(org.grails.datastore.mapping.model.PersistentProperty, DependantValue, InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">Grail [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindDependentKeyValue(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.DependantValue, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindDependentKeyValue(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.DependantValue, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</ [...]
 </dt><dd> <div class="block">Binds the primary key value column</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindDiscriminatorProperty(org.grails.orm.hibernate.cfg.Table, RootClass, InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindDiscriminatorProperty(org.grails.orm.hibernate.cfg.Table, RootClass, InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindDiscriminatorProperty(org.grails.orm.hibernate.cfg.Table, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindDiscriminatorProperty(org.grails.orm.hibernate.cfg.Table, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBind [...]
 </dt><dd> <div class="block">Creates and binds the discriminator property used in table-per-hierarchy inheritance to
  discriminate between sub class instances</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindEnumType(org.grails.datastore.mapping.model.PersistentProperty, Class<?>, SimpleValue, java.lang.String)" title="Method in GrailsDomainBinder">bindEnumType(org.grails.datastore.mapping.model.PersistentProperty, Class&lt;?&gt;, SimpleValue, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindEnumType(org.grails.datastore.mapping.model.PersistentProperty, Class<?>, org.hibernate.mapping.SimpleValue, java.lang.String)" title="Method in GrailsDomainBinder">bindEnumType(org.grails.datastore.mapping.model.PersistentProperty, Class&lt;?&gt;, org.hibernate.mapping.SimpleValue, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainB [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindIdentity(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, RootClass, InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)" title="Method in GrailsDomainBinder">bindIdentity(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, RootClass, InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)</a></span> - Method in <a href="org/grail [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindIdentity(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)" title="Method in GrailsDomainBinder">bindIdentity(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, org.gra [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindIndex(java.lang.String, Column, org.grails.orm.hibernate.cfg.ColumnConfig, org.grails.orm.hibernate.cfg.Table)" title="Method in GrailsDomainBinder">bindIndex(java.lang.String, Column, org.grails.orm.hibernate.cfg.ColumnConfig, org.grails.orm.hibernate.cfg.Table)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindIndex(java.lang.String, org.hibernate.mapping.Column, org.grails.orm.hibernate.cfg.ColumnConfig, org.grails.orm.hibernate.cfg.Table)" title="Method in GrailsDomainBinder">bindIndex(java.lang.String, org.hibernate.mapping.Column, org.grails.orm.hibernate.cfg.ColumnConfig, org.grails.orm.hibernate.cfg.Table)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsD [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/apache/grails/common/compiler/GroovyTransformOrder.html#BINDING_FORMAT_ORDER" title="Field in GroovyTransformOrder">BINDING_FORMAT_ORDER</a></span> - Field in <a href="org/apache/grails/common/compiler/GroovyTransformOrder.html">GroovyTransformOrder</a>
 </dt><dd> <div class="block">Allows specifying the format for a field when binding</div></dd>
@@ -3031,76 +3031,76 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="grails/databinding/BindInitializer.html" title="Annotation Type in grails.databinding">BindInitializer</a></span> - Annotation Type in <a href="./grails/databinding/package-summary.html">grails.databinding</a>
 </dt><dd><div class="block">This annotation may be applied to a a field to
  customize initialization of object properties in the data binding process.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindJoinedSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, JoinedSubclass, InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)" title="Method in GrailsDomainBinder">bindJoinedSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, JoinedSubclass, InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)</a></span> - Method [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindJoinedSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.JoinedSubclass, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)" title="Method in GrailsDomainBinder">bindJoinedSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.JoinedSubclass, org.hibernate.boot.spi.InFlightMeta [...]
 </dt><dd> <div class="block">Binds a joined sub-class mapping using table-per-subclass</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, Map<?,?>, org.hibernate.mapping.List, java.lang.String)" title="Method in GrailsDomainBinder">bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, Map&lt;?,?&gt;, org.hibernate.mapping.List, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cf [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map<?,?>, org.hibernate.mapping.List, java.lang.String)" title="Method in GrailsDomainBinder">bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map&lt;?,?&gt;, org.hibernate.mapping.List, java.lang.String)</a></span> -  [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a h [...]
 </dt><dd> <div class="block">Binds a many-to-many relationship. </div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, java.lang.String, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, java.lang.String, InFlightMetadataCollector, java.lang.String)</ [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.S [...]
 </dt><dd> <div class="block">Binds a many-to-one relationship to the</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne)" title="Method in GrailsDomainBinder">bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne)" title="Method in GrailsDomainBinder">bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, Map<?,?>, org.hibernate.mapping.Map, java.lang.String)" title="Method in GrailsDomainBinder">bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, Map&lt;?,?&gt;, org.hibernate.mapping.Map, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/Gr [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map<?,?>, org.hibernate.mapping.Map, java.lang.String)" title="Method in GrailsDomainBinder">bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map&lt;?,?&gt;, org.hibernate.mapping.Map, java.lang.String)</a></span> - Meth [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/util/GrailsWebMockUtil.html#bindMockWebRequest(jakarta.servlet.ServletContext, org.springframework.mock.web.MockHttpServletRequest, org.springframework.mock.web.MockHttpServletResponse)" title="Method in GrailsWebMockUtil">bindMockWebRequest(jakarta.servlet.ServletContext, org.springframework.mock.web.MockHttpServletRequest, org.springframework.mock.web.MockHttpServletResponse)</a></span> - Method in <a href="grails/util/GrailsWebMockUtil.html">Gr [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindNaturalIdentifier(org.grails.orm.hibernate.cfg.Table, org.grails.orm.hibernate.cfg.Mapping, PersistentClass)" title="Method in GrailsDomainBinder">bindNaturalIdentifier(org.grails.orm.hibernate.cfg.Table, org.grails.orm.hibernate.cfg.Mapping, PersistentClass)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindNaturalIdentifier(org.grails.orm.hibernate.cfg.Table, org.grails.orm.hibernate.cfg.Mapping, org.hibernate.mapping.PersistentClass)" title="Method in GrailsDomainBinder">bindNaturalIdentifier(org.grails.orm.hibernate.cfg.Table, org.grails.orm.hibernate.cfg.Mapping, org.hibernate.mapping.PersistentClass)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomai [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/core/DatastoreUtils.html#bindNewSession(org.grails.datastore.mapping.core.Session)" title="Method in DatastoreUtils">bindNewSession(org.grails.datastore.mapping.core.Session)</a></span> - Method in <a href="org/grails/datastore/mapping/core/DatastoreUtils.html">DatastoreUtils</a>
 </dt><dd> <div class="block">Adds the session to the current SessionHolder's list of sessions, making it the current session.
  </div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindNumericColumnConstraints(Column, org.grails.datastore.mapping.model.PersistentProperty, org.grails.orm.hibernate.cfg.ColumnConfig)" title="Method in GrailsDomainBinder">bindNumericColumnConstraints(Column, org.grails.datastore.mapping.model.PersistentProperty, org.grails.orm.hibernate.cfg.ColumnConfig)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomai [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindNumericColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty, org.grails.orm.hibernate.cfg.ColumnConfig)" title="Method in GrailsDomainBinder">bindNumericColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty, org.grails.orm.hibernate.cfg.ColumnConfig)</a></span> - Method in <a href="org/grails/orm/hibern [...]
 </dt><dd> <div class="block">Interrogates the specified constraints looking for any constraints that would limit the
  precision and/or scale of the property's value.  </div></dd>
 <dt><span class="strong"><a href="grails/web/databinding/DataBindingUtils.html#bindObjectToDomainInstance(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, java.lang.Object, java.util.List, java.util.List, java.lang.String)" title="Method in DataBindingUtils">bindObjectToDomainInstance(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, java.lang.Object, java.util.List, java.util.List, java.lang.String)</a></span> - Method in <a href="grails/web/da [...]
 </dt><dd> <div class="block">Binds the given source object to the given target object performing type conversion if necessary</div></dd>
 <dt><span class="strong"><a href="grails/web/databinding/DataBindingUtils.html#bindObjectToInstance(java.lang.Object, java.lang.Object, java.util.List, java.util.List, java.lang.String)" title="Method in DataBindingUtils">bindObjectToInstance(java.lang.Object, java.lang.Object, java.util.List, java.util.List, java.lang.String)</a></span> - Method in <a href="grails/web/databinding/DataBindingUtils.html">DataBindingUtils</a>
 </dt><dd> <div class="block">Binds the given source object to the given target object performing type conversion if necessary</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.grails.datastore.mapping.model.types.OneToMany, InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.grails.datastore.mapping.model.types.OneToMany, InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBind [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.mapping.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.mapping.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDo [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/Grai [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html" [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/services/implementers/AbstractSaveImplementer.html#bindParametersAndSave(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, org.codehaus.groovy.ast.Parameter, org.codehaus.groovy.ast.stmt.BlockStatement, org.codehaus.groovy.ast.expr.VariableExpression)" title="Method in AbstractSaveImplementer">bindParametersAndSave(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, org.codehaus.groovy.ast [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html" [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/gra [...]
 </dt><dd> <div class="block">Binds a property to Hibernate runtime meta model. </div></dd>
 <dt><span class="strong"><a href="grails/databinding/SimpleDataBinder.html#bindProperty(java.lang.Object, grails.databinding.DataBindingSource, groovy.lang.MetaProperty, java.lang.Object, grails.databinding.events.DataBindingListener, java.lang.Object)" title="Method in SimpleDataBinder">bindProperty(java.lang.Object, grails.databinding.DataBindingSource, groovy.lang.MetaProperty, java.lang.Object, grails.databinding.events.DataBindingListener, java.lang.Object)</a></span> - Method in <a [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindRoot(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindRoot(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindRoot(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindRoot(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block">Binds a root class (one with no super classes) to the runtime meta model
  based on the supplied Grails domain class</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindRootPersistentClassCommonValues(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, RootClass, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindRootPersistentClassCommonValues(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, RootClass, InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDoma [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindRootPersistentClassCommonValues(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindRootPersistentClassCommonValues(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/core/DatastoreUtils.html#bindSession(org.grails.datastore.mapping.core.Session, java.lang.Object)" title="Method in DatastoreUtils">bindSession(org.grails.datastore.mapping.core.Session, java.lang.Object)</a></span> - Method in <a href="org/grails/datastore/mapping/core/DatastoreUtils.html">DatastoreUtils</a>
 </dt><dd> <div class="block">Bind the session to the thread with a SessionHolder keyed by its Datastore.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindSimpleId(org.grails.datastore.mapping.model.PersistentProperty, RootClass, InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Identity, java.lang.String)" title="Method in GrailsDomainBinder">bindSimpleId(org.grails.datastore.mapping.model.PersistentProperty, RootClass, InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Identity, java.lang.String)</a></span> - Method in <a href="org/grail [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindSimpleId(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Identity, java.lang.String)" title="Method in GrailsDomainBinder">bindSimpleId(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, org.grai [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindSimpleValue(java.lang.String, SimpleValue, boolean, java.lang.String, InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindSimpleValue(java.lang.String, SimpleValue, boolean, java.lang.String, InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindSimpleValue(java.lang.String, org.hibernate.mapping.SimpleValue, boolean, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindSimpleValue(java.lang.String, org.hibernate.mapping.SimpleValue, boolean, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBi [...]
 </dt><dd> <div class="block">Binds a value for the specified parameters to the meta model.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindStringColumnConstraints(Column, org.grails.datastore.mapping.model.PersistentProperty)" title="Method in GrailsDomainBinder">bindStringColumnConstraints(Column, org.grails.datastore.mapping.model.PersistentProperty)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindStringColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty)" title="Method in GrailsDomainBinder">bindStringColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block">Interrogates the specified constraints looking for any constraints that would limit the
  length of the property's value.  </div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, Subclass, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, Subclass, InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.Subclass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.Subclass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a hre [...]
 </dt><dd> <div class="block">Binds a sub-class using table-per-hierarchy inheritance mapping</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindSubClasses(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindSubClasses(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindSubClasses(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindSubClasses(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span>  [...]
 </dt><dd> <div class="block">Binds the sub classes of a root class using table-per-heirarchy inheritance mapping</div></dd>
 <dt><span class="strong"><a href="grails/build/logging/GrailsConsole.html#bindSystemOutAndErr(java.io.PrintStream, java.io.PrintStream)" title="Method in GrailsConsole">bindSystemOutAndErr(java.io.PrintStream, java.io.PrintStream)</a></span> - Method in <a href="grails/build/logging/GrailsConsole.html">GrailsConsole</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/web/databinding/DataBindingUtils.html#bindToCollection(Class<T>, Collection<T>, jakarta.servlet.ServletRequest)" title="Method in DataBindingUtils">bindToCollection(Class&lt;T&gt;, Collection&lt;T&gt;, jakarta.servlet.ServletRequest)</a></span> - Method in <a href="grails/web/databinding/DataBindingUtils.html">DataBindingUtils</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, InFlightMetadataCollector, java.util.Collection)" title="Method in GrailsDomainBinder">bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, InFlightMetadataCollector, java.util.Collection)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection)" title="Method in GrailsDomainBinder">bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/Gr [...]
 </dt><dd> <div class="block">Binds a unidirectional one-to-many creating a psuedo back reference property in the process.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.grails.datastore.mapping.model.types.ManyToOne)" title="Method in GrailsDomainBinder">bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.grails.datastore.mapping.model.types.ManyToOne)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.htm [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.ManyToOne)" title="Method in GrailsDomainBinder">bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.ManyToOne)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"> <DL><DT><B>Parameters:</B></DT><DD><code>property</code> -  The property to bind</DD></DL></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnionSubclass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, UnionSubclass, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindUnionSubclass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, UnionSubclass, InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainB [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnionSubclass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.UnionSubclass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindUnionSubclass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.UnionSubclass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/databinding/BindUsing.html" title="Annotation Type in grails.databinding">BindUsing</a></span> - Annotation Type in <a href="./grails/databinding/package-summary.html">grails.databinding</a>
 </dt><dd><div class="block">This annotation may be applied to a class or to a field to
  customize the data binding process.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindVersion(org.grails.datastore.mapping.model.PersistentProperty, RootClass, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindVersion(org.grails.datastore.mapping.model.PersistentProperty, RootClass, InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindVersion(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindVersion(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href= [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/apache/grails/data/testing/tck/domains/Pet.html#birthDate" title="Property in Pet">birthDate</a></span> - Property in <a href="org/apache/grails/data/testing/tck/domains/Pet.html">Pet</a>
 </dt><dd> <div class="block"></div></dd>
@@ -3440,7 +3440,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/events/bus/AbstractEventBus.html#buildNotificationTrigger(grails.events.Event, Collection<Subscription>, groovy.lang.Closure)" title="Method in AbstractEventBus">buildNotificationTrigger(grails.events.Event, Collection&lt;Subscription&gt;, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/events/bus/AbstractEventBus.html">AbstractEventBus</a>
 </dt><dd> <div class="block">Build a new trigger to set off notifications</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#buildOrderByClause(java.lang.String, PersistentClass, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">buildOrderByClause(java.lang.String, PersistentClass, java.lang.String, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#buildOrderByClause(java.lang.String, org.hibernate.mapping.PersistentClass, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">buildOrderByClause(java.lang.String, org.hibernate.mapping.PersistentClass, java.lang.String, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html#buildOrdinalParameterQueryFromGString(groovy.lang.GString, java.util.List)" title="Method in AbstractHibernateGormStaticApi">buildOrdinalParameterQueryFromGString(groovy.lang.GString, java.util.List)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html">AbstractHibernateGormStaticApi</a>
 </dt><dd> <div class="block">Processes a query converting GString expressions into parameters</div></dd>
@@ -6042,9 +6042,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/spring/DefaultRuntimeSpringConfiguration.html#context" title="Field in DefaultRuntimeSpringConfiguration">context</a></span> - Field in <a href="org/grails/spring/DefaultRuntimeSpringConfiguration.html">DefaultRuntimeSpringConfiguration</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(AbstractBsonReader.Context, BsonContextType)" title="Constructor in JsonReader.Context">Context(AbstractBsonReader.Context, BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)" title="Constructor in JsonReader.Context">Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
 </dt><dd> <div class="block">Creates a new context.</div></dd>
 <dt><span class="strong"><a href="org/grails/core/AbstractGrailsApplication.html#contextInitialized" title="Field in AbstractGrailsApplication">contextInitialized</a></span> - Field in <a href="org/grails/core/AbstractGrailsApplication.html">AbstractGrailsApplication</a>
 </dt><dd> <div class="block"></div></dd>
@@ -6066,7 +6066,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#contexts" title="Property in DatabaseMigrationCommand">contexts</a></span> - Property in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#contribute(InFlightMetadataCollector, org.jboss.jandex.IndexView)" title="Method in GrailsDomainBinder">contribute(InFlightMetadataCollector, org.jboss.jandex.IndexView)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#contribute(org.hibernate.boot.spi.InFlightMetadataCollector, org.jboss.jandex.IndexView)" title="Method in GrailsDomainBinder">contribute(org.hibernate.boot.spi.InFlightMetadataCollector, org.jboss.jandex.IndexView)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/web/Controller.html" title="Annotation Type in grails.web">Controller</a></span> - Annotation Type in <a href="./grails/web/package-summary.html">grails.web</a>
 </dt><dd><div class="block">Created by graemerocher on 28/05/14.</div></dd>
@@ -6447,7 +6447,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/converters/ConverterUtil.html" title="Class in org.grails.web.converters">ConverterUtil</a></span> - Class in <a href="./org/grails/web/converters/package-summary.html">org.grails.web.converters</a>
 </dt><dd><div class="block">A utility class for creating and dealing with Converter objects.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html#convertHibernateAccessException(HibernateException)" title="Method in GrailsHibernateTemplate">convertHibernateAccessException(HibernateException)</a></span> - Method in <a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html">GrailsHibernateTemplate</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html#convertHibernateAccessException(org.hibernate.HibernateException)" title="Method in GrailsHibernateTemplate">convertHibernateAccessException(org.hibernate.HibernateException)</a></span> - Method in <a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html">GrailsHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html#convertIdentifier(java.io.Serializable)" title="Method in AbstractHibernateGormStaticApi">convertIdentifier(java.io.Serializable)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html">AbstractHibernateGormStaticApi</a>
 </dt><dd> <div class="block"></div></dd>
@@ -6455,7 +6455,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/engine/NativeEntryEntityPersister.html#convertIdIfNecessary(org.grails.datastore.mapping.model.PersistentEntity, java.io.Serializable)" title="Method in NativeEntryEntityPersister">convertIdIfNecessary(org.grails.datastore.mapping.model.PersistentEntity, java.io.Serializable)</a></span> - Method in <a href="org/grails/datastore/mapping/engine/NativeEntryEntityPersister.html">NativeEntryEntityPersister</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html#convertJdbcAccessException(JDBCException, org.springframework.jdbc.support.SQLExceptionTranslator)" title="Method in GrailsHibernateTemplate">convertJdbcAccessException(JDBCException, org.springframework.jdbc.support.SQLExceptionTranslator)</a></span> - Method in <a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html">GrailsHibernateTemplate</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html#convertJdbcAccessException(org.hibernate.JDBCException, org.springframework.jdbc.support.SQLExceptionTranslator)" title="Method in GrailsHibernateTemplate">convertJdbcAccessException(org.hibernate.JDBCException, org.springframework.jdbc.support.SQLExceptionTranslator)</a></span> - Method in <a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html">GrailsHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/liquibase/ChangelogXml2Groovy.html#convertNode(groovy.util.Node, java.lang.StringBuilder, int)" title="Method in ChangelogXml2Groovy">convertNode(groovy.util.Node, java.lang.StringBuilder, int)</a></span> - Method in <a href="org/grails/plugins/databasemigration/liquibase/ChangelogXml2Groovy.html">ChangelogXml2Groovy</a>
 </dt><dd> <div class="block"></div></dd>
@@ -6687,7 +6687,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Creates an instance of this class</div></dd>
 <dt><span class="strong"><a href="grails/gorm/api/GormStaticOperations.html#create()" title="Method in GormStaticOperations">create()</a></span> - Method in <a href="grails/gorm/api/GormStaticOperations.html">GormStaticOperations</a>
 </dt><dd> <div class="block">Creates an instance of this class</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#create(org.grails.datastore.mapping.model.types.ToMany, PersistentClass, java.lang.String, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">create(org.grails.datastore.mapping.model.types.ToMany, PersistentClass, java.lang.String, InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDom [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#create(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.PersistentClass, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">create(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.PersistentClass, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></ [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/profile/repository/GrailsMavenResolverGrapeEngineFactory.html#create(groovy.lang.GroovyClassLoader, List<GrailsRepositoryConfiguration>, org.grails.cli.compiler.grape.DependencyResolutionContext)" title="Method in GrailsMavenResolverGrapeEngineFactory">create(groovy.lang.GroovyClassLoader, List&lt;GrailsRepositoryConfiguration&gt;, org.grails.cli.compiler.grape.DependencyResolutionContext)</a></span> - Method in <a href="org/grails/cli/pro [...]
 </dt><dd> <div class="block"></div></dd>
@@ -6839,7 +6839,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/pages/GroovyPageCompilerTask.html#createClasspath()" title="Method in GroovyPageCompilerTask">createClasspath()</a></span> - Method in <a href="org/grails/web/pages/GroovyPageCompilerTask.html">GroovyPageCompilerTask</a>
 </dt><dd> <div class="block">Adds a path to the classpath.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#createClassProperties(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">createClassProperties(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">G [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#createClassProperties(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">createClassProperties(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.Strin [...]
 </dt><dd> <div class="block">Creates and binds the properties for the specified Grails domain class and PersistentClass
  and binds them to the Hibernate runtime meta model</div></dd>
 <dt><span class="strong"><a href="org/grails/gsp/GroovyPage.html#createClosureForHtmlPart(int, int)" title="Method in GroovyPage">createClosureForHtmlPart(int, int)</a></span> - Method in <a href="org/grails/gsp/GroovyPage.html">GroovyPage</a>
@@ -7322,7 +7322,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Creates and returns a file change listener for notifying the plugin manager of changes.</div></dd>
 <dt><span class="strong"><a href="org/grails/async/factory/gpars/LoggingPoolFactory.html#createPool(boolean, int)" title="Method in LoggingPoolFactory">createPool(boolean, int)</a></span> - Method in <a href="org/grails/async/factory/gpars/LoggingPoolFactory.html">LoggingPoolFactory</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#createPrimaryKeyValue(InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map<?,?>)" title="Method in GrailsDomainBinder">createPrimaryKeyValue(InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map&lt;?,?&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">Gra [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#createPrimaryKeyValue(org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map<?,?>)" title="Method in GrailsDomainBinder">createPrimaryKeyValue(org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map&lt;?,?&gt;)</a></span> - Method in <a href="org/grails/ [...]
 </dt><dd> <div class="block">Creates the DependentValue object that forms a primary key reference for the collection.</div></dd>
 <dt><span class="strong"><a href="org/grails/compiler/injection/GrailsASTUtils.html#createPrintlnStatement(java.lang.String, java.lang.String)" title="Method in GrailsASTUtils">createPrintlnStatement(java.lang.String, java.lang.String)</a></span> - Method in <a href="org/grails/compiler/injection/GrailsASTUtils.html">GrailsASTUtils</a>
 </dt><dd> <div class="block"></div></dd>
@@ -7350,7 +7350,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"> <DL><DT><B>See Also:</B></DT><DD><a href='../../../grails/async/PromiseFactory.html#createPromise(grails.async.Promise[])' title='PromiseFactory.createPromise'>PromiseFactory.createPromise</a></DD></DL></div></dd>
 <dt><span class="strong"><a href="grails/async/factory/AbstractPromiseFactory.html#createPromiseInternal(Closure<T>)" title="Method in AbstractPromiseFactory">createPromiseInternal(Closure&lt;T&gt;)</a></span> - Method in <a href="grails/async/factory/AbstractPromiseFactory.html">AbstractPromiseFactory</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#createProperty(org.springframework.beans.factory.annotation.Value, PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, InFlightMetadataCollector)" title="Method in GrailsDomainBinder">createProperty(org.springframework.beans.factory.annotation.Value, PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, InFlightMetadataCollector)</a></span> - Method in <a href="org [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#createProperty(org.springframework.beans.factory.annotation.Value, org.hibernate.mapping.PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">createProperty(org.springframework.beans.factory.annotation.Value, org.hibernate.mapping.PersistentClass, org.grails.datastore.mapping.model.PersistentPrope [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/reflect/ClassPropertyFetcher.html#createPropertyDescriptor(java.lang.Class, groovy.lang.MetaProperty)" title="Method in ClassPropertyFetcher">createPropertyDescriptor(java.lang.Class, groovy.lang.MetaProperty)</a></span> - Method in <a href="org/grails/datastore/mapping/reflect/ClassPropertyFetcher.html">ClassPropertyFetcher</a>
 </dt><dd> <div class="block">Creates a PropertyDescriptor from a MetaBeanProperty</div></dd>
@@ -7909,7 +7909,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSource.html#DataSourceConnectionSource(java.lang.String, javax.sql.DataSource, org.grails.datastore.gorm.jdbc.connections.DataSourceSettings)" title="Constructor in DataSourceConnectionSource">DataSourceConnectionSource(java.lang.String, javax.sql.DataSource, org.grails.datastore.gorm.jdbc.connections.DataSourceSettings)</a></span> - Constructor in <a href="org/grails/datastore/gorm/jdbc/conn [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.html" title="Class in org.grails.datastore.gorm.jdbc.connections">DataSourceConnectionSourceFactory</a></span> - Class in <a href="./org/grails/datastore/gorm/jdbc/connections/package-summary.html">org.grails.datastore.gorm.jdbc.connections</a>
-</dt><dd><div class="block">A ConnectionSourceFactory for creating JDBC javax.sql.DataSource connections</div></dd>
+</dt><dd><div class="block">A <a href='../../../../../../org/grails/datastore/mapping/core/connections/ConnectionSourceFactory.html' title='ConnectionSourceFactory'>ConnectionSourceFactory</a> for creating JDBC javax.sql.DataSource connections</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.html#dataSourceConnectionSourceFactory" title="Field in AbstractHibernateConnectionSourceFactory">dataSourceConnectionSourceFactory</a></span> - Field in <a href="org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.html">AbstractHibernateConnectionSourceFactory</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/datasource/DataSourceConnectionSourcesFactoryBean.html" title="Class in org.grails.plugins.datasource">DataSourceConnectionSourcesFactoryBean</a></span> - Class in <a href="./org/grails/plugins/datasource/package-summary.html">org.grails.plugins.datasource</a>
@@ -10476,7 +10476,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.html#doWriteDateTime(long)" title="Method in JsonWriter">doWriteDateTime(long)</a></span> - Method in <a href="org/grails/datastore/bson/json/JsonWriter.html">JsonWriter</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.html#doWriteDBPointer(BsonDbPointer)" title="Method in JsonWriter">doWriteDBPointer(BsonDbPointer)</a></span> - Method in <a href="org/grails/datastore/bson/json/JsonWriter.html">JsonWriter</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.html#doWriteDBPointer(org.bson.BsonDbPointer)" title="Method in JsonWriter">doWriteDBPointer(org.bson.BsonDbPointer)</a></span> - Method in <a href="org/grails/datastore/bson/json/JsonWriter.html">JsonWriter</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.html#doWriteDecimal128(org.bson.types.Decimal128)" title="Method in JsonWriter">doWriteDecimal128(org.bson.types.Decimal128)</a></span> - Method in <a href="org/grails/datastore/bson/json/JsonWriter.html">JsonWriter</a>
 </dt><dd> <div class="block"></div></dd>
@@ -10526,7 +10526,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">The driver class name</div></dd>
 <dt><span class="strong"><a href="grails/plugin/geb/support/delegate/DriverDelegate.html" title="Trait in grails.plugin.geb.support.delegate">DriverDelegate</a></span> - Trait in <a href="./grails/plugin/geb/support/delegate/package-summary.html">grails.plugin.geb.support.delegate</a>
 </dt><dd><div class="block">Handles delegation to select methods of the driver instance for end user convenience.</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#dropIndex(MongoCollection<Document>, Map<String, Object>, DropIndexOptions)" title="Method in MongoExtensions">dropIndex(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, DropIndexOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#dropIndex(MongoCollection<Document>, Map<String, Object>, com.mongodb.client.model.DropIndexOptions)" title="Method in MongoExtensions">dropIndex(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, com.mongodb.client.model.DropIndexOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/buffer/StreamCharBuffer.html#dumpEncodedParts()" title="Method in StreamCharBuffer">dumpEncodedParts()</a></span> - Method in <a href="org/grails/buffer/StreamCharBuffer.html">StreamCharBuffer</a>
 </dt><dd> <div class="block"></div></dd>
@@ -10752,7 +10752,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateRuntimeUtils.html#enableDynamicFilterEnablerIfPresent(org.hibernate.SessionFactory, org.hibernate.Session)" title="Method in HibernateRuntimeUtils">enableDynamicFilterEnablerIfPresent(org.hibernate.SessionFactory, org.hibernate.Session)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateRuntimeUtils.html">HibernateRuntimeUtils</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/groovy/EnableGroovyTemplates.html" title="Annotation Type in org.grails.cli.groovy">EnableGroovyTemplates</a></span> - Annotation Type in <a href="./org/grails/cli/groovy/package-summary.html">org.grails.cli.groovy</a>
-</dt><dd><div class="block">Pseudo annotation used to trigger GroovyTemplatesCompilerAutoConfiguration.</div></dd>
+</dt><dd><div class="block">Pseudo annotation used to trigger <a href='../../../../org/grails/cli/compiler/autoconfigure/GroovyTemplatesCompilerAutoConfiguration.html' title='GroovyTemplatesCompilerAutoConfiguration'>GroovyTemplatesCompilerAutoConfiguration</a>.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#enableMultiTenancyFilter()" title="Method in AbstractHibernateDatastore">enableMultiTenancyFilter()</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
 </dt><dd> <div class="block">Enable the tenant id filter for the given datastore and entity</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.html#enableReload" title="Property in HibernateConnectionSourceSettings">enableReload</a></span> - Property in <a href="org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.html">HibernateConnectionSourceSettings</a>
@@ -14583,7 +14583,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">********** MongoDatabase Extensions ************</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/PropertyConfig.html#getColumn()" title="Method in PropertyConfig">getColumn()</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/PropertyConfig.html">PropertyConfig</a>
 </dt><dd> <div class="block">Shortcut to get the column name for this property.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#getColumnForSimpleValue(SimpleValue)" title="Method in GrailsDomainBinder">getColumnForSimpleValue(SimpleValue)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#getColumnForSimpleValue(org.hibernate.mapping.SimpleValue)" title="Method in GrailsDomainBinder">getColumnForSimpleValue(org.hibernate.mapping.SimpleValue)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#getColumnNameForPropertyAndPath(org.grails.datastore.mapping.model.PersistentProperty, java.lang.String, org.grails.orm.hibernate.cfg.ColumnConfig, java.lang.String)" title="Method in GrailsDomainBinder">getColumnNameForPropertyAndPath(org.grails.datastore.mapping.model.PersistentProperty, java.lang.String, org.grails.orm.hibernate.cfg.ColumnConfig, java.lang.String)</a></span> - Method in <a href="org [...]
 </dt><dd> <div class="block"></div></dd>
@@ -15668,7 +15668,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">  <DL><DT><B>Returns:</B></DT><DD>the GORM domain type of `beanType`.</DD></DL></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/model/ClassMapping.html#getEntity()" title="Method in ClassMapping">getEntity()</a></span> - Method in <a href="org/grails/datastore/mapping/model/ClassMapping.html">ClassMapping</a>
 </dt><dd> <div class="block">Obtains the PersistentEntity for this class mapping</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#getEntity(SaveOrUpdateEvent)" title="Method in ClosureEventTriggeringInterceptor">getEntity(SaveOrUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#getEntity(org.hibernate.event.spi.SaveOrUpdateEvent)" title="Method in ClosureEventTriggeringInterceptor">getEntity(org.hibernate.event.spi.SaveOrUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/plugin/formfields/DelegatingBeanPropertyAccessorImpl.html#getEntity()" title="Method in DelegatingBeanPropertyAccessorImpl">getEntity()</a></span> - Method in <a href="grails/plugin/formfields/DelegatingBeanPropertyAccessorImpl.html">DelegatingBeanPropertyAccessorImpl</a>
 </dt><dd> <div class="block"></div></dd>
@@ -16634,7 +16634,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/model/PersistentEntity.html#getJavaClass()" title="Method in PersistentEntity">getJavaClass()</a></span> - Method in <a href="org/grails/datastore/mapping/model/PersistentEntity.html">PersistentEntity</a>
 </dt><dd> <div class="block"> <DL><DT><B>Returns:</B></DT><DD>The underlying Java class for this entity</DD></DL></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#getJoinedSubClassTableName(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, org.grails.orm.hibernate.cfg.Table, InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">getJoinedSubClassTableName(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, org.grails.orm.hibernate.cfg.Table, InFlightMetadataCollector, java.lang.String)</a></ [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#getJoinedSubClassTableName(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.grails.orm.hibernate.cfg.Table, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">getJoinedSubClassTableName(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.grails.orm.hibe [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/query/criteria/AbstractDetachedCriteria.html#getJoinTypes()" title="Method in AbstractDetachedCriteria">getJoinTypes()</a></span> - Method in <a href="org/grails/datastore/gorm/query/criteria/AbstractDetachedCriteria.html">AbstractDetachedCriteria</a>
 </dt><dd> <div class="block"> <DL><DT><B>Returns:</B></DT><DD>Obtain the join types</DD></DL></div></dd>
@@ -18477,7 +18477,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/util/GrailsClassUtils.html#getProperty(Class<?>, java.lang.String)" title="Method in GrailsClassUtils">getProperty(Class&lt;?&gt;, java.lang.String)</a></span> - Method in <a href="grails/util/GrailsClassUtils.html">GrailsClassUtils</a>
 </dt><dd> <div class="block">Retrieves a property of the given class of the specified name and type</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#getProperty(PersistentClass, java.lang.String)" title="Method in GrailsDomainBinder">getProperty(PersistentClass, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#getProperty(org.hibernate.mapping.PersistentClass, java.lang.String)" title="Method in GrailsDomainBinder">getProperty(org.hibernate.mapping.PersistentClass, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/testing/GrailsMockHttpServletRequest.html#getProperty(java.lang.String)" title="Method in GrailsMockHttpServletRequest">getProperty(java.lang.String)</a></span> - Method in <a href="org/grails/plugins/testing/GrailsMockHttpServletRequest.html">GrailsMockHttpServletRequest</a>
 </dt><dd> <div class="block">Property access for request attributes.</div></dd>
@@ -19085,7 +19085,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/web/mapping/mvc/AbstractGrailsControllerUrlMappings.html#getReverseMapping(java.lang.String, java.lang.String, java.util.Map)" title="Method in AbstractGrailsControllerUrlMappings">getReverseMapping(java.lang.String, java.lang.String, java.util.Map)</a></span> - Method in <a href="org/grails/web/mapping/mvc/AbstractGrailsControllerUrlMappings.html">AbstractGrailsControllerUrlMappings</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/mapping/DefaultUrlMappingsHolder.html#getReverseMapping(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.util.Map)" title="Method in DefaultUrlMappingsHolder">getReverseMapping(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.util.Map)</a></span> - Method in <a href="org/grails/web/mapping/DefaultUrlMappingsHolder.html">DefaultUrlMappingsHolder</a>
-</dt><dd> <div class="block"> <DL><DT><B>See Also:</B></DT><DD>UrlMappingsHolder#getReverseMapping(String, String, java.util.Map)</DD></DL></div></dd>
+</dt><dd> <div class="block"> <DL><DT><B>See Also:</B></DT><DD><a href='../../../../grails/web/mapping/UrlMappingsHolder.html#getReverseMapping(String, String, java.util.Map)' title='UrlMappingsHolder.getReverseMapping'>UrlMappingsHolder.getReverseMapping</a></DD></DL></div></dd>
 <dt><span class="strong"><a href="grails/web/mapping/UrlMappingsHolder.html#getReverseMapping(java.lang.String, java.lang.String, java.util.Map)" title="Method in UrlMappingsHolder">getReverseMapping(java.lang.String, java.lang.String, java.util.Map)</a></span> - Method in <a href="grails/web/mapping/UrlMappingsHolder.html">UrlMappingsHolder</a>
 </dt><dd> <div class="block">Retrieves the best guess of a URI for the given controller, action and parameters</div></dd>
 <dt><span class="strong"><a href="org/grails/web/mapping/mvc/AbstractGrailsControllerUrlMappings.html#getReverseMappingNoDefault(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.util.Map)" title="Method in AbstractGrailsControllerUrlMappings">getReverseMappingNoDefault(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.util.Map)</a></span> - Method in <a href="org [...]
@@ -20339,7 +20339,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/liquibase/GormDatabase.1.html#GormDatabase.1()" title="Constructor in GormDatabase.1">GormDatabase.1()</a></span> - Constructor in <a href="org/grails/plugins/databasemigration/liquibase/GormDatabase.1.html">GormDatabase.1</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/plugins/databasemigration/liquibase/GormDatabase.html#GormDatabase(Dialect, org.grails.datastore.mapping.services.ServiceRegistry, org.grails.orm.hibernate.HibernateDatastore)" title="Constructor in GormDatabase">GormDatabase(Dialect, org.grails.datastore.mapping.services.ServiceRegistry, org.grails.orm.hibernate.HibernateDatastore)</a></span> - Constructor in <a href="org/grails/plugins/databasemigration/liquibase/GormDatabase.html">GormDatabase</a>
+<dt><span class="strong"><a href="org/grails/plugins/databasemigration/liquibase/GormDatabase.html#GormDatabase(org.hibernate.dialect.Dialect, org.grails.datastore.mapping.services.ServiceRegistry, org.grails.orm.hibernate.HibernateDatastore)" title="Constructor in GormDatabase">GormDatabase(org.hibernate.dialect.Dialect, org.grails.datastore.mapping.services.ServiceRegistry, org.grails.orm.hibernate.HibernateDatastore)</a></span> - Constructor in <a href="org/grails/plugins/databasemigr [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/events/gorm/GormDispatcherRegistrar.html" title="Class in org.grails.events.gorm">GormDispatcherRegistrar</a></span> - Class in <a href="./org/grails/events/gorm/package-summary.html">org.grails.events.gorm</a>
 </dt><dd><div class="block">Handles registering of GORM event listeners for <a href='../../../../org/grails/events/gorm/GormAnnotatedSubscriber.html' title='GormAnnotatedSubscriber'>GormAnnotatedSubscriber</a> instances</div></dd>
@@ -20467,7 +20467,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/cli/compiler/grape/MavenResolverGrapeEngine.html#grab(java.lang.String)" title="Method in MavenResolverGrapeEngine">grab(java.lang.String)</a></span> - Method in <a href="org/grails/cli/compiler/grape/MavenResolverGrapeEngine.html">MavenResolverGrapeEngine</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/grab/GrabCommand.html" title="Class in org.grails.cli.command.grab">GrabCommand</a></span> - Class in <a href="./org/grails/cli/command/grab/package-summary.html">org.grails.cli.command.grab</a>
-</dt><dd><div class="block">Command to grab the dependencies of one or more Groovy scripts.</div></dd>
+</dt><dd><div class="block">org.springframework.boot.cli.command.Command to grab the dependencies of one or more Groovy scripts.</div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/grab/GrabCommand.html#GrabCommand()" title="Constructor in GrabCommand">GrabCommand()</a></span> - Constructor in <a href="org/grails/cli/command/grab/GrabCommand.html">GrabCommand</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/profile/steps/GradleStep.html#GRADLE_ARGUMENT_ADAPTER" title="Field in GradleStep">GRADLE_ARGUMENT_ADAPTER</a></span> - Field in <a href="org/grails/cli/profile/steps/GradleStep.html">GradleStep</a>
@@ -20746,7 +20746,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="grails/plugin/cache/GrailsConcurrentLinkedMapCache.html" title="Class in grails.plugin.cache">GrailsConcurrentLinkedMapCache</a></span> - Class in <a href="./grails/plugin/cache/package-summary.html">grails.plugin.cache</a>
 </dt><dd><div class="block"> <DL><DT><B>Authors:</B></DT><DD>Jakob Drangmeister</DD></DL></div></dd>
 <dt><span class="strong"><a href="grails/plugin/cache/GrailsConcurrentLinkedMapCache.html#GrailsConcurrentLinkedMapCache(java.lang.String, long)" title="Constructor in GrailsConcurrentLinkedMapCache">GrailsConcurrentLinkedMapCache(java.lang.String, long)</a></span> - Constructor in <a href="grails/plugin/cache/GrailsConcurrentLinkedMapCache.html">GrailsConcurrentLinkedMapCache</a>
-</dt><dd> <div class="block">Create a new GrailsConcurrentLinkedMapCache with the specified name 
+</dt><dd> <div class="block">Create a new GrailsConcurrentLinkedMapCache with the specified name
  and capacity</div></dd>
 <dt><span class="strong"><a href="grails/plugin/cache/GrailsConcurrentLinkedMapCacheManager.html" title="Class in grails.plugin.cache">GrailsConcurrentLinkedMapCacheManager</a></span> - Class in <a href="./grails/plugin/cache/package-summary.html">grails.plugin.cache</a>
 </dt><dd><div class="block">Based on com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap.</div></dd>
@@ -20932,7 +20932,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html" title="Class in org.grails.orm.hibernate">GrailsHibernateTransactionManager</a></span> - Class in <a href="./org/grails/orm/hibernate/package-summary.html">org.grails.orm.hibernate</a>
 </dt><dd><div class="block">Extends the standard class to always set the flush mode to manual when in a read-only transaction.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibernateTransactionManager</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibern [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html" title="Class in org.grails.orm.hibernate.cfg">GrailsHibernateUtil</a></span> - Class in <a href="./org/grails/orm/hibernate/cfg/package-summary.html">org.grails.orm.hibernate.cfg</a>
 </dt><dd><div class="block">Utility methods for configuring Hibernate inside Grails.</div></dd>
@@ -22024,11 +22024,11 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/plugin/json/converters/ZonedDateTimeJsonConverter.html#handles(Class<?>)" title="Method in ZonedDateTimeJsonConverter">handles(Class&lt;?&gt;)</a></span> - Method in <a href="grails/plugin/json/converters/ZonedDateTimeJsonConverter.html">ZonedDateTimeJsonConverter</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/gsp/jsp/JspTagImpl.html#handleSimpleTag(SimpleTag, java.util.Map, org.grails.gsp.jsp.GroovyPagesPageContext, java.io.Writer, groovy.lang.Closure)" title="Method in JspTagImpl">handleSimpleTag(SimpleTag, java.util.Map, org.grails.gsp.jsp.GroovyPagesPageContext, java.io.Writer, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/gsp/jsp/JspTagImpl.html">JspTagImpl</a>
+<dt><span class="strong"><a href="org/grails/gsp/jsp/JspTagImpl.html#handleSimpleTag(jakarta.servlet.jsp.tagext.SimpleTag, java.util.Map, org.grails.gsp.jsp.GroovyPagesPageContext, java.io.Writer, groovy.lang.Closure)" title="Method in JspTagImpl">handleSimpleTag(jakarta.servlet.jsp.tagext.SimpleTag, java.util.Map, org.grails.gsp.jsp.GroovyPagesPageContext, java.io.Writer, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/gsp/jsp/JspTagImpl.html">JspTagImpl</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/query/jpa/JpaQueryBuilder.html#handleSubQuery(org.grails.datastore.mapping.model.PersistentEntity, java.lang.StringBuilder, java.lang.StringBuilder, java.lang.String, int, java.util.List, org.grails.databinding.converters.ConversionService, boolean, boolean, org.grails.datastore.mapping.query.Query.SubqueryCriterion, java.lang.String)" title="Method in JpaQueryBuilder">handleSubQuery(org.grails.datastore.mapping.model.Persist [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#handleUniqueConstraint(org.grails.datastore.mapping.model.PersistentProperty, Column, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">handleUniqueConstraint(org.grails.datastore.mapping.model.PersistentProperty, Column, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String, java.lang.String)</a></span> - Me [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#handleUniqueConstraint(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">handleUniqueConstraint(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.la [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.html#handleValidationError(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, org.springframework.validation.Errors)" title="Method in AbstractHibernateGormInstanceApi">handleValidationError(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, org.springframework.validation.Errors)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateGormI [...]
 </dt><dd> <div class="block">Sets the flush mode to manual. which ensures that the database changes are not persisted to the database
@@ -23818,7 +23818,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Forces an insert of an object to the datastore</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/GormStaticApi.html#insert(D, java.util.Map)" title="Method in GormStaticApi">insert(D, java.util.Map)</a></span> - Method in <a href="org/grails/datastore/gorm/GormStaticApi.html">GormStaticApi</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#insert(MongoCollection<Document>, List<? extends Map>, InsertManyOptions)" title="Method in MongoExtensions">insert(MongoCollection&lt;Document&gt;, List&lt;? extends Map&gt;, InsertManyOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#insert(MongoCollection<Document>, List<? extends Map>, com.mongodb.client.model.InsertManyOptions)" title="Method in MongoExtensions">insert(MongoCollection&lt;Document&gt;, List&lt;? extends Map&gt;, com.mongodb.client.model.InsertManyOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/converters/Converter.CircularReferenceBehaviour.html#INSERT_NULL" title="Enum Constant in Converter.CircularReferenceBehaviour">INSERT_NULL</a></span> - Enum Constant in <a href="org/grails/web/converters/Converter.CircularReferenceBehaviour.html">Converter.CircularReferenceBehaviour</a>
 </dt><dd> <div class="block"></div></dd>
@@ -23844,7 +23844,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/cli/compiler/grape/GrapeEngineInstaller.html#install(groovy.grape.GrapeEngine)" title="Method in GrapeEngineInstaller">install(groovy.grape.GrapeEngine)</a></span> - Method in <a href="org/grails/cli/compiler/grape/GrapeEngineInstaller.html">GrapeEngineInstaller</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/install/InstallCommand.html" title="Class in org.grails.cli.command.install">InstallCommand</a></span> - Class in <a href="./org/grails/cli/command/install/package-summary.html">org.grails.cli.command.install</a>
-</dt><dd><div class="block">Command to install additional dependencies into the CLI.</div></dd>
+</dt><dd><div class="block">org.springframework.boot.cli.command.Command to install additional dependencies into the CLI.</div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/install/InstallCommand.html#InstallCommand()" title="Constructor in InstallCommand">InstallCommand()</a></span> - Constructor in <a href="org/grails/cli/command/install/InstallCommand.html">InstallCommand</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/dev/support/DevelopmentShutdownHook.html#INSTALLED" title="Field in DevelopmentShutdownHook">INSTALLED</a></span> - Field in <a href="org/grails/dev/support/DevelopmentShutdownHook.html">DevelopmentShutdownHook</a>
@@ -25956,7 +25956,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/datastore/gorm/validation/jakarta/JakartaValidatorRegistry.html#JakartaValidatorRegistry(org.grails.datastore.mapping.model.MappingContext, org.grails.datastore.mapping.core.connections.ConnectionSourceSettings, org.springframework.context.MessageSource)" title="Constructor in JakartaValidatorRegistry">JakartaValidatorRegistry(org.grails.datastore.mapping.model.MappingContext, org.grails.datastore.mapping.core.connections.ConnectionSourceSetti [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/archive/JarCommand.html" title="Class in org.grails.cli.command.archive">JarCommand</a></span> - Class in <a href="./org/grails/cli/command/archive/package-summary.html">org.grails.cli.command.archive</a>
-</dt><dd><div class="block">Command to create a self-contained executable jar file from a CLI application.</div></dd>
+</dt><dd><div class="block">org.springframework.boot.cli.command.Command to create a self-contained executable jar file from a CLI application.</div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/archive/JarCommand.html#JarCommand()" title="Constructor in JarCommand">JarCommand()</a></span> - Constructor in <a href="org/grails/cli/command/archive/JarCommand.html">JarCommand</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/profile/repository/AbstractJarProfileRepository.JarProfile.html#JarProfile(org.grails.cli.profile.ProfileRepository, org.springframework.core.io.Resource, java.lang.ClassLoader)" title="Constructor in AbstractJarProfileRepository.JarProfile">JarProfile(org.grails.cli.profile.ProfileRepository, org.springframework.core.io.Resource, java.lang.ClassLoader)</a></span> - Constructor in <a href="org/grails/cli/profile/repository/AbstractJarProfi [...]
@@ -26947,7 +26947,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block">Implementation of the Linkable transform</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/web/rest/transform/LinkableTransform.html#LinkableTransform()" title="Constructor in LinkableTransform">LinkableTransform()</a></span> - Constructor in <a href="org/grails/plugins/web/rest/transform/LinkableTransform.html">LinkableTransform</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#linkBidirectionalOneToMany(java.util.Collection, PersistentClass, DependantValue, org.grails.datastore.mapping.model.PersistentProperty)" title="Method in GrailsDomainBinder">linkBidirectionalOneToMany(java.util.Collection, PersistentClass, DependantValue, org.grails.datastore.mapping.model.PersistentProperty)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsD [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#linkBidirectionalOneToMany(java.util.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.mapping.DependantValue, org.grails.datastore.mapping.model.PersistentProperty)" title="Method in GrailsDomainBinder">linkBidirectionalOneToMany(java.util.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.mapping.DependantValue, org.grails.datastore.mapping.model.PersistentProperty)</a></ [...]
 </dt><dd> <div class="block">Links a bidirectional one-to-many, configuring the inverse side and using a column copy to perform the link</div></dd>
 <dt><span class="strong"><a href="grails/web/mapping/LinkGenerator.html" title="Interface in grails.web.mapping">LinkGenerator</a></span> - Interface in <a href="./grails/web/mapping/package-summary.html">grails.web.mapping</a>
 </dt><dd><div class="block">Generates links for a Grails application based on URL mapping rules and/or base context settings.</div></dd>
@@ -26983,7 +26983,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Creates HAL links for the given model and pagination object</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/web/rest/transform/LinkableTransform.html#LINKS_METHOD" title="Field in LinkableTransform">LINKS_METHOD</a></span> - Field in <a href="org/grails/plugins/web/rest/transform/LinkableTransform.html">LinkableTransform</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#linkValueUsingAColumnCopy(org.grails.datastore.mapping.model.PersistentProperty, Column, DependantValue)" title="Method in GrailsDomainBinder">linkValueUsingAColumnCopy(org.grails.datastore.mapping.model.PersistentProperty, Column, DependantValue)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#linkValueUsingAColumnCopy(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.hibernate.mapping.DependantValue)" title="Method in GrailsDomainBinder">linkValueUsingAColumnCopy(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.hibernate.mapping.DependantValue)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDo [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#list(java.util.Map, groovy.lang.Closure)" title="Method in AbstractHibernateCriteriaBuilder">list(java.util.Map, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html">AbstractHibernateCriteriaBuilder</a>
 </dt><dd> <div class="block"></div></dd>
@@ -30316,63 +30316,63 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/validation/listener/ValidationEventListener.html#onPersistenceEvent(org.grails.datastore.mapping.engine.event.AbstractPersistenceEvent)" title="Method in ValidationEventListener">onPersistenceEvent(org.grails.datastore.mapping.engine.event.AbstractPersistenceEvent)</a></span> - Method in <a href="org/grails/datastore/gorm/validation/listener/ValidationEventListener.html">ValidationEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPostDelete(PostDeleteEvent)" title="Method in ClosureEventListener">onPostDelete(PostDeleteEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPostDelete(org.hibernate.event.spi.PostDeleteEvent)" title="Method in ClosureEventListener">onPostDelete(org.hibernate.event.spi.PostDeleteEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPostDelete(PostDeleteEvent)" title="Method in ClosureEventTriggeringInterceptor">onPostDelete(PostDeleteEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPostDelete(org.hibernate.event.spi.PostDeleteEvent)" title="Method in ClosureEventTriggeringInterceptor">onPostDelete(org.hibernate.event.spi.PostDeleteEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPostDelete(PostDeleteEvent)" title="Method in HibernateEventListener">onPostDelete(PostDeleteEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPostDelete(org.hibernate.event.spi.PostDeleteEvent)" title="Method in HibernateEventListener">onPostDelete(org.hibernate.event.spi.PostDeleteEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPostInsert(PostInsertEvent)" title="Method in ClosureEventListener">onPostInsert(PostInsertEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPostInsert(org.hibernate.event.spi.PostInsertEvent)" title="Method in ClosureEventListener">onPostInsert(org.hibernate.event.spi.PostInsertEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPostInsert(PostInsertEvent)" title="Method in ClosureEventTriggeringInterceptor">onPostInsert(PostInsertEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPostInsert(org.hibernate.event.spi.PostInsertEvent)" title="Method in ClosureEventTriggeringInterceptor">onPostInsert(org.hibernate.event.spi.PostInsertEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPostInsert(PostInsertEvent)" title="Method in HibernateEventListener">onPostInsert(PostInsertEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPostInsert(org.hibernate.event.spi.PostInsertEvent)" title="Method in HibernateEventListener">onPostInsert(org.hibernate.event.spi.PostInsertEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPostLoad(PostLoadEvent)" title="Method in ClosureEventListener">onPostLoad(PostLoadEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPostLoad(org.hibernate.event.spi.PostLoadEvent)" title="Method in ClosureEventListener">onPostLoad(org.hibernate.event.spi.PostLoadEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPostLoad(PostLoadEvent)" title="Method in ClosureEventTriggeringInterceptor">onPostLoad(PostLoadEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPostLoad(org.hibernate.event.spi.PostLoadEvent)" title="Method in ClosureEventTriggeringInterceptor">onPostLoad(org.hibernate.event.spi.PostLoadEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPostLoad(PostLoadEvent)" title="Method in HibernateEventListener">onPostLoad(PostLoadEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPostLoad(org.hibernate.event.spi.PostLoadEvent)" title="Method in HibernateEventListener">onPostLoad(org.hibernate.event.spi.PostLoadEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPostUpdate(PostUpdateEvent)" title="Method in ClosureEventListener">onPostUpdate(PostUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPostUpdate(org.hibernate.event.spi.PostUpdateEvent)" title="Method in ClosureEventListener">onPostUpdate(org.hibernate.event.spi.PostUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPostUpdate(PostUpdateEvent)" title="Method in ClosureEventTriggeringInterceptor">onPostUpdate(PostUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPostUpdate(org.hibernate.event.spi.PostUpdateEvent)" title="Method in ClosureEventTriggeringInterceptor">onPostUpdate(org.hibernate.event.spi.PostUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPostUpdate(PostUpdateEvent)" title="Method in HibernateEventListener">onPostUpdate(PostUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPostUpdate(org.hibernate.event.spi.PostUpdateEvent)" title="Method in HibernateEventListener">onPostUpdate(org.hibernate.event.spi.PostUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPreDelete(PreDeleteEvent)" title="Method in ClosureEventListener">onPreDelete(PreDeleteEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPreDelete(org.hibernate.event.spi.PreDeleteEvent)" title="Method in ClosureEventListener">onPreDelete(org.hibernate.event.spi.PreDeleteEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPreDelete(PreDeleteEvent)" title="Method in ClosureEventTriggeringInterceptor">onPreDelete(PreDeleteEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPreDelete(org.hibernate.event.spi.PreDeleteEvent)" title="Method in ClosureEventTriggeringInterceptor">onPreDelete(org.hibernate.event.spi.PreDeleteEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPreDelete(PreDeleteEvent)" title="Method in HibernateEventListener">onPreDelete(PreDeleteEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPreDelete(org.hibernate.event.spi.PreDeleteEvent)" title="Method in HibernateEventListener">onPreDelete(org.hibernate.event.spi.PreDeleteEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPreInsert(PreInsertEvent)" title="Method in ClosureEventListener">onPreInsert(PreInsertEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPreInsert(org.hibernate.event.spi.PreInsertEvent)" title="Method in ClosureEventListener">onPreInsert(org.hibernate.event.spi.PreInsertEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPreInsert(PreInsertEvent)" title="Method in ClosureEventTriggeringInterceptor">onPreInsert(PreInsertEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPreInsert(org.hibernate.event.spi.PreInsertEvent)" title="Method in ClosureEventTriggeringInterceptor">onPreInsert(org.hibernate.event.spi.PreInsertEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPreInsert(PreInsertEvent)" title="Method in HibernateEventListener">onPreInsert(PreInsertEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPreInsert(org.hibernate.event.spi.PreInsertEvent)" title="Method in HibernateEventListener">onPreInsert(org.hibernate.event.spi.PreInsertEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPreLoad(PreLoadEvent)" title="Method in ClosureEventListener">onPreLoad(PreLoadEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPreLoad(org.hibernate.event.spi.PreLoadEvent)" title="Method in ClosureEventListener">onPreLoad(org.hibernate.event.spi.PreLoadEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPreLoad(PreLoadEvent)" title="Method in ClosureEventTriggeringInterceptor">onPreLoad(PreLoadEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPreLoad(org.hibernate.event.spi.PreLoadEvent)" title="Method in ClosureEventTriggeringInterceptor">onPreLoad(org.hibernate.event.spi.PreLoadEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPreLoad(PreLoadEvent)" title="Method in HibernateEventListener">onPreLoad(PreLoadEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPreLoad(org.hibernate.event.spi.PreLoadEvent)" title="Method in HibernateEventListener">onPreLoad(org.hibernate.event.spi.PreLoadEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPreUpdate(PreUpdateEvent)" title="Method in ClosureEventListener">onPreUpdate(PreUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onPreUpdate(org.hibernate.event.spi.PreUpdateEvent)" title="Method in ClosureEventListener">onPreUpdate(org.hibernate.event.spi.PreUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPreUpdate(PreUpdateEvent)" title="Method in ClosureEventTriggeringInterceptor">onPreUpdate(PreUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onPreUpdate(org.hibernate.event.spi.PreUpdateEvent)" title="Method in ClosureEventTriggeringInterceptor">onPreUpdate(org.hibernate.event.spi.PreUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPreUpdate(PreUpdateEvent)" title="Method in HibernateEventListener">onPreUpdate(PreUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onPreUpdate(org.hibernate.event.spi.PreUpdateEvent)" title="Method in HibernateEventListener">onPreUpdate(org.hibernate.event.spi.PreUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/spring/GrailsApplicationContext.html#onRefresh()" title="Method in GrailsApplicationContext">onRefresh()</a></span> - Method in <a href="org/grails/spring/GrailsApplicationContext.html">GrailsApplicationContext</a>
 </dt><dd> <div class="block">Initialize the theme capability.</div></dd>
 <dt><span class="strong"><a href="grails/persistence/Event.html#onSave" title="Enum Constant in Event">onSave</a></span> - Enum Constant in <a href="grails/persistence/Event.html">Event</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onSaveOrUpdate(SaveOrUpdateEvent)" title="Method in ClosureEventListener">onSaveOrUpdate(SaveOrUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventListener.html#onSaveOrUpdate(org.hibernate.event.spi.SaveOrUpdateEvent)" title="Method in ClosureEventListener">onSaveOrUpdate(org.hibernate.event.spi.SaveOrUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventListener.html">ClosureEventListener</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onSaveOrUpdate(SaveOrUpdateEvent)" title="Method in ClosureEventTriggeringInterceptor">onSaveOrUpdate(SaveOrUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html#onSaveOrUpdate(org.hibernate.event.spi.SaveOrUpdateEvent)" title="Method in ClosureEventTriggeringInterceptor">onSaveOrUpdate(org.hibernate.event.spi.SaveOrUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html">ClosureEventTriggeringInterceptor</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onSaveOrUpdate(SaveOrUpdateEvent)" title="Method in HibernateEventListener">onSaveOrUpdate(SaveOrUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html#onSaveOrUpdate(org.hibernate.event.spi.SaveOrUpdateEvent)" title="Method in HibernateEventListener">onSaveOrUpdate(org.hibernate.event.spi.SaveOrUpdateEvent)</a></span> - Method in <a href="org/grails/orm/hibernate/event/listener/HibernateEventListener.html">HibernateEventListener</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/web/servlet/context/BootStrapClassRunner.html#onShutdown(Map<String, Object>)" title="Method in BootStrapClassRunner">onShutdown(Map&lt;String, Object&gt;)</a></span> - Method in <a href="org/grails/plugins/web/servlet/context/BootStrapClassRunner.html">BootStrapClassRunner</a>
 </dt><dd> <div class="block"></div></dd>
@@ -30480,7 +30480,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/web/mapping/RegexUrlMapping.html#OPTIONAL_EXTENSION_WILDCARD_PATTERN" title="Field in RegexUrlMapping">OPTIONAL_EXTENSION_WILDCARD_PATTERN</a></span> - Field in <a href="org/grails/web/mapping/RegexUrlMapping.html">RegexUrlMapping</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/OptionParsingCommand.html" title="Class in org.grails.cli.command">OptionParsingCommand</a></span> - Class in <a href="./org/grails/cli/command/package-summary.html">org.grails.cli.command</a>
-</dt><dd><div class="block">Base class for a <a href='../../../../org/grails/cli/command/Command.html' title='Command'>Command</a> that parse options using an OptionHandler.</div></dd>
+</dt><dd><div class="block">Base class for a org.springframework.boot.cli.command.Command that parse options using an OptionHandler.</div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/OptionParsingCommand.html#OptionParsingCommand(java.lang.String, java.lang.String, org.springframework.boot.cli.command.options.OptionHandler)" title="Constructor in OptionParsingCommand">OptionParsingCommand(java.lang.String, java.lang.String, org.springframework.boot.cli.command.options.OptionHandler)</a></span> - Constructor in <a href="org/grails/cli/command/OptionParsingCommand.html">OptionParsingCommand</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/options/CompilerOptionHandler.html#options()" title="Method in CompilerOptionHandler">options()</a></span> - Method in <a href="org/grails/cli/command/options/CompilerOptionHandler.html">CompilerOptionHandler</a>
@@ -33612,7 +33612,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/taglib/TagLibraryMetaUtils.html#registerPropertyMissingForTag(groovy.lang.MetaClass, java.lang.String, java.lang.Object)" title="Method in TagLibraryMetaUtils">registerPropertyMissingForTag(groovy.lang.MetaClass, java.lang.String, java.lang.Object)</a></span> - Method in <a href="org/grails/taglib/TagLibraryMetaUtils.html">TagLibraryMetaUtils</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/spring/GrailsApplicationContext.html#registerPrototype(java.lang.String, Class<?>, MutablePropertyValues)" title="Method in GrailsApplicationContext">registerPrototype(java.lang.String, Class&lt;?&gt;, MutablePropertyValues)</a></span> - Method in <a href="org/grails/spring/GrailsApplicationContext.html">GrailsApplicationContext</a>
+<dt><span class="strong"><a href="org/grails/spring/GrailsApplicationContext.html#registerPrototype(java.lang.String, Class<?>, org.springframework.beans.MutablePropertyValues)" title="Method in GrailsApplicationContext">registerPrototype(java.lang.String, Class&lt;?&gt;, org.springframework.beans.MutablePropertyValues)</a></span> - Method in <a href="org/grails/spring/GrailsApplicationContext.html">GrailsApplicationContext</a>
 </dt><dd> <div class="block">Register a prototype bean with the underlying bean factory.</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/AbstractGrailsPluginManager.html#registerProvidedArtefacts(grails.core.GrailsApplication)" title="Method in AbstractGrailsPluginManager">registerProvidedArtefacts(grails.core.GrailsApplication)</a></span> - Method in <a href="org/grails/plugins/AbstractGrailsPluginManager.html">AbstractGrailsPluginManager</a>
 </dt><dd> <div class="block"></div></dd>
@@ -33621,7 +33621,7 @@ if (location.href.indexOf('is-external=true') == -1) {
  application doesn't already provide an artefact of the same name.</div></dd>
 <dt><span class="strong"><a href="org/grails/scaffolding/registry/DomainRendererRegisterer.html#registerRenderers()" title="Method in DomainRendererRegisterer">registerRenderers()</a></span> - Method in <a href="org/grails/scaffolding/registry/DomainRendererRegisterer.html">DomainRendererRegisterer</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/spring/GrailsApplicationContext.html#registerSingleton(java.lang.String, Class<?>, MutablePropertyValues)" title="Method in GrailsApplicationContext">registerSingleton(java.lang.String, Class&lt;?&gt;, MutablePropertyValues)</a></span> - Method in <a href="org/grails/spring/GrailsApplicationContext.html">GrailsApplicationContext</a>
+<dt><span class="strong"><a href="org/grails/spring/GrailsApplicationContext.html#registerSingleton(java.lang.String, Class<?>, org.springframework.beans.MutablePropertyValues)" title="Method in GrailsApplicationContext">registerSingleton(java.lang.String, Class&lt;?&gt;, org.springframework.beans.MutablePropertyValues)</a></span> - Method in <a href="org/grails/spring/GrailsApplicationContext.html">GrailsApplicationContext</a>
 </dt><dd> <div class="block">Register a singleton bean with the underlying bean factory.</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/GormEnhancer.html#registerStaticMethod(groovy.lang.ExpandoMetaClass, java.lang.String, Class<?>, org.grails.datastore.gorm.GormStaticApi)" title="Method in GormEnhancer">registerStaticMethod(groovy.lang.ExpandoMetaClass, java.lang.String, Class&lt;?&gt;, org.grails.datastore.gorm.GormStaticApi)</a></span> - Method in <a href="org/grails/datastore/gorm/GormEnhancer.html">GormEnhancer</a>
 </dt><dd> <div class="block"></div></dd>
@@ -34322,7 +34322,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/datastore/mapping/proxy/GroovyObjectMethodHandler.html#resolveDelegateAndSetProperty(java.lang.Object, java.lang.String, java.lang.Object)" title="Method in GroovyObjectMethodHandler">resolveDelegateAndSetProperty(java.lang.Object, java.lang.String, java.lang.Object)</a></span> - Method in <a href="org/grails/datastore/mapping/proxy/GroovyObjectMethodHandler.html">GroovyObjectMethodHandler</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/compiler/ResolveDependencyCoordinatesTransformation.html" title="Class in org.grails.cli.compiler">ResolveDependencyCoordinatesTransformation</a></span> - Class in <a href="./org/grails/cli/compiler/package-summary.html">org.grails.cli.compiler</a>
-</dt><dd><div class="block">org.codehaus.groovy.transform.ASTTransformation to resolve groovy.lang.Grab artifact coordinates.</div></dd>
+</dt><dd><div class="block">import to resolve groovy.lang.Grab artifact coordinates.</div></dd>
 <dt><span class="strong"><a href="org/grails/cli/compiler/ResolveDependencyCoordinatesTransformation.html#ResolveDependencyCoordinatesTransformation(org.grails.cli.compiler.grape.DependencyResolutionContext)" title="Constructor in ResolveDependencyCoordinatesTransformation">ResolveDependencyCoordinatesTransformation(org.grails.cli.compiler.grape.DependencyResolutionContext)</a></span> - Constructor in <a href="org/grails/cli/compiler/ResolveDependencyCoordinatesTransformation.html">Resol [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/services/implementers/AbstractArrayOrIterableResultImplementer.html#resolveDomainClassForReturnType(org.codehaus.groovy.ast.ClassNode, boolean, org.codehaus.groovy.ast.ClassNode)" title="Method in AbstractArrayOrIterableResultImplementer">resolveDomainClassForReturnType(org.codehaus.groovy.ast.ClassNode, boolean, org.codehaus.groovy.ast.ClassNode)</a></span> - Method in <a href="org/grails/datastore/gorm/services/implementers/Ab [...]
@@ -35791,12 +35791,12 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html#setBasename(java.lang.String)" title="Method in ReloadableResourceBundleMessageSource">setBasename(java.lang.String)</a></span> - Method in <a href="org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html">ReloadableResourceBundleMessageSource</a>
 </dt><dd> <div class="block">Set a single basename, following the basic ResourceBundle convention of
  not specifying file extension or language codes, but in contrast to
- ResourceBundleMessageSource referring to a Spring resource location:
+ org.springframework.context.support.ResourceBundleMessageSource referring to a Spring resource location:
  e.g. </div></dd>
 <dt><span class="strong"><a href="org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html#setBasenames(java.lang.String)" title="Method in ReloadableResourceBundleMessageSource">setBasenames(java.lang.String)</a></span> - Method in <a href="org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html">ReloadableResourceBundleMessageSource</a>
 </dt><dd> <div class="block">Set an array of basenames, each following the basic ResourceBundle convention
  of not specifying file extension or language codes, but in contrast to
- ResourceBundleMessageSource referring to a Spring resource location:
+ org.springframework.context.support.ResourceBundleMessageSource referring to a Spring resource location:
  e.g. </div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/AbstractGrailsPlugin.html#setBasePlugin(boolean)" title="Method in AbstractGrailsPlugin">setBasePlugin(boolean)</a></span> - Method in <a href="org/grails/plugins/AbstractGrailsPlugin.html">AbstractGrailsPlugin</a>
 </dt><dd> <div class="block"></div></dd>
@@ -36367,7 +36367,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Set the flush behavior to one of the constants in this class. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateSession.html#setFlushMode(jakarta.persistence.FlushModeType)" title="Method in HibernateSession">setFlushMode(jakarta.persistence.FlushModeType)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateSession.html">HibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
 </dt><dd> <div class="block">Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/IHibernateTemplate.html#setFlushMode(int)" title="Method in IHibernateTemplate">setFlushMode(int)</a></span> - Method in <a href="org/grails/orm/hibernate/IHibernateTemplate.html">IHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -36389,7 +36389,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Sets the "forwardURI" property for the request.</div></dd>
 <dt><span class="strong"><a href="org/grails/web/taglib/jsp/JspSelectTag.html#setFrom(java.lang.String)" title="Method in JspSelectTag">setFrom(java.lang.String)</a></span> - Method in <a href="org/grails/web/taglib/jsp/JspSelectTag.html">JspSelectTag</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#setGeneratedUniqueName(UniqueKey)" title="Method in GrailsDomainBinder">setGeneratedUniqueName(UniqueKey)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#setGeneratedUniqueName(org.hibernate.mapping.UniqueKey)" title="Method in GrailsDomainBinder">setGeneratedUniqueName(org.hibernate.mapping.UniqueKey)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/mongo/config/MongoAttribute.html#setGeoIndex(java.lang.String)" title="Method in MongoAttribute">setGeoIndex(java.lang.String)</a></span> - Method in <a href="org/grails/datastore/mapping/mongo/config/MongoAttribute.html">MongoAttribute</a>
 </dt><dd> <div class="block">Sets the geo index type</div></dd>
@@ -36705,9 +36705,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/buffer/GrailsPrintWriter.html#setMetaClass(groovy.lang.MetaClass)" title="Method in GrailsPrintWriter">setMetaClass(groovy.lang.MetaClass)</a></span> - Method in <a href="org/grails/buffer/GrailsPrintWriter.html">GrailsPrintWriter</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.html#setMetadataContributor(MetadataContributor)" title="Method in HibernateConnectionSourceFactory">setMetadataContributor(MetadataContributor)</a></span> - Method in <a href="org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.html">HibernateConnectionSourceFactory</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.html#setMetadataContributor(org.hibernate.boot.spi.MetadataContributor)" title="Method in HibernateConnectionSourceFactory">setMetadataContributor(org.hibernate.boot.spi.MetadataContributor)</a></span> - Method in <a href="org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.html">HibernateConnectionSourceFactory</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.html#setMetadataContributor(MetadataContributor)" title="Method in HibernateMappingContextConfiguration">setMetadataContributor(MetadataContributor)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.html">HibernateMappingContextConfiguration</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.html#setMetadataContributor(org.hibernate.boot.spi.MetadataContributor)" title="Method in HibernateMappingContextConfiguration">setMetadataContributor(org.hibernate.boot.spi.MetadataContributor)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.html">HibernateMappingContextConfiguration</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/taglib/jsp/JspFormRemoteTag.html#setMethod(java.lang.String)" title="Method in JspFormRemoteTag">setMethod(java.lang.String)</a></span> - Method in <a href="org/grails/web/taglib/jsp/JspFormRemoteTag.html">JspFormRemoteTag</a>
 </dt><dd> <div class="block"></div></dd>
@@ -37570,7 +37570,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databinding/DataBindingConfigurationProperties.html#setTrimStrings(boolean)" title="Method in DataBindingConfigurationProperties">setTrimStrings(boolean)</a></span> - Method in <a href="org/grails/plugins/databinding/DataBindingConfigurationProperties.html">DataBindingConfigurationProperties</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#setTypeForPropertyConfig(org.grails.datastore.mapping.model.PersistentProperty, SimpleValue, org.grails.orm.hibernate.cfg.PropertyConfig)" title="Method in GrailsDomainBinder">setTypeForPropertyConfig(org.grails.datastore.mapping.model.PersistentProperty, SimpleValue, org.grails.orm.hibernate.cfg.PropertyConfig)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">Grail [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#setTypeForPropertyConfig(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.SimpleValue, org.grails.orm.hibernate.cfg.PropertyConfig)" title="Method in GrailsDomainBinder">setTypeForPropertyConfig(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.SimpleValue, org.grails.orm.hibernate.cfg.PropertyConfig)</a></span> - Method in <a href="org/grails/orm/ [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/config/Property.html#setUnique(List<String>)" title="Method in Property">setUnique(List&lt;String&gt;)</a></span> - Method in <a href="org/grails/datastore/mapping/config/Property.html">Property</a>
 </dt><dd> <div class="block"></div></dd>
@@ -40560,7 +40560,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/servlet/mvc/TokenResponseHandler.html" title="Interface in org.grails.web.servlet.mvc">TokenResponseHandler</a></span> - Interface in <a href="./org/grails/web/servlet/mvc/package-summary.html">org.grails.web.servlet.mvc</a>
 </dt><dd><div class="block">Invokes user code that handles double or invalid submits.</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#toList(FindIterable, Class<T>)" title="Method in MongoExtensions">toList(FindIterable, Class&lt;T&gt;)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#toList(com.mongodb.client.FindIterable, Class<T>)" title="Method in MongoExtensions">toList(com.mongodb.client.FindIterable, Class&lt;T&gt;)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/model/types/ToMany.html" title="Class in org.grails.datastore.mapping.model.types">ToMany</a></span> - Class in <a href="./org/grails/datastore/mapping/model/types/package-summary.html">org.grails.datastore.mapping.model.types</a>
 </dt><dd><div class="block">Shared super class inherited by both <a href='../../../../../../org/grails/datastore/mapping/model/types/OneToMany.html' title='OneToMany'>OneToMany</a> and <a href='../../../../../../org/grails/datastore/mapping/model/types/ManyToMany.html' title='ManyToMany'>ManyToMany</a></div></dd>
@@ -41054,7 +41054,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/datastore/gorm/events/AutoTimestampEventListener.html#uninitializedEntities" title="Field in AutoTimestampEventListener">uninitializedEntities</a></span> - Field in <a href="org/grails/datastore/gorm/events/AutoTimestampEventListener.html">AutoTimestampEventListener</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/install/UninstallCommand.html" title="Class in org.grails.cli.command.install">UninstallCommand</a></span> - Class in <a href="./org/grails/cli/command/install/package-summary.html">org.grails.cli.command.install</a>
-</dt><dd><div class="block">Command to uninstall dependencies from the CLI's lib/ext directory.</div></dd>
+</dt><dd><div class="block">org.springframework.boot.cli.command.Command to uninstall dependencies from the CLI's lib/ext directory.</div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/install/UninstallCommand.html#UninstallCommand()" title="Constructor in UninstallCommand">UninstallCommand()</a></span> - Constructor in <a href="org/grails/cli/command/install/UninstallCommand.html">UninstallCommand</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/ColumnConfig.html#unique" title="Property in ColumnConfig">unique</a></span> - Property in <a href="org/grails/orm/hibernate/cfg/ColumnConfig.html">ColumnConfig</a>
@@ -41169,7 +41169,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/init/GrailsUpdater.html#update()" title="Method in GrailsUpdater">update()</a></span> - Method in <a href="grails/init/GrailsUpdater.html">GrailsUpdater</a>
 </dt><dd> <div class="block">Fetches the selectedVersion and if it already exists, replaces the jar file.</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#update(MongoCollection<Document>, Map<String, Object>, Map<String, Object>, UpdateOptions)" title="Method in MongoExtensions">update(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, Map&lt;String, Object&gt;, UpdateOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#update(MongoCollection<Document>, Map<String, Object>, Map<String, Object>, com.mongodb.client.model.UpdateOptions)" title="Method in MongoExtensions">update(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, Map&lt;String, Object&gt;, com.mongodb.client.model.UpdateOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html#update()" title="Method in ReloadableResourceBundleMessageSource.PropertiesHolder">update()</a></span> - Method in <a href="org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html">ReloadableResourceBundleMessageSource.PropertiesHolder</a>
 </dt><dd> <div class="block"></div></dd>
@@ -41217,11 +41217,11 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/json/parser/SimpleCharStream.html#UpdateLineColumn(char)" title="Method in SimpleCharStream">UpdateLineColumn(char)</a></span> - Method in <a href="org/grails/web/json/parser/SimpleCharStream.html">SimpleCharStream</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#updateMany(MongoCollection<Document>, Map<String, Object>, List<? extends Map<String, Object>>, UpdateOptions)" title="Method in MongoExtensions">updateMany(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, List&lt;? extends Map&lt;String, Object&gt;&gt;, UpdateOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#updateMany(MongoCollection<Document>, Map<String, Object>, List<? extends Map<String, Object>>, com.mongodb.client.model.UpdateOptions)" title="Method in MongoExtensions">updateMany(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, List&lt;? extends Map&lt;String, Object&gt;&gt;, com.mongodb.client.model.UpdateOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/web/servlet/mvc/GrailsParameterMap.html#updateNestedKeys(java.util.Map)" title="Method in GrailsParameterMap">updateNestedKeys(java.util.Map)</a></span> - Method in <a href="grails/web/servlet/mvc/GrailsParameterMap.html">GrailsParameterMap</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#updateOne(MongoCollection<Document>, Map<String, Object>, List<? extends Map<String, Object>>, UpdateOptions)" title="Method in MongoExtensions">updateOne(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, List&lt;? extends Map&lt;String, Object&gt;&gt;, UpdateOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#updateOne(MongoCollection<Document>, Map<String, Object>, List<? extends Map<String, Object>>, com.mongodb.client.model.UpdateOptions)" title="Method in MongoExtensions">updateOne(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, List&lt;? extends Map&lt;String, Object&gt;&gt;, com.mongodb.client.model.UpdateOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/e [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/services/implementers/UpdateOneImplementer.html" title="Class in org.grails.datastore.gorm.services.implementers">UpdateOneImplementer</a></span> - Class in <a href="./org/grails/datastore/gorm/services/implementers/package-summary.html">org.grails.datastore.gorm.services.implementers</a>
 </dt><dd><div class="block">Implements an update operation that returns the updated domain class</div></dd>
@@ -42209,12 +42209,8 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/views/compiler/ViewsTransform.ModelTypesVisitor.html#visitClass(org.codehaus.groovy.ast.ClassNode)" title="Method in ViewsTransform.ModelTypesVisitor">visitClass(org.codehaus.groovy.ast.ClassNode)</a></span> - Method in <a href="grails/views/compiler/ViewsTransform.ModelTypesVisitor.html">ViewsTransform.ModelTypesVisitor</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="grails/views/compiler/BuilderTypeCheckingExtension.BuilderMethodReplacer.html#visitClosureExpression(org.codehaus.groovy.ast.expr.ClosureExpression)" title="Method in BuilderTypeCheckingExtension.BuilderMethodReplacer">visitClosureExpression(org.codehaus.groovy.ast.expr.ClosureExpression)</a></span> - Method in <a href="grails/views/compiler/BuilderTypeCheckingExtension.BuilderMethodReplacer.html">BuilderTypeCheckingExtension.BuilderMethodReplacer</a>
-</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/query/transform/DetachedCriteriaTransformer.html#visitDeclarationExpression(org.codehaus.groovy.ast.expr.DeclarationExpression)" title="Method in DetachedCriteriaTransformer">visitDeclarationExpression(org.codehaus.groovy.ast.expr.DeclarationExpression)</a></span> - Method in <a href="org/grails/datastore/gorm/query/transform/DetachedCriteriaTransformer.html">DetachedCriteriaTransformer</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/web/mapping/ResponseCodeUrlMappingVisitor.html#visitExpressionStatement(org.codehaus.groovy.ast.stmt.ExpressionStatement)" title="Method in ResponseCodeUrlMappingVisitor">visitExpressionStatement(org.codehaus.groovy.ast.stmt.ExpressionStatement)</a></span> - Method in <a href="org/grails/web/mapping/ResponseCodeUrlMappingVisitor.html">ResponseCodeUrlMappingVisitor</a>
-</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/query/transform/DetachedCriteriaTransformer.html#visitField(org.codehaus.groovy.ast.FieldNode)" title="Method in DetachedCriteriaTransformer">visitField(org.codehaus.groovy.ast.FieldNode)</a></span> - Method in <a href="org/grails/datastore/gorm/query/transform/DetachedCriteriaTransformer.html">DetachedCriteriaTransformer</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/views/compiler/ViewsTransform.ModelTypesVisitor.html#visitField(org.codehaus.groovy.ast.FieldNode)" title="Method in ViewsTransform.ModelTypesVisitor">visitField(org.codehaus.groovy.ast.FieldNode)</a></span> - Method in <a href="grails/views/compiler/ViewsTransform.ModelTypesVisitor.html">ViewsTransform.ModelTypesVisitor</a>
@@ -42297,7 +42293,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/cli/profile/commands/io/ServerInteraction.html#waitForStartup(java.lang.String, int)" title="Method in ServerInteraction">waitForStartup(java.lang.String, int)</a></span> - Method in <a href="org/grails/cli/profile/commands/io/ServerInteraction.html">ServerInteraction</a>
 </dt><dd> <div class="block">Waits for the server to startup</div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/archive/WarCommand.html" title="Class in org.grails.cli.command.archive">WarCommand</a></span> - Class in <a href="./org/grails/cli/command/archive/package-summary.html">org.grails.cli.command.archive</a>
-</dt><dd><div class="block">Command to create a self-contained executable jar file from a CLI application.</div></dd>
+</dt><dd><div class="block">org.springframework.boot.cli.command.Command to create a self-contained executable jar file from a CLI application.</div></dd>
 <dt><span class="strong"><a href="org/grails/cli/command/archive/WarCommand.html#WarCommand()" title="Constructor in WarCommand">WarCommand()</a></span> - Constructor in <a href="org/grails/cli/command/archive/WarCommand.html">WarCommand</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/gsp/io/DefaultGroovyPageLocator.html#warDeployed" title="Field in DefaultGroovyPageLocator">warDeployed</a></span> - Field in <a href="org/grails/gsp/io/DefaultGroovyPageLocator.html">DefaultGroovyPageLocator</a>
@@ -42378,8 +42374,6 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block">Parses a Grails plugin's watchedResources property value into a list of</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/transform/AbstractMethodDecoratingTransformation.html#weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)" title="Method in AbstractMethodDecoratingTransformation">weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)</a></span> - Method in <a href="org/grails/datastore/gorm/tr [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html#weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)" title="Method in TransactionalTransform">weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)</a></span> - Method in <a href="org/grails/datastore/gorm/transactions/transfor [...]
-</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/compiler/injection/testing/IntegrationTestAstTransformation.html#weaveIntegrationTestMixin(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.ClassNode)" title="Method in IntegrationTestAstTransformation">weaveIntegrationTestMixin(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.ClassNode)</a></span> - Method in <a href="org/grails/compiler/injection/testing/IntegrationTestAstTransformation.html">IntegrationTestAstTransformation</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/compiler/gorm/DirtyCheckingTransformer.html#weaveIntoExistingSetter(java.lang.String, org.grails.compiler.gorm.DirtyCheckingTransformer.GetterAndSetter, org.codehaus.groovy.ast.MethodNode)" title="Method in DirtyCheckingTransformer">weaveIntoExistingSetter(java.lang.String, org.grails.compiler.gorm.DirtyCheckingTransformer.GetterAndSetter, org.codehaus.groovy.ast.MethodNode)</a></span> - Method in <a href="org/grails/compiler/gorm/DirtyCheckin [...]
@@ -42388,8 +42382,6 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/transform/AbstractMethodDecoratingTransformation.html#weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, Map<String, ClassNode>)" title="Method in AbstractMethodDecoratingTransformation">weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode,  [...]
 </dt><dd> <div class="block">Weaves a new method</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html#weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, Map<String, ClassNode>)" title="Method in TransactionalTransform">weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy [...]
-</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/validation/jakarta/services/implementers/MethodValidationImplementer.html#weaveParameterNameData(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, org.codehaus.groovy.ast.MethodNode)" title="Method in MethodValidationImplementer">weaveParameterNameData(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, org.codehaus.groovy.ast.MethodNode)</a></span> - Method in <a href="org/grails/datastor [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/transform/AbstractDatastoreMethodDecoratingTransformation.html#weaveSetTargetDatastoreBody(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.expr.Expression, org.codehaus.groovy.ast.stmt.BlockStatement)" title="Method in AbstractDatastoreMethodDecoratingTransformation">weaveSetTargetDatastoreBody(org.codehaus.groovy.control.SourceUnit, org.c [...]
@@ -42640,9 +42632,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)" title="Method in DatabaseMigrationCommand">withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
 </dt><dd> <div class="block">Execute the given operation with the given flush mode</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/artefact/Controller.html#withForm(org.grails.web.servlet.mvc.GrailsWebRequest, groovy.lang.Closure)" title="Method in Controller">withForm(org.grails.web.servlet.mvc.GrailsWebRequest, groovy.lang.Closure)</a></span> - Method in <a href="grails/artefact/Controller.html">Controller</a>
 </dt><dd> <div class="block"></div></dd>
diff --git a/snapshot/api/org/apache/grails/data/testing/tck/base/GrailsDataTckSpec.html b/snapshot/api/org/apache/grails/data/testing/tck/base/GrailsDataTckSpec.html
index 84156ca563..996258eebd 100644
--- a/snapshot/api/org/apache/grails/data/testing/tck/base/GrailsDataTckSpec.html
+++ b/snapshot/api/org/apache/grails/data/testing/tck/base/GrailsDataTckSpec.html
@@ -101,8 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@groovy.util.logging.Slf4j
-class GrailsDataTckSpec&lt;T extends GrailsDataTckManager&gt;
+<pre>class GrailsDataTckSpec&lt;T extends GrailsDataTckManager&gt;
 extends <a href='../../../../../../../spock.lang.Specification.html'>Specification</a></pre>
 
           </li>
diff --git a/snapshot/api/org/grails/cli/archive/PackagedSpringApplicationLauncher.html b/snapshot/api/org/grails/cli/archive/PackagedSpringApplicationLauncher.html
index 05f7b8122a..329fbab31b 100644
--- a/snapshot/api/org/grails/cli/archive/PackagedSpringApplicationLauncher.html
+++ b/snapshot/api/org/grails/cli/archive/PackagedSpringApplicationLauncher.html
@@ -227,7 +227,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;static&nbsp;final&nbsp;java.lang.String <strong>SOURCE_ENTRY</strong></h4>
                                 <p> The entry containing the source class.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
@@ -236,7 +236,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;static&nbsp;final&nbsp;java.lang.String <strong>START_CLASS_ENTRY</strong></h4>
                                 <p> The entry containing the start class.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/boot/SpringApplicationLauncher.html b/snapshot/api/org/grails/cli/boot/SpringApplicationLauncher.html
index 9f1d431b8a..541b2d4ab1 100644
--- a/snapshot/api/org/grails/cli/boot/SpringApplicationLauncher.html
+++ b/snapshot/api/org/grails/cli/boot/SpringApplicationLauncher.html
@@ -236,7 +236,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;<strong>SpringApplicationLauncher</strong>(java.lang.ClassLoader classLoader)</h4>
                                 <p> Creates a new launcher that will use the given <CODE>classLoader</CODE> to load the
  configured <CODE>SpringApplication</CODE> class.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>classLoader</code> -  the <CODE>ClassLoader</CODE> to use</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>classLoader</code> -  the <CODE>ClassLoader</CODE> to use</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -267,7 +267,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;java.lang.Object <strong>launch</strong>(java.lang.Class&lt;?&gt;[] sources, java.lang.String[] args)</h4>
                                 <p> Launches the application created using the given <CODE>sources</CODE>. The application
  is launched with the given <CODE>args</CODE>.<DL><DT><B>throws:</B></DT><DD>Exception if the launch fails</DD></DL>
-	  <DL><DT><B>Parameters:</B></DT><DD><code>sources</code> -  the sources for the application</DD><DD><code>args</code> -  the args for the application</DD></DL><DL><DT><B>Returns:</B></DT><DD>the application's <CODE>ApplicationContext</CODE></DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>sources</code> -  the sources for the application</DD><DD><code>args</code> -  the args for the application</DD></DL><DL><DT><B>Returns:</B></DT><DD>the application's <CODE>ApplicationContext</CODE></DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/boot/SpringApplicationWebApplicationInitializer.html b/snapshot/api/org/grails/cli/boot/SpringApplicationWebApplicationInitializer.html
index dc83eab2a9..158ad7fcae 100644
--- a/snapshot/api/org/grails/cli/boot/SpringApplicationWebApplicationInitializer.html
+++ b/snapshot/api/org/grails/cli/boot/SpringApplicationWebApplicationInitializer.html
@@ -209,7 +209,7 @@ extends <a href='../../../../org.springframework.boot.web.servlet.support.Spring
                             <li class="blockList">
                                 <h4>public&nbsp;static&nbsp;final&nbsp;java.lang.String <strong>SOURCE_ENTRY</strong></h4>
                                 <p> The entry containing the source class.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/command/AbstractCommand.html b/snapshot/api/org/grails/cli/command/AbstractCommand.html
index 0454a67a97..0e347ffdd1 100644
--- a/snapshot/api/org/grails/cli/command/AbstractCommand.html
+++ b/snapshot/api/org/grails/cli/command/AbstractCommand.html
@@ -260,7 +260,7 @@ implements <a href='../../../../org/grails/cli/command/Command.html'>Command</a>
                             <li class="blockList">
                                 <h4>protected&nbsp;<strong>AbstractCommand</strong>(java.lang.String name, java.lang.String description)</h4>
                                 <p> Create a new <a href='../../../../org/grails/cli/command/AbstractCommand.html' title='AbstractCommand'>AbstractCommand</a> instance.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  the name of the command</DD><DD><code>description</code> -  the command description</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  the name of the command</DD><DD><code>description</code> -  the command description</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/command/Command.html b/snapshot/api/org/grails/cli/command/Command.html
index 3cfb57363a..54efc6273c 100644
--- a/snapshot/api/org/grails/cli/command/Command.html
+++ b/snapshot/api/org/grails/cli/command/Command.html
@@ -223,7 +223,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.String <strong>getDescription</strong>()</h4>
                                 <p> Returns a description of the command.
-	  <DL><DT><B>Returns:</B></DT><DD>the command's description</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the command's description</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -232,7 +232,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;java.util.Collection&lt;<a href='../../../../org/grails/cli/command/HelpExample.html' title='HelpExample'>HelpExample</a>&gt; <strong>getExamples</strong>()</h4>
                                 <p> Return some examples for the command.
-	  <DL><DT><B>Returns:</B></DT><DD>the command's examples</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the command's examples</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -242,7 +242,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                                 <h4>public&nbsp;java.lang.String <strong>getHelp</strong>()</h4>
                                 <p> Gets full help text for the command, e.g. a longer description and one line per
  option.
-	  <DL><DT><B>Returns:</B></DT><DD>the command's help text</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the command's help text</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -251,7 +251,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.String <strong>getName</strong>()</h4>
                                 <p> Returns the name of the command.
-	  <DL><DT><B>Returns:</B></DT><DD>the command's name</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the command's name</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -260,7 +260,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;java.util.Collection&lt;OptionHelp&gt; <strong>getOptionsHelp</strong>()</h4>
                                 <p> Returns help for each supported option.
-	  <DL><DT><B>Returns:</B></DT><DD>help for each of the command's options</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>help for each of the command's options</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -271,7 +271,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                                 <p> Returns usage help for the command. This should be a simple one-line string
  describing basic usage. e.g. '[options] &lt;file&gt;'. Do not include the name of
  the command in this string.
-	  <DL><DT><B>Returns:</B></DT><DD>the command's usage help</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the command's usage help</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -280,7 +280,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;<a href='../../../../org.springframework.boot.cli.command.status.ExitStatus.html'>ExitStatus</a> <strong>run</strong>(java.lang.String args)</h4>
                                 <p> Run the command.<DL><DT><B>throws:</B></DT><DD>Exception if the command fails</DD></DL>
-	  <DL><DT><B>Parameters:</B></DT><DD><code>args</code> -  command arguments (this will not include the command itself)</DD></DL><DL><DT><B>Returns:</B></DT><DD>the outcome of the command</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>args</code> -  command arguments (this will not include the command itself)</DD></DL><DL><DT><B>Returns:</B></DT><DD>the outcome of the command</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/command/CommandException.Option.html b/snapshot/api/org/grails/cli/command/CommandException.Option.html
index 3a9980a686..80f08a2fb2 100644
--- a/snapshot/api/org/grails/cli/command/CommandException.Option.html
+++ b/snapshot/api/org/grails/cli/command/CommandException.Option.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>public enum CommandException.Option</pre>
 
     <p> Specific options understood by the <a href='../../../../org/grails/cli/command/CommandRunner.html' title='CommandRunner'>CommandRunner</a>.
-	 </p>
+     </p>
 
           </li>
     </ul>
@@ -209,7 +209,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4><a href="../../../../org/grails/cli/command/CommandException.Option.html">CommandException.Option</a> <strong>HIDE_MESSAGE</strong></h4>
                                 <p> Hide the exception message.
-		 </p>
+         </p>
                             </li>
                         </ul>
                     
@@ -218,7 +218,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4><a href="../../../../org/grails/cli/command/CommandException.Option.html">CommandException.Option</a> <strong>RETHROW</strong></h4>
                                 <p> Re-throw the exception rather than dealing with it.
-		 </p>
+         </p>
                             </li>
                         </ul>
                     
@@ -227,7 +227,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4><a href="../../../../org/grails/cli/command/CommandException.Option.html">CommandException.Option</a> <strong>SHOW_USAGE</strong></h4>
                                 <p> Print basic CLI usage information.
-		 </p>
+         </p>
                             </li>
                         </ul>
                     
@@ -236,7 +236,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4><a href="../../../../org/grails/cli/command/CommandException.Option.html">CommandException.Option</a> <strong>STACK_TRACE</strong></h4>
                                 <p> Print the stack-trace of the exception.
-		 </p>
+         </p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/command/CommandException.html b/snapshot/api/org/grails/cli/command/CommandException.html
index b438d5dbae..73ae102b48 100644
--- a/snapshot/api/org/grails/cli/command/CommandException.html
+++ b/snapshot/api/org/grails/cli/command/CommandException.html
@@ -263,7 +263,7 @@ extends java.lang.RuntimeException</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>CommandException</strong>(<a href='../../../../org/grails/cli/command/CommandException.Option.html'>CommandException.Option</a> options)</h4>
                                 <p> Create a new <a href='../../../../org/grails/cli/command/CommandException.html' title='CommandException'>CommandException</a> with the specified options.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>options</code> -  the exception options</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>options</code> -  the exception options</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -272,7 +272,7 @@ extends java.lang.RuntimeException</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>CommandException</strong>(java.lang.String message, <a href='../../../../org/grails/cli/command/CommandException.Option.html'>CommandException.Option</a> options)</h4>
                                 <p> Create a new <a href='../../../../org/grails/cli/command/CommandException.html' title='CommandException'>CommandException</a> with the specified options.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>message</code> -  the exception message to display to the user</DD><DD><code>options</code> -  the exception options</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>message</code> -  the exception message to display to the user</DD><DD><code>options</code> -  the exception options</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -281,7 +281,7 @@ extends java.lang.RuntimeException</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>CommandException</strong>(java.lang.String message, java.lang.Throwable cause, <a href='../../../../org/grails/cli/command/CommandException.Option.html'>CommandException.Option</a> options)</h4>
                                 <p> Create a new <a href='../../../../org/grails/cli/command/CommandException.html' title='CommandException'>CommandException</a> with the specified options.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>message</code> -  the exception message to display to the user</DD><DD><code>cause</code> -  the underlying cause</DD><DD><code>options</code> -  the exception options</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>message</code> -  the exception message to display to the user</DD><DD><code>cause</code> -  the underlying cause</DD><DD><code>options</code> -  the exception options</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -290,7 +290,7 @@ extends java.lang.RuntimeException</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>CommandException</strong>(java.lang.Throwable cause, <a href='../../../../org/grails/cli/command/CommandException.Option.html'>CommandException.Option</a> options)</h4>
                                 <p> Create a new <a href='../../../../org/grails/cli/command/CommandException.html' title='CommandException'>CommandException</a> with the specified options.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>cause</code> -  the underlying cause</DD><DD><code>options</code> -  the exception options</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>cause</code> -  the underlying cause</DD><DD><code>options</code> -  the exception options</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -312,7 +312,7 @@ extends java.lang.RuntimeException</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;java.util.Set&lt;Option&gt; <strong>getOptions</strong>()</h4>
                                 <p> Returns a set of options that are understood by the org.springframework.boot.cli.command.CommandRunner.
-	  <DL><DT><B>Returns:</B></DT><DD>the options understood by the runner</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the options understood by the runner</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/command/CommandFactory.html b/snapshot/api/org/grails/cli/command/CommandFactory.html
index 49f0b17a97..8496358eed 100644
--- a/snapshot/api/org/grails/cli/command/CommandFactory.html
+++ b/snapshot/api/org/grails/cli/command/CommandFactory.html
@@ -188,7 +188,7 @@ public interface CommandFactory</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;java.util.Collection&lt;<a href='../../../../org/grails/cli/command/Command.html' title='Command'>Command</a>&gt; <strong>getCommands</strong>()</h4>
                                 <p> Returns the CLI org.springframework.boot.cli.command.Commands.
-	  <DL><DT><B>Returns:</B></DT><DD>the commands</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the commands</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/command/CommandRunner.html b/snapshot/api/org/grails/cli/command/CommandRunner.html
index 129c9f195d..211888eb5d 100644
--- a/snapshot/api/org/grails/cli/command/CommandRunner.html
+++ b/snapshot/api/org/grails/cli/command/CommandRunner.html
@@ -321,7 +321,7 @@ implements java.lang.Iterable</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>CommandRunner</strong>(java.lang.String name)</h4>
                                 <p> Create a new <a href='../../../../org/grails/cli/command/CommandRunner.html' title='CommandRunner'>CommandRunner</a> instance.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  the name of the runner or <CODE>null</CODE></DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  the name of the runner or <CODE>null</CODE></DD></DL></p>
                             </li>
                         </ul>
                     
@@ -343,7 +343,7 @@ implements java.lang.Iterable</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;void <strong>addCommand</strong>(<a href='../../../../org.springframework.boot.cli.command.Command.html'>Command</a> command)</h4>
                                 <p> Add the specified command.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>command</code> -  the command to add.</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>command</code> -  the command to add.</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -352,7 +352,7 @@ implements java.lang.Iterable</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;void <strong>addCommands</strong>(java.lang.Iterable&lt;org.springframework.boot.cli.command.Command&gt; commands)</h4>
                                 <p> Add the specified commands.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>commands</code> -  the commands to add</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>commands</code> -  the commands to add</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -361,7 +361,7 @@ implements java.lang.Iterable</pre>
                             <li class="blockList">
                                 <h4>protected&nbsp;void <strong>afterRun</strong>(<a href='../../../../org.springframework.boot.cli.command.Command.html'>Command</a> command)</h4>
                                 <p> Subclass hook called after a command has run.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>command</code> -  the command that has run</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>command</code> -  the command that has run</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -370,7 +370,7 @@ implements java.lang.Iterable</pre>
                             <li class="blockList">
                                 <h4>protected&nbsp;void <strong>beforeRun</strong>(<a href='../../../../org.springframework.boot.cli.command.Command.html'>Command</a> command)</h4>
                                 <p> Subclass hook called before a command is run.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>command</code> -  the command about to run</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>command</code> -  the command about to run</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -387,7 +387,7 @@ implements java.lang.Iterable</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<a href='../../../../org.springframework.boot.cli.command.Command.html'>Command</a> <strong>findCommand</strong>(java.lang.String name)</h4>
                                 <p> Find a command by name.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  the name of the command</DD></DL><DL><DT><B>Returns:</B></DT><DD>the command or <CODE>null</CODE> if not found</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  the name of the command</DD></DL><DL><DT><B>Returns:</B></DT><DD>the command or <CODE>null</CODE> if not found</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -405,7 +405,7 @@ implements java.lang.Iterable</pre>
                                 <h4>public&nbsp;java.lang.String <strong>getName</strong>()</h4>
                                 <p> Return the name of the runner or an empty string. Non-empty names will include a
  trailing space character so that they can be used as a prefix.
-	  <DL><DT><B>Returns:</B></DT><DD>the name of the runner</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the name of the runner</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -414,7 +414,7 @@ implements java.lang.Iterable</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>isOptionCommand</strong>(<a href='../../../../org.springframework.boot.cli.command.Command.html'>Command</a> command)</h4>
                                 <p> Returns if the specified command is an option command.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>command</code> -  the command to test</DD></DL><DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if the command is an option command</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setOptionCommands(Class...)'>setOptionCommands(Class...)</a></DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>command</code> -  the command to test</DD></DL><DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if the command is an option command</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setOptionCommands(Class...)'>setOptionCommands(Class...)</a></DD></DL></p>
                             </li>
                         </ul>
                     
@@ -439,7 +439,7 @@ implements java.lang.Iterable</pre>
                             <li class="blockList">
                                 <h4>protected&nbsp;<a href='../../../../org.springframework.boot.cli.command.status.ExitStatus.html'>ExitStatus</a> <strong>run</strong>(java.lang.String args)</h4>
                                 <p> Parse the arguments and run a suitable command.<DL><DT><B>throws:</B></DT><DD>Exception if the command fails</DD></DL>
-	  <DL><DT><B>Parameters:</B></DT><DD><code>args</code> -  the arguments</DD></DL><DL><DT><B>Returns:</B></DT><DD>the outcome of the command</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>args</code> -  the arguments</DD></DL><DL><DT><B>Returns:</B></DT><DD>the outcome of the command</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -448,7 +448,7 @@ implements java.lang.Iterable</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;int <strong>runAndHandleErrors</strong>(java.lang.String args)</h4>
                                 <p> Run the appropriate and handle and errors.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>args</code> -  the input arguments</DD></DL><DL><DT><B>Returns:</B></DT><DD>a return status code (non boot is used to indicate an error)</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>args</code> -  the input arguments</DD></DL><DL><DT><B>Returns:</B></DT><DD>a return status code (non boot is used to indicate an error)</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -458,7 +458,7 @@ implements java.lang.Iterable</pre>
                                 <h4>public&nbsp;void <strong>setHiddenCommands</strong>(java.lang.Class&lt;?&gt; commandClasses)</h4>
                                 <p> Set the command classes which should be hidden (i.e. executed but not displayed in
  the available commands list).
-	  <DL><DT><B>Parameters:</B></DT><DD><code>commandClasses</code> -  the classes of hidden commands</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>commandClasses</code> -  the classes of hidden commands</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -469,7 +469,7 @@ implements java.lang.Iterable</pre>
                                 <p> Set the command classes which should be considered option commands. An option
  command is a special type of command that usually makes more sense to present as if
  it is an option. For example '--version'.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>commandClasses</code> -  the classes of option commands.</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#isOptionCommand(org.springframework.boot.cli.command.Command)'>isOptionCommand(org.springframework.boot.cli.command.Command)</a></DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>commandClasses</code> -  the classes of option commands.</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#isOptionCommand(org.springframework.boot.cli.command.Command)'>isOptionCommand(org.springframework.boot.cli.command.Command)</a></DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/command/HelpExample.html b/snapshot/api/org/grails/cli/command/HelpExample.html
index 77ac957c9e..56148da35e 100644
--- a/snapshot/api/org/grails/cli/command/HelpExample.html
+++ b/snapshot/api/org/grails/cli/command/HelpExample.html
@@ -230,7 +230,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>HelpExample</strong>(java.lang.String description, java.lang.String example)</h4>
                                 <p> Create a new <a href='../../../../org/grails/cli/command/HelpExample.html' title='HelpExample'>HelpExample</a> instance.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>description</code> -  the description (in the form "to ....")</DD><DD><code>example</code> -  the example</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>description</code> -  the description (in the form "to ....")</DD><DD><code>example</code> -  the example</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/command/OptionParsingCommand.html b/snapshot/api/org/grails/cli/command/OptionParsingCommand.html
index d1f9c19949..b2d0c01dae 100644
--- a/snapshot/api/org/grails/cli/command/OptionParsingCommand.html
+++ b/snapshot/api/org/grails/cli/command/OptionParsingCommand.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>public abstract class OptionParsingCommand
 extends <a href='../../../../org/grails/cli/command/AbstractCommand.html'>AbstractCommand</a></pre>
 
-    <p> Base class for a <a href='../../../../org/grails/cli/command/Command.html' title='Command'>Command</a> that parse options using an OptionHandler.
+    <p> Base class for a org.springframework.boot.cli.command.Command that parse options using an OptionHandler.
   <DL><DT><B>Authors:</B></DT><DD>Phillip Webb</DD><DD>Dave Syer</DD></DL><DL><DT><B>Since:</B></DT><DD>1.0.0</DD></DL><DL><DT><B>See Also:</B></DT><DD>OptionHandler</DD></DL></p>
 
           </li>
diff --git a/snapshot/api/org/grails/cli/command/archive/ArchiveCommand.ArchiveOptionHandler.html b/snapshot/api/org/grails/cli/command/archive/ArchiveCommand.ArchiveOptionHandler.html
index 360f1fdd44..0d3284dd3a 100644
--- a/snapshot/api/org/grails/cli/command/archive/ArchiveCommand.ArchiveOptionHandler.html
+++ b/snapshot/api/org/grails/cli/command/archive/ArchiveCommand.ArchiveOptionHandler.html
@@ -105,7 +105,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 extends <a href='../../../../../org/grails/cli/command/options/CompilerOptionHandler.html'>CompilerOptionHandler</a></pre>
 
     <p> Abstract base CompilerOptionHandler for archive commands.
-	 </p>
+     </p>
 
           </li>
     </ul>
diff --git a/snapshot/api/org/grails/cli/command/archive/JarCommand.html b/snapshot/api/org/grails/cli/command/archive/JarCommand.html
index 53eb49b26e..be9afbc665 100644
--- a/snapshot/api/org/grails/cli/command/archive/JarCommand.html
+++ b/snapshot/api/org/grails/cli/command/archive/JarCommand.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>public class JarCommand
 extends <a href='../../../../../org/grails/cli/command/archive/ArchiveCommand.html'>ArchiveCommand</a></pre>
 
-    <p> Command to create a self-contained executable jar file from a CLI application.
+    <p> org.springframework.boot.cli.command.Command to create a self-contained executable jar file from a CLI application.
   <DL><DT><B>Authors:</B></DT><DD>Andy Wilkinson</DD><DD>Phillip Webb</DD></DL><DL><DT><B>Since:</B></DT><DD>1.3.0</DD></DL></p>
 
           </li>
diff --git a/snapshot/api/org/grails/cli/command/archive/ResourceMatcher.MatchedResource.html b/snapshot/api/org/grails/cli/command/archive/ResourceMatcher.MatchedResource.html
index c3af4b80e9..29949ee10a 100644
--- a/snapshot/api/org/grails/cli/command/archive/ResourceMatcher.MatchedResource.html
+++ b/snapshot/api/org/grails/cli/command/archive/ResourceMatcher.MatchedResource.html
@@ -105,7 +105,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 extends java.lang.Object</pre>
 
     <p> A single matched resource.
-	 </p>
+     </p>
 
           </li>
     </ul>
diff --git a/snapshot/api/org/grails/cli/command/archive/WarCommand.html b/snapshot/api/org/grails/cli/command/archive/WarCommand.html
index 8824c0aa5b..82d8705a1d 100644
--- a/snapshot/api/org/grails/cli/command/archive/WarCommand.html
+++ b/snapshot/api/org/grails/cli/command/archive/WarCommand.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>public class WarCommand
 extends <a href='../../../../../org/grails/cli/command/archive/ArchiveCommand.html'>ArchiveCommand</a></pre>
 
-    <p> Command to create a self-contained executable jar file from a CLI application.
+    <p> org.springframework.boot.cli.command.Command to create a self-contained executable jar file from a CLI application.
   <DL><DT><B>Authors:</B></DT><DD>Andrey Stolyarov</DD><DD>Phillip Webb</DD><DD>Henri Kerola</DD></DL><DL><DT><B>Since:</B></DT><DD>1.3.0</DD></DL></p>
 
           </li>
diff --git a/snapshot/api/org/grails/cli/command/archive/package-summary.html b/snapshot/api/org/grails/cli/command/archive/package-summary.html
index 9a680f9fa6..f013c6a032 100644
--- a/snapshot/api/org/grails/cli/command/archive/package-summary.html
+++ b/snapshot/api/org/grails/cli/command/archive/package-summary.html
@@ -102,7 +102,7 @@ function windowTitle()
                                     JarCommand
                                 </a></strong>
                             </td>
-                            <td>Command to create a self-contained executable jar file from a CLI application.</td>
+                            <td>org.springframework.boot.cli.command.Command to create a self-contained executable jar file from a CLI application.</td>
                         </tr>
 <tr class="altColor">
                             <td class="colOne">
@@ -118,7 +118,7 @@ function windowTitle()
                                     WarCommand
                                 </a></strong>
                             </td>
-                            <td>Command to create a self-contained executable jar file from a CLI application.</td>
+                            <td>org.springframework.boot.cli.command.Command to create a self-contained executable jar file from a CLI application.</td>
                         </tr>
 
                     </tbody>
diff --git a/snapshot/api/org/grails/cli/command/grab/GrabCommand.html b/snapshot/api/org/grails/cli/command/grab/GrabCommand.html
index a00ac2c7e2..e054616169 100644
--- a/snapshot/api/org/grails/cli/command/grab/GrabCommand.html
+++ b/snapshot/api/org/grails/cli/command/grab/GrabCommand.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>public class GrabCommand
 extends <a href='../../../../../org/grails/cli/command/OptionParsingCommand.html'>OptionParsingCommand</a></pre>
 
-    <p> Command to grab the dependencies of one or more Groovy scripts.
+    <p> org.springframework.boot.cli.command.Command to grab the dependencies of one or more Groovy scripts.
   <DL><DT><B>Authors:</B></DT><DD>Andy Wilkinson</DD></DL><DL><DT><B>Since:</B></DT><DD>1.0.0</DD></DL></p>
 
           </li>
diff --git a/snapshot/api/org/grails/cli/command/grab/package-summary.html b/snapshot/api/org/grails/cli/command/grab/package-summary.html
index 8a3742b828..759ea7b86a 100644
--- a/snapshot/api/org/grails/cli/command/grab/package-summary.html
+++ b/snapshot/api/org/grails/cli/command/grab/package-summary.html
@@ -94,7 +94,7 @@ function windowTitle()
                                     GrabCommand
                                 </a></strong>
                             </td>
-                            <td>Command to grab the dependencies of one or more Groovy scripts.</td>
+                            <td>org.springframework.boot.cli.command.Command to grab the dependencies of one or more Groovy scripts.</td>
                         </tr>
 
                     </tbody>
diff --git a/snapshot/api/org/grails/cli/command/install/InstallCommand.html b/snapshot/api/org/grails/cli/command/install/InstallCommand.html
index 13a263411d..917266fafb 100644
--- a/snapshot/api/org/grails/cli/command/install/InstallCommand.html
+++ b/snapshot/api/org/grails/cli/command/install/InstallCommand.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>public class InstallCommand
 extends <a href='../../../../../org/grails/cli/command/OptionParsingCommand.html'>OptionParsingCommand</a></pre>
 
-    <p> Command to install additional dependencies into the CLI.
+    <p> org.springframework.boot.cli.command.Command to install additional dependencies into the CLI.
   <DL><DT><B>Authors:</B></DT><DD>Dave Syer</DD><DD>Andy Wilkinson</DD></DL><DL><DT><B>Since:</B></DT><DD>1.2.0</DD></DL></p>
 
           </li>
diff --git a/snapshot/api/org/grails/cli/command/install/UninstallCommand.html b/snapshot/api/org/grails/cli/command/install/UninstallCommand.html
index 8ab913d0f6..53d1554966 100644
--- a/snapshot/api/org/grails/cli/command/install/UninstallCommand.html
+++ b/snapshot/api/org/grails/cli/command/install/UninstallCommand.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>public class UninstallCommand
 extends <a href='../../../../../org/grails/cli/command/OptionParsingCommand.html'>OptionParsingCommand</a></pre>
 
-    <p> Command to uninstall dependencies from the CLI's lib/ext directory.
+    <p> org.springframework.boot.cli.command.Command to uninstall dependencies from the CLI's lib/ext directory.
   <DL><DT><B>Authors:</B></DT><DD>Dave Syer</DD><DD>Andy Wilkinson</DD></DL><DL><DT><B>Since:</B></DT><DD>1.2.0</DD></DL></p>
 
           </li>
diff --git a/snapshot/api/org/grails/cli/command/install/package-summary.html b/snapshot/api/org/grails/cli/command/install/package-summary.html
index 8ee083ba0d..de495c9fde 100644
--- a/snapshot/api/org/grails/cli/command/install/package-summary.html
+++ b/snapshot/api/org/grails/cli/command/install/package-summary.html
@@ -94,7 +94,7 @@ function windowTitle()
                                     InstallCommand
                                 </a></strong>
                             </td>
-                            <td>Command to install additional dependencies into the CLI.</td>
+                            <td>org.springframework.boot.cli.command.Command to install additional dependencies into the CLI.</td>
                         </tr>
 <tr class="altColor">
                             <td class="colOne">
@@ -102,7 +102,7 @@ function windowTitle()
                                     UninstallCommand
                                 </a></strong>
                             </td>
-                            <td>Command to uninstall dependencies from the CLI's lib/ext directory.</td>
+                            <td>org.springframework.boot.cli.command.Command to uninstall dependencies from the CLI's lib/ext directory.</td>
                         </tr>
 
                     </tbody>
diff --git a/snapshot/api/org/grails/cli/command/options/SourceOptions.html b/snapshot/api/org/grails/cli/command/options/SourceOptions.html
index 70ef9333e1..208faac299 100644
--- a/snapshot/api/org/grails/cli/command/options/SourceOptions.html
+++ b/snapshot/api/org/grails/cli/command/options/SourceOptions.html
@@ -252,7 +252,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>SourceOptions</strong>(<a href='../../../../../joptsimple.OptionSet.html'>OptionSet</a> options)</h4>
                                 <p> Create a new <a href='../../../../../org/grails/cli/command/options/SourceOptions.html' title='SourceOptions'>SourceOptions</a> instance.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>options</code> -  the source option set</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>options</code> -  the source option set</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -261,7 +261,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>SourceOptions</strong>(java.util.List&lt;?&gt; arguments)</h4>
                                 <p> Create a new <a href='../../../../../org/grails/cli/command/options/SourceOptions.html' title='SourceOptions'>SourceOptions</a> instance.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>arguments</code> -  the source arguments</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>arguments</code> -  the source arguments</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -274,7 +274,7 @@ extends java.lang.Object</pre>
  paths are tested before use). If default paths are provided and the option set
  contains no source file arguments it is not an error even if none of the default
  paths exist.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>optionSet</code> -  the source option set</DD><DD><code>classLoader</code> -  an optional classloader used to try and load files that are not
+      <DL><DT><B>Parameters:</B></DT><DD><code>optionSet</code> -  the source option set</DD><DD><code>classLoader</code> -  an optional classloader used to try and load files that are not
  found in the local filesystem</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/cli/command/package-summary.html b/snapshot/api/org/grails/cli/command/package-summary.html
index 5947369bc4..01537f6d8f 100644
--- a/snapshot/api/org/grails/cli/command/package-summary.html
+++ b/snapshot/api/org/grails/cli/command/package-summary.html
@@ -152,7 +152,7 @@ function windowTitle()
                                     OptionParsingCommand
                                 </a></strong>
                             </td>
-                            <td>Base class for a <a href='../../../../org/grails/cli/command/Command.html' title='Command'>Command</a> that parse options using an OptionHandler.</td>
+                            <td>Base class for a org.springframework.boot.cli.command.Command that parse options using an OptionHandler.</td>
                         </tr>
 
                     </tbody>
diff --git a/snapshot/api/org/grails/cli/command/run/SpringApplicationRunner.html b/snapshot/api/org/grails/cli/command/run/SpringApplicationRunner.html
index cea98afb95..8a6b7f193f 100644
--- a/snapshot/api/org/grails/cli/command/run/SpringApplicationRunner.html
+++ b/snapshot/api/org/grails/cli/command/run/SpringApplicationRunner.html
@@ -214,7 +214,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;void <strong>compileAndRun</strong>()</h4>
                                 <p> Compile and run the application.<DL><DT><B>throws:</B></DT><DD>Exception on error</DD></DL>
-	  </p>
+      </p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/command/run/SpringApplicationRunnerConfiguration.html b/snapshot/api/org/grails/cli/command/run/SpringApplicationRunnerConfiguration.html
index 6fcfe72c38..d9a6618252 100644
--- a/snapshot/api/org/grails/cli/command/run/SpringApplicationRunnerConfiguration.html
+++ b/snapshot/api/org/grails/cli/command/run/SpringApplicationRunnerConfiguration.html
@@ -216,7 +216,7 @@ extends <a href='../../../../../org/grails/cli/compiler/GroovyCompilerConfigurat
                             <li class="blockList">
                                 <h4>public&nbsp;java.util.logging.Level <strong>getLogLevel</strong>()</h4>
                                 <p> Returns the logging level to use.
-	  <DL><DT><B>Returns:</B></DT><DD>the logging level</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the logging level</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -226,7 +226,7 @@ extends <a href='../../../../../org/grails/cli/compiler/GroovyCompilerConfigurat
                                 <h4>public&nbsp;boolean <strong>isWatchForFileChanges</strong>()</h4>
                                 <p> Returns <CODE>true</CODE> if the source file should be monitored for changes and
  automatically recompiled.
-	  <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if file watching should be performed, otherwise <CODE>false</CODE></DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if file watching should be performed, otherwise <CODE>false</CODE></DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/AstUtils.html b/snapshot/api/org/grails/cli/compiler/AstUtils.html
index 4b4002437a..c0e39deaca 100644
--- a/snapshot/api/org/grails/cli/compiler/AstUtils.html
+++ b/snapshot/api/org/grails/cli/compiler/AstUtils.html
@@ -248,7 +248,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;static&nbsp;org.codehaus.groovy.ast.expr.ClosureExpression <strong>getClosure</strong>(org.codehaus.groovy.ast.stmt.BlockStatement block, java.lang.String name, boolean remove)</h4>
                                 <p> Extract a top-level <CODE>name</CODE> closure from inside this block if there is one,
  optionally removing it from the block at the same time.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>block</code> -  a block statement (class definition)</DD><DD><code>name</code> -  the name to look for</DD><DD><code>remove</code> -  whether the extracted closure should be removed</DD></DL><DL><DT><B>Returns:</B></DT><DD>a beans Closure if one can be found, null otherwise</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>block</code> -  a block statement (class definition)</DD><DD><code>name</code> -  the name to look for</DD><DD><code>remove</code> -  whether the extracted closure should be removed</DD></DL><DL><DT><B>Returns:</B></DT><DD>a beans Closure if one can be found, null otherwise</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -267,7 +267,7 @@ extends java.lang.Object</pre>
                                 <p> Determine if a org.codehaus.groovy.ast.ClassNode has one or more of the specified annotations on
  the class or any of its methods. N.B. the type names are not normally fully
  qualified.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>node</code> -  the class to examine</DD><DD><code>annotations</code> -  the annotations to look for</DD></DL><DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if at least one of the annotations is found, otherwise
+      <DL><DT><B>Parameters:</B></DT><DD><code>node</code> -  the class to examine</DD><DD><code>annotations</code> -  the annotations to look for</DD></DL><DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if at least one of the annotations is found, otherwise
  <CODE>false</CODE></DD></DL></p>
                             </li>
                         </ul>
@@ -278,7 +278,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;static&nbsp;boolean <strong>hasAtLeastOneAnnotation</strong>(org.codehaus.groovy.ast.AnnotatedNode node, java.lang.String annotations)</h4>
                                 <p> Determine if an org.codehaus.groovy.ast.AnnotatedNode has one or more of the specified annotations.
  N.B. the annotation type names are not normally fully qualified.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>node</code> -  the node to examine</DD><DD><code>annotations</code> -  the annotations to look for</DD></DL><DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if at least one of the annotations is found, otherwise
+      <DL><DT><B>Parameters:</B></DT><DD><code>node</code> -  the node to examine</DD><DD><code>annotations</code> -  the annotations to look for</DD></DL><DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if at least one of the annotations is found, otherwise
  <CODE>false</CODE></DD></DL></p>
                             </li>
                         </ul>
@@ -290,7 +290,7 @@ extends java.lang.Object</pre>
                                 <p> Determine if a org.codehaus.groovy.ast.ClassNode has one or more fields of the specified types or
  method returning one or more of the specified types. N.B. the type names are not
  normally fully qualified.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>node</code> -  the class to examine</DD><DD><code>types</code> -  the types to look for</DD></DL><DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if at least one of the types is found, otherwise <CODE>false</CODE></DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>node</code> -  the class to examine</DD><DD><code>types</code> -  the types to look for</DD></DL><DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if at least one of the types is found, otherwise <CODE>false</CODE></DD></DL></p>
                             </li>
                         </ul>
                     
@@ -308,7 +308,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;static&nbsp;boolean <strong>subclasses</strong>(org.codehaus.groovy.ast.ClassNode node, java.lang.String types)</h4>
                                 <p> Determine if a org.codehaus.groovy.ast.ClassNode subclasses any of the specified types N.B. the
  type names are not normally fully qualified.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>node</code> -  the class to examine</DD><DD><code>types</code> -  the types that may have been sub-classed</DD></DL><DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if the class subclasses any of the specified types, otherwise
+      <DL><DT><B>Parameters:</B></DT><DD><code>node</code> -  the class to examine</DD><DD><code>types</code> -  the types that may have been sub-classed</DD></DL><DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if the class subclasses any of the specified types, otherwise
  <CODE>false</CODE></DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/cli/compiler/CompilerAutoConfiguration.html b/snapshot/api/org/grails/cli/compiler/CompilerAutoConfiguration.html
index 1c1fee6f78..c27ae3553b 100644
--- a/snapshot/api/org/grails/cli/compiler/CompilerAutoConfiguration.html
+++ b/snapshot/api/org/grails/cli/compiler/CompilerAutoConfiguration.html
@@ -232,7 +232,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;void <strong>apply</strong>(groovy.lang.GroovyClassLoader loader, <a href='../../../../org/grails/cli/compiler/GroovyCompilerConfiguration.html'>GroovyCompilerConfiguration</a> configuration, org.codehaus.groovy.classgen.GeneratorContext generatorContext, org.codehaus.groovy.control.SourceUnit source, org.codehaus.groovy.ast.ClassNode classNode)</h4>
                                 <p> Apply any additional configuration.<DL><DT><B>throws:</B></DT><DD>CompilationFailedException if the configuration cannot be applied</DD></DL>
-	  <DL><DT><B>Parameters:</B></DT><DD><code>loader</code> -  the class loader being used during compilation</DD><DD><code>configuration</code> -  the compiler configuration</DD><DD><code>generatorContext</code> -  the current context</DD><DD><code>source</code> -  the source unit</DD><DD><code>classNode</code> -  the class</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>loader</code> -  the class loader being used during compilation</DD><DD><code>configuration</code> -  the compiler configuration</DD><DD><code>generatorContext</code> -  the current context</DD><DD><code>source</code> -  the source unit</DD><DD><code>classNode</code> -  the class</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -242,7 +242,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;void <strong>applyDependencies</strong>(<a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html'>DependencyCustomizer</a> dependencies)</h4>
                                 <p> Apply any dependency customizations. This method will only be called if
  <a href='#matches'>matches</a> returns <CODE>true</CODE>.<DL><DT><B>throws:</B></DT><DD>CompilationFailedException if the dependencies cannot be applied</DD></DL>
-	  <DL><DT><B>Parameters:</B></DT><DD><code>dependencies</code> -  dependency customizer</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>dependencies</code> -  dependency customizer</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -252,7 +252,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;void <strong>applyImports</strong>(org.codehaus.groovy.control.customizers.ImportCustomizer imports)</h4>
                                 <p> Apply any import customizations. This method will only be called if
  <a href='#matches'>matches</a> returns <CODE>true</CODE>.<DL><DT><B>throws:</B></DT><DD>CompilationFailedException if the imports cannot be applied</DD></DL>
-	  <DL><DT><B>Parameters:</B></DT><DD><code>imports</code> -  import customizer</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>imports</code> -  import customizer</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -263,7 +263,7 @@ extends java.lang.Object</pre>
                                 <p> Apply any customizations to the main class. This method will only be called if
  <a href='#matches'>matches</a> returns <CODE>true</CODE>. This method is useful when a groovy file
  defines more than one class but customization only applies to the first class.<DL><DT><B>throws:</B></DT><DD>CompilationFailedException if the customizations cannot be applied</DD></DL>
-	  <DL><DT><B>Parameters:</B></DT><DD><code>loader</code> -  the class loader being used during compilation</DD><DD><code>configuration</code> -  the compiler configuration</DD><DD><code>generatorContext</code> -  the current context</DD><DD><code>source</code> -  the source unit</DD><DD><code>classNode</code> -  the main class</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>loader</code> -  the class loader being used during compilation</DD><DD><code>configuration</code> -  the compiler configuration</DD><DD><code>generatorContext</code> -  the current context</DD><DD><code>source</code> -  the source unit</DD><DD><code>classNode</code> -  the main class</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -273,7 +273,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;boolean <strong>matches</strong>(org.codehaus.groovy.ast.ClassNode classNode)</h4>
                                 <p> Strategy method used to determine when compiler auto-configuration should be
  applied. Defaults to always.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>classNode</code> -  the class node</DD></DL><DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if the compiler should be auto-configured using this class. If
+      <DL><DT><B>Parameters:</B></DT><DD><code>classNode</code> -  the class node</DD></DL><DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if the compiler should be auto-configured using this class. If
  this method returns <CODE>false</CODE> no other strategy methods will be called.</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/cli/compiler/DependencyAutoConfigurationTransformation.html b/snapshot/api/org/grails/cli/compiler/DependencyAutoConfigurationTransformation.html
index d888ee6472..1ffcc7d940 100644
--- a/snapshot/api/org/grails/cli/compiler/DependencyAutoConfigurationTransformation.html
+++ b/snapshot/api/org/grails/cli/compiler/DependencyAutoConfigurationTransformation.html
@@ -250,7 +250,7 @@ implements org.codehaus.groovy.transform.ASTTransformation</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;static&nbsp;final&nbsp;int <strong>ORDER</strong></h4>
                                 <p> The order of the transformation.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/DependencyCustomizer.html b/snapshot/api/org/grails/cli/compiler/DependencyCustomizer.html
index 014aafbe84..2f78d00fa3 100644
--- a/snapshot/api/org/grails/cli/compiler/DependencyCustomizer.html
+++ b/snapshot/api/org/grails/cli/compiler/DependencyCustomizer.html
@@ -322,7 +322,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>DependencyCustomizer</strong>(groovy.lang.GroovyClassLoader loader, org.codehaus.groovy.ast.ModuleNode moduleNode, <a href='../../../../org/grails/cli/compiler/grape/DependencyResolutionContext.html'>DependencyResolutionContext</a> dependencyResolutionContext)</h4>
                                 <p> Create a new <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a> instance.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>loader</code> -  the current classloader</DD><DD><code>moduleNode</code> -  the current module</DD><DD><code>dependencyResolutionContext</code> -  the context for dependency resolution</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>loader</code> -  the current classloader</DD><DD><code>moduleNode</code> -  the current module</DD><DD><code>dependencyResolutionContext</code> -  the context for dependency resolution</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -331,7 +331,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>protected&nbsp;<strong>DependencyCustomizer</strong>(<a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html'>DependencyCustomizer</a> parent)</h4>
                                 <p> Create a new nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a>.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>parent</code> -  the parent customizer</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>parent</code> -  the parent customizer</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -355,7 +355,7 @@ extends java.lang.Object</pre>
                                 <p> Add dependencies and all of their dependencies. The group ID and version of the
  dependencies are resolved from the modules using the customizer's
  <a href='../../../../org/grails/cli/compiler/dependencies/ArtifactCoordinatesResolver.html' title='ArtifactCoordinatesResolver'>ArtifactCoordinatesResolver</a>.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>modules</code> -  the module IDs</DD></DL><DL><DT><B>Returns:</B></DT><DD>this <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a> for continued use</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>modules</code> -  the module IDs</DD></DL><DL><DT><B>Returns:</B></DT><DD>this <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a> for continued use</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -366,7 +366,7 @@ extends java.lang.Object</pre>
                                 <p> Add a single dependency and, optionally, all of its dependencies. The group ID and
  version of the dependency are resolved from the module using the customizer's
  <a href='../../../../org/grails/cli/compiler/dependencies/ArtifactCoordinatesResolver.html' title='ArtifactCoordinatesResolver'>ArtifactCoordinatesResolver</a>.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>module</code> -  the module ID</DD><DD><code>transitive</code> -  <CODE>true</CODE> if the transitive dependencies should also be added,
+      <DL><DT><B>Parameters:</B></DT><DD><code>module</code> -  the module ID</DD><DD><code>transitive</code> -  <CODE>true</CODE> if the transitive dependencies should also be added,
  otherwise <CODE>false</CODE></DD></DL><DL><DT><B>Returns:</B></DT><DD>this <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a> for continued use</DD></DL></p>
                             </li>
                         </ul>
@@ -378,7 +378,7 @@ extends java.lang.Object</pre>
                                 <p> Add a single dependency with the specified classifier and type and, optionally, all
  of its dependencies. The group ID and version of the dependency are resolved from
  the module by using the customizer's <a href='../../../../org/grails/cli/compiler/dependencies/ArtifactCoordinatesResolver.html' title='ArtifactCoordinatesResolver'>ArtifactCoordinatesResolver</a>.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>module</code> -  the module ID</DD><DD><code>classifier</code> -  the classifier, may be <CODE>null</CODE></DD><DD><code>type</code> -  the type, may be <CODE>null</CODE></DD><DD><code>transitive</code> -  <CODE>true</CODE> if the transitive dependencies should also be added,
+      <DL><DT><B>Parameters:</B></DT><DD><code>module</code> -  the module ID</DD><DD><code>classifier</code> -  the classifier, may be <CODE>null</CODE></DD><DD><code>type</code> -  the type, may be <CODE>null</CODE></DD><DD><code>transitive</code> -  <CODE>true</CODE> if the transitive dependencies should also be added,
  otherwise <CODE>false</CODE></DD></DL><DL><DT><B>Returns:</B></DT><DD>this <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a> for continued use</DD></DL></p>
                             </li>
                         </ul>
@@ -421,7 +421,7 @@ extends java.lang.Object</pre>
                                 <h4>protected&nbsp;boolean <strong>canAdd</strong>()</h4>
                                 <p> Strategy called to test if dependencies can be added. Subclasses override as
  required. Returns <CODE>true</CODE> by default.
-	  <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if dependencies can be added, otherwise <CODE>false</CODE></DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if dependencies can be added, otherwise <CODE>false</CODE></DD></DL></p>
                             </li>
                         </ul>
                     
@@ -430,7 +430,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<a href='../../../../org/grails/cli/compiler/grape/DependencyResolutionContext.html'>DependencyResolutionContext</a> <strong>getDependencyResolutionContext</strong>()</h4>
                                 <p> Returns the <a href='../../../../org/grails/cli/compiler/grape/DependencyResolutionContext.html' title='DependencyResolutionContext'>DependencyResolutionContext</a>.
-	  <DL><DT><B>Returns:</B></DT><DD>the dependency resolution context</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the dependency resolution context</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -456,7 +456,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;<a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html'>DependencyCustomizer</a> <strong>ifAllMissingClasses</strong>(java.lang.String classNames)</h4>
                                 <p> Create a nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a> that only applies if all the specified
  class names are not on the class path.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>classNames</code> -  the class names to test</DD></DL><DL><DT><B>Returns:</B></DT><DD>a nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a></DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>classNames</code> -  the class names to test</DD></DL><DL><DT><B>Returns:</B></DT><DD>a nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a></DD></DL></p>
                             </li>
                         </ul>
                     
@@ -466,7 +466,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;<a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html'>DependencyCustomizer</a> <strong>ifAllResourcesPresent</strong>(java.lang.String paths)</h4>
                                 <p> Create a nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a> that only applies if the specified
  paths are on the class path.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>paths</code> -  the paths to test</DD></DL><DL><DT><B>Returns:</B></DT><DD>a nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a></DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>paths</code> -  the paths to test</DD></DL><DL><DT><B>Returns:</B></DT><DD>a nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a></DD></DL></p>
                             </li>
                         </ul>
                     
@@ -476,7 +476,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;<a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html'>DependencyCustomizer</a> <strong>ifAnyMissingClasses</strong>(java.lang.String classNames)</h4>
                                 <p> Create a nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a> that only applies if any of the
  specified class names are not on the class path.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>classNames</code> -  the class names to test</DD></DL><DL><DT><B>Returns:</B></DT><DD>a nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a></DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>classNames</code> -  the class names to test</DD></DL><DL><DT><B>Returns:</B></DT><DD>a nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a></DD></DL></p>
                             </li>
                         </ul>
                     
@@ -486,7 +486,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;<a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html'>DependencyCustomizer</a> <strong>ifAnyResourcesPresent</strong>(java.lang.String paths)</h4>
                                 <p> Create a nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a> that only applies at least one of the
  specified paths is on the class path.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>paths</code> -  the paths to test</DD></DL><DL><DT><B>Returns:</B></DT><DD>a nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a></DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>paths</code> -  the paths to test</DD></DL><DL><DT><B>Returns:</B></DT><DD>a nested <a href='../../../../org/grails/cli/compiler/DependencyCustomizer.html' title='DependencyCustomizer'>DependencyCustomizer</a></DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/DependencyManagementBomTransformation.html b/snapshot/api/org/grails/cli/compiler/DependencyManagementBomTransformation.html
index 5fbaf55ff2..d5f80621e6 100644
--- a/snapshot/api/org/grails/cli/compiler/DependencyManagementBomTransformation.html
+++ b/snapshot/api/org/grails/cli/compiler/DependencyManagementBomTransformation.html
@@ -245,7 +245,7 @@ extends <a href='../../../../org/grails/cli/compiler/AnnotatedNodeASTTransformat
                             <li class="blockList">
                                 <h4>public&nbsp;static&nbsp;final&nbsp;int <strong>ORDER</strong></h4>
                                 <p> The order of the transformation.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/ExtendedGroovyClassLoader.ExtendedClassCollector.html b/snapshot/api/org/grails/cli/compiler/ExtendedGroovyClassLoader.ExtendedClassCollector.html
index 80efdc179e..b835000c80 100644
--- a/snapshot/api/org/grails/cli/compiler/ExtendedGroovyClassLoader.ExtendedClassCollector.html
+++ b/snapshot/api/org/grails/cli/compiler/ExtendedGroovyClassLoader.ExtendedClassCollector.html
@@ -105,7 +105,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 extends <a href='../../../../ClassCollector.html'>ClassCollector</a></pre>
 
     <p> Inner collector class used to track as classes are added.
-	 </p>
+     </p>
 
           </li>
     </ul>
diff --git a/snapshot/api/org/grails/cli/compiler/GenericBomAstTransformation.html b/snapshot/api/org/grails/cli/compiler/GenericBomAstTransformation.html
index f0e6193c3d..81ae0a0deb 100644
--- a/snapshot/api/org/grails/cli/compiler/GenericBomAstTransformation.html
+++ b/snapshot/api/org/grails/cli/compiler/GenericBomAstTransformation.html
@@ -227,7 +227,7 @@ implements <a href='../../../../org.springframework.core.Ordered.html'>Ordered</
                                 <h4>protected&nbsp;abstract&nbsp;java.lang.String <strong>getBomModule</strong>()</h4>
                                 <p> The bom to be added to dependency management in compact form:
  <CODE>"&lt;groupId&gt;:&lt;artifactId&gt;:&lt;version&gt;"</CODE> (like in a <CODE>@Grab</CODE>).
-	  <DL><DT><B>Returns:</B></DT><DD>the maven co-ordinates of the BOM to add</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the maven co-ordinates of the BOM to add</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/GroovyBeansTransformation.html b/snapshot/api/org/grails/cli/compiler/GroovyBeansTransformation.html
index 7369d62735..1daeda4fb3 100644
--- a/snapshot/api/org/grails/cli/compiler/GroovyBeansTransformation.html
+++ b/snapshot/api/org/grails/cli/compiler/GroovyBeansTransformation.html
@@ -231,7 +231,7 @@ implements org.codehaus.groovy.transform.ASTTransformation</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;static&nbsp;final&nbsp;int <strong>ORDER</strong></h4>
                                 <p> The order of the transformation.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/GroovyCompiler.html b/snapshot/api/org/grails/cli/compiler/GroovyCompiler.html
index dcca30faee..cf282c739c 100644
--- a/snapshot/api/org/grails/cli/compiler/GroovyCompiler.html
+++ b/snapshot/api/org/grails/cli/compiler/GroovyCompiler.html
@@ -264,7 +264,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>GroovyCompiler</strong>(<a href='../../../../org/grails/cli/compiler/GroovyCompilerConfiguration.html'>GroovyCompilerConfiguration</a> configuration)</h4>
                                 <p> Create a new <a href='../../../../org/grails/cli/compiler/GroovyCompiler.html' title='GroovyCompiler'>GroovyCompiler</a> instance.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>configuration</code> -  the compiler configuration</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>configuration</code> -  the compiler configuration</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -304,7 +304,7 @@ extends java.lang.Object</pre>
                                 <p> Compile the specified Groovy sources, applying any
  <a href='../../../../org/grails/cli/compiler/CompilerAutoConfiguration.html' title='CompilerAutoConfiguration'>CompilerAutoConfiguration</a>s. All classes defined in the sources will be
  returned from this method.<DL><DT><B>throws:</B></DT><DD>CompilationFailedException in case of compilation failures</DD></DL><DL><DT><B>throws:</B></DT><DD>IOException in case of I/O errors</DD></DL><DL><DT><B>throws:</B></DT><DD>CompilationFailedException in case of compilation errors</DD></DL>
-	  <DL><DT><B>Parameters:</B></DT><DD><code>sources</code> -  the sources to compile</DD></DL><DL><DT><B>Returns:</B></DT><DD>compiled classes</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>sources</code> -  the sources to compile</DD></DL><DL><DT><B>Returns:</B></DT><DD>compiled classes</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -314,7 +314,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;java.util.List&lt;org.codehaus.groovy.transform.ASTTransformation&gt; <strong>getAstTransformations</strong>()</h4>
                                 <p> Return a mutable list of the org.codehaus.groovy.transform.ASTTransformations to be applied during
  <a href='#compile(String...)'>compile(String...)</a>.
-	  <DL><DT><B>Returns:</B></DT><DD>the AST transformations to apply</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the AST transformations to apply</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/GroovyCompilerConfiguration.html b/snapshot/api/org/grails/cli/compiler/GroovyCompilerConfiguration.html
index 5588e0eb6b..f3b72c5f16 100644
--- a/snapshot/api/org/grails/cli/compiler/GroovyCompilerConfiguration.html
+++ b/snapshot/api/org/grails/cli/compiler/GroovyCompilerConfiguration.html
@@ -223,7 +223,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.String[] <strong>getClasspath</strong>()</h4>
                                 <p> Returns the classpath for local resources.
-	  <DL><DT><B>Returns:</B></DT><DD>a path for local resources</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>a path for local resources</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -233,7 +233,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                                 <h4>public&nbsp;java.util.List&lt;<a href='../../../../org/grails/cli/compiler/grape/RepositoryConfiguration.html' title='RepositoryConfiguration'>RepositoryConfiguration</a>&gt; <strong>getRepositoryConfiguration</strong>()</h4>
                                 <p> Returns the configuration for the repositories that will be used by the compiler to
  resolve dependencies.
-	  <DL><DT><B>Returns:</B></DT><DD>the repository configurations</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the repository configurations</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -242,7 +242,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;<a href='../../../../org/grails/cli/compiler/GroovyCompilerScope.html'>GroovyCompilerScope</a> <strong>getScope</strong>()</h4>
                                 <p> Returns the scope in which the compiler operates.
-	  <DL><DT><B>Returns:</B></DT><DD>the scope of the compiler</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the scope of the compiler</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -251,7 +251,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>isAutoconfigure</strong>()</h4>
                                 <p> Returns true if auto-configuration transformations should be applied.
-	  <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if auto-configuration transformations should be applied,
+      <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if auto-configuration transformations should be applied,
  otherwise <CODE>false</CODE></DD></DL></p>
                             </li>
                         </ul>
@@ -261,7 +261,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>isGuessDependencies</strong>()</h4>
                                 <p> Returns if jar dependencies should be guessed.
-	  <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if dependencies should be guessed, otherwise <CODE>false</CODE></DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if dependencies should be guessed, otherwise <CODE>false</CODE></DD></DL></p>
                             </li>
                         </ul>
                     
@@ -270,7 +270,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>isGuessImports</strong>()</h4>
                                 <p> Returns if import declarations should be guessed.
-	  <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if imports should be guessed, otherwise <CODE>false</CODE></DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if imports should be guessed, otherwise <CODE>false</CODE></DD></DL></p>
                             </li>
                         </ul>
                     
@@ -279,7 +279,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>isQuiet</strong>()</h4>
                                 <p> Returns if running in quiet mode.
-	  <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if running in quiet mode</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if running in quiet mode</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/GroovyCompilerScope.html b/snapshot/api/org/grails/cli/compiler/GroovyCompilerScope.html
index 85c03ff926..049cc2e06f 100644
--- a/snapshot/api/org/grails/cli/compiler/GroovyCompilerScope.html
+++ b/snapshot/api/org/grails/cli/compiler/GroovyCompilerScope.html
@@ -201,7 +201,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                                 <h4><a href="../../../../org/grails/cli/compiler/GroovyCompilerScope.html">GroovyCompilerScope</a> <strong>DEFAULT</strong></h4>
                                 <p> Default scope, exposes groovy.jar (loaded from the parent) and the shared cli
  package (loaded through groovy classloader).
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
@@ -210,7 +210,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4><a href="../../../../org/grails/cli/compiler/GroovyCompilerScope.html">GroovyCompilerScope</a> <strong>EXTENSION</strong></h4>
                                 <p> Extension scope, allows full access to internal CLI classes.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/RepositoryConfigurationFactory.html b/snapshot/api/org/grails/cli/compiler/RepositoryConfigurationFactory.html
index ee76064546..9959e59e22 100644
--- a/snapshot/api/org/grails/cli/compiler/RepositoryConfigurationFactory.html
+++ b/snapshot/api/org/grails/cli/compiler/RepositoryConfigurationFactory.html
@@ -206,7 +206,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;static&nbsp;java.util.List&lt;<a href='../../../../org/grails/cli/compiler/grape/RepositoryConfiguration.html' title='RepositoryConfiguration'>RepositoryConfiguration</a>&gt; <strong>createDefaultRepositoryConfiguration</strong>()</h4>
                                 <p> Create a new default repository configuration.
-	  <DL><DT><B>Returns:</B></DT><DD>the newly-created default repository configuration</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the newly-created default repository configuration</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/ResolveDependencyCoordinatesTransformation.html b/snapshot/api/org/grails/cli/compiler/ResolveDependencyCoordinatesTransformation.html
index 1a807f45c8..0bd43b0fcc 100644
--- a/snapshot/api/org/grails/cli/compiler/ResolveDependencyCoordinatesTransformation.html
+++ b/snapshot/api/org/grails/cli/compiler/ResolveDependencyCoordinatesTransformation.html
@@ -105,7 +105,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 public class ResolveDependencyCoordinatesTransformation
 extends <a href='../../../../org/grails/cli/compiler/AnnotatedNodeASTTransformation.html'>AnnotatedNodeASTTransformation</a></pre>
 
-    <p> org.codehaus.groovy.transform.ASTTransformation to resolve groovy.lang.Grab artifact coordinates.
+    <p> import to resolve groovy.lang.Grab artifact coordinates.
   <DL><DT><B>Authors:</B></DT><DD>Andy Wilkinson</DD><DD>Phillip Webb</DD></DL><DL><DT><B>Since:</B></DT><DD>1.0.0</DD></DL></p>
 
           </li>
@@ -243,7 +243,7 @@ extends <a href='../../../../org/grails/cli/compiler/AnnotatedNodeASTTransformat
                             <li class="blockList">
                                 <h4>public&nbsp;static&nbsp;final&nbsp;int <strong>ORDER</strong></h4>
                                 <p> The order of the transformation.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/dependencies/ArtifactCoordinatesResolver.html b/snapshot/api/org/grails/cli/compiler/dependencies/ArtifactCoordinatesResolver.html
index d799c341ca..af88566d52 100644
--- a/snapshot/api/org/grails/cli/compiler/dependencies/ArtifactCoordinatesResolver.html
+++ b/snapshot/api/org/grails/cli/compiler/dependencies/ArtifactCoordinatesResolver.html
@@ -205,7 +205,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                                 <h4>public&nbsp;java.lang.String <strong>getArtifactId</strong>(java.lang.String module)</h4>
                                 <p> Gets the artifact id of the artifact identified by the given <CODE>module</CODE>.
  Returns <CODE>null</CODE> if the artifact is unknown to the resolver.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>module</code> -  the id of the module</DD></DL><DL><DT><B>Returns:</B></DT><DD>the artifact id of the module</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>module</code> -  the id of the module</DD></DL><DL><DT><B>Returns:</B></DT><DD>the artifact id of the module</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -215,7 +215,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                                 <h4>public&nbsp;java.lang.String <strong>getGroupId</strong>(java.lang.String module)</h4>
                                 <p> Gets the group id of the artifact identified by the given <CODE>module</CODE>. Returns
  <CODE>null</CODE> if the artifact is unknown to the resolver.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>module</code> -  the id of the module</DD></DL><DL><DT><B>Returns:</B></DT><DD>the group id of the module</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>module</code> -  the id of the module</DD></DL><DL><DT><B>Returns:</B></DT><DD>the group id of the module</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -225,7 +225,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                                 <h4>public&nbsp;java.lang.String <strong>getVersion</strong>(java.lang.String module)</h4>
                                 <p> Gets the version of the artifact identified by the given <CODE>module</CODE>. Returns
  <CODE>null</CODE> if the artifact is unknown to the resolver.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>module</code> -  the id of the module</DD></DL><DL><DT><B>Returns:</B></DT><DD>the version of the module</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>module</code> -  the id of the module</DD></DL><DL><DT><B>Returns:</B></DT><DD>the version of the module</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/dependencies/Dependency.Exclusion.html b/snapshot/api/org/grails/cli/compiler/dependencies/Dependency.Exclusion.html
index cb8f9b4177..f0b7eef6d9 100644
--- a/snapshot/api/org/grails/cli/compiler/dependencies/Dependency.Exclusion.html
+++ b/snapshot/api/org/grails/cli/compiler/dependencies/Dependency.Exclusion.html
@@ -105,7 +105,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 extends java.lang.Object</pre>
 
     <p> A dependency exclusion.
-	 </p>
+     </p>
 
           </li>
     </ul>
@@ -238,7 +238,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.String <strong>getArtifactId</strong>()</h4>
                                 <p> Return the exclusion artifact ID.
-		  <DL><DT><B>Returns:</B></DT><DD>the exclusion artifact ID</DD></DL></p>
+          <DL><DT><B>Returns:</B></DT><DD>the exclusion artifact ID</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -247,7 +247,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.String <strong>getGroupId</strong>()</h4>
                                 <p> Return the exclusion group ID.
-		  <DL><DT><B>Returns:</B></DT><DD>the exclusion group ID</DD></DL></p>
+          <DL><DT><B>Returns:</B></DT><DD>the exclusion group ID</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/dependencies/Dependency.html b/snapshot/api/org/grails/cli/compiler/dependencies/Dependency.html
index 99bc45dae3..c779435849 100644
--- a/snapshot/api/org/grails/cli/compiler/dependencies/Dependency.html
+++ b/snapshot/api/org/grails/cli/compiler/dependencies/Dependency.html
@@ -288,7 +288,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>Dependency</strong>(java.lang.String groupId, java.lang.String artifactId, java.lang.String version)</h4>
                                 <p> Create a new <a href='../../../../../org/grails/cli/compiler/dependencies/Dependency.html' title='Dependency'>Dependency</a> instance.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>groupId</code> -  the group ID</DD><DD><code>artifactId</code> -  the artifact ID</DD><DD><code>version</code> -  the version</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>groupId</code> -  the group ID</DD><DD><code>artifactId</code> -  the artifact ID</DD><DD><code>version</code> -  the version</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -297,7 +297,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>Dependency</strong>(java.lang.String groupId, java.lang.String artifactId, java.lang.String version, java.util.List&lt;Exclusion&gt; exclusions)</h4>
                                 <p> Create a new <a href='../../../../../org/grails/cli/compiler/dependencies/Dependency.html' title='Dependency'>Dependency</a> instance.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>groupId</code> -  the group ID</DD><DD><code>artifactId</code> -  the artifact ID</DD><DD><code>version</code> -  the version</DD><DD><code>exclusions</code> -  the exclusions</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>groupId</code> -  the group ID</DD><DD><code>artifactId</code> -  the artifact ID</DD><DD><code>version</code> -  the version</DD><DD><code>exclusions</code> -  the exclusions</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -327,7 +327,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.String <strong>getArtifactId</strong>()</h4>
                                 <p> Return the dependency artifact id.
-	  <DL><DT><B>Returns:</B></DT><DD>the artifact ID</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the artifact ID</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -336,7 +336,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;java.util.List&lt;Exclusion&gt; <strong>getExclusions</strong>()</h4>
                                 <p> Return the dependency exclusions.
-	  <DL><DT><B>Returns:</B></DT><DD>the exclusions</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the exclusions</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -345,7 +345,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.String <strong>getGroupId</strong>()</h4>
                                 <p> Return the dependency group id.
-	  <DL><DT><B>Returns:</B></DT><DD>the group ID</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the group ID</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -354,7 +354,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.String <strong>getVersion</strong>()</h4>
                                 <p> Return the dependency version.
-	  <DL><DT><B>Returns:</B></DT><DD>the version</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the version</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/dependencies/DependencyManagement.html b/snapshot/api/org/grails/cli/compiler/dependencies/DependencyManagement.html
index a86c96a0de..fe3aaf8234 100644
--- a/snapshot/api/org/grails/cli/compiler/dependencies/DependencyManagement.html
+++ b/snapshot/api/org/grails/cli/compiler/dependencies/DependencyManagement.html
@@ -198,7 +198,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;<a href='../../../../../org/grails/cli/compiler/dependencies/Dependency.html'>Dependency</a> <strong>find</strong>(java.lang.String artifactId)</h4>
                                 <p> Finds the managed dependency with the given <CODE>artifactId</CODE>.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>artifactId</code> -  the artifact ID of the dependency to find</DD></DL><DL><DT><B>Returns:</B></DT><DD>the dependency, or <CODE>null</CODE></DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>artifactId</code> -  the artifact ID of the dependency to find</DD></DL><DL><DT><B>Returns:</B></DT><DD>the dependency, or <CODE>null</CODE></DD></DL></p>
                             </li>
                         </ul>
                     
@@ -207,7 +207,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;java.util.List&lt;<a href='../../../../../org/grails/cli/compiler/dependencies/Dependency.html' title='Dependency'>Dependency</a>&gt; <strong>getDependencies</strong>()</h4>
                                 <p> Returns the managed dependencies.
-	  <DL><DT><B>Returns:</B></DT><DD>the managed dependencies</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the managed dependencies</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -216,7 +216,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.String <strong>getSpringBootVersion</strong>()</h4>
                                 <p> Returns the managed version of Spring Boot. May be <CODE>null</CODE>.
-	  <DL><DT><B>Returns:</B></DT><DD>the Spring Boot version, or <CODE>null</CODE></DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the Spring Boot version, or <CODE>null</CODE></DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/grape/DependencyResolutionFailedException.html b/snapshot/api/org/grails/cli/compiler/grape/DependencyResolutionFailedException.html
index 364bc1ef09..3b6cba65a6 100644
--- a/snapshot/api/org/grails/cli/compiler/grape/DependencyResolutionFailedException.html
+++ b/snapshot/api/org/grails/cli/compiler/grape/DependencyResolutionFailedException.html
@@ -206,7 +206,7 @@ extends java.lang.RuntimeException</pre>
                                 <h4>public&nbsp;<strong>DependencyResolutionFailedException</strong>(java.lang.Throwable cause)</h4>
                                 <p> Creates a new <CODE>DependencyResolutionFailedException</CODE> with the given
  <CODE>cause</CODE>.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>cause</code> -  the cause of the resolution failure</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>cause</code> -  the cause of the resolution failure</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/grape/RepositoryConfiguration.html b/snapshot/api/org/grails/cli/compiler/grape/RepositoryConfiguration.html
index 8799990294..31de0b64be 100644
--- a/snapshot/api/org/grails/cli/compiler/grape/RepositoryConfiguration.html
+++ b/snapshot/api/org/grails/cli/compiler/grape/RepositoryConfiguration.html
@@ -254,7 +254,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>RepositoryConfiguration</strong>(java.lang.String name, java.net.URI uri, boolean snapshotsEnabled)</h4>
                                 <p> Creates a new <CODE>RepositoryConfiguration</CODE> instance.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  the name of the repository</DD><DD><code>uri</code> -  the uri of the repository</DD><DD><code>snapshotsEnabled</code> -  <CODE>true</CODE> if the repository should enable access to
+      <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  the name of the repository</DD><DD><code>uri</code> -  the uri of the repository</DD><DD><code>snapshotsEnabled</code> -  <CODE>true</CODE> if the repository should enable access to
  snapshots, <CODE>false</CODE> otherwise</DD></DL></p>
                             </li>
                         </ul>
@@ -285,7 +285,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.String <strong>getName</strong>()</h4>
                                 <p> Return the name of the repository.
-	  <DL><DT><B>Returns:</B></DT><DD>the repository name</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the repository name</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -294,7 +294,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>getSnapshotsEnabled</strong>()</h4>
                                 <p> Return if the repository should enable access to snapshots.
-	  <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if snapshot access is enabled</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD><CODE>true</CODE> if snapshot access is enabled</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -303,7 +303,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;java.net.URI <strong>getUri</strong>()</h4>
                                 <p> Return the URI of the repository.
-	  <DL><DT><B>Returns:</B></DT><DD>the repository URI</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the repository URI</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/grape/RepositorySystemSessionAutoConfiguration.html b/snapshot/api/org/grails/cli/compiler/grape/RepositorySystemSessionAutoConfiguration.html
index 806e4d414d..7b0b289b65 100644
--- a/snapshot/api/org/grails/cli/compiler/grape/RepositorySystemSessionAutoConfiguration.html
+++ b/snapshot/api/org/grails/cli/compiler/grape/RepositorySystemSessionAutoConfiguration.html
@@ -188,7 +188,7 @@ public interface RepositorySystemSessionAutoConfiguration</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;void <strong>apply</strong>(<a href='../../../../../org.eclipse.aether.DefaultRepositorySystemSession.html'>DefaultRepositorySystemSession</a> session, <a href='../../../../../org.eclipse.aether.RepositorySystem.html'>RepositorySystem</a> repositorySystem)</h4>
                                 <p> Apply the configuration.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the repository system session</DD><DD><code>repositorySystem</code> -  the repository system</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the repository system session</DD><DD><code>repositorySystem</code> -  the repository system</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/maven/MavenSettings.html b/snapshot/api/org/grails/cli/compiler/maven/MavenSettings.html
index 18c3fb6f05..1bb794fa12 100644
--- a/snapshot/api/org/grails/cli/compiler/maven/MavenSettings.html
+++ b/snapshot/api/org/grails/cli/compiler/maven/MavenSettings.html
@@ -254,7 +254,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>MavenSettings</strong>(<a href='../../../../../org.apache.maven.settings.Settings.html'>Settings</a> settings, <a href='../../../../../org.apache.maven.settings.crypto.SettingsDecryptionResult.html'>SettingsDecryptionResult</a> decryptedSettings)</h4>
                                 <p> Create a new <a href='../../../../../org/grails/cli/compiler/maven/MavenSettings.html' title='MavenSettings'>MavenSettings</a> instance.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>settings</code> -  the source settings</DD><DD><code>decryptedSettings</code> -  the decrypted settings</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>settings</code> -  the source settings</DD><DD><code>decryptedSettings</code> -  the decrypted settings</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/compiler/package-summary.html b/snapshot/api/org/grails/cli/compiler/package-summary.html
index aeca387d83..974a07427c 100644
--- a/snapshot/api/org/grails/cli/compiler/package-summary.html
+++ b/snapshot/api/org/grails/cli/compiler/package-summary.html
@@ -244,7 +244,7 @@ function windowTitle()
                                     ResolveDependencyCoordinatesTransformation
                                 </a></strong>
                             </td>
-                            <td>org.codehaus.groovy.transform.ASTTransformation to resolve groovy.lang.Grab artifact coordinates.</td>
+                            <td>import to resolve groovy.lang.Grab artifact coordinates.</td>
                         </tr>
 
                     </tbody>
diff --git a/snapshot/api/org/grails/cli/gradle/GradleUtil.html b/snapshot/api/org/grails/cli/gradle/GradleUtil.html
index e0e245869a..497e0b7fc9 100644
--- a/snapshot/api/org/grails/cli/gradle/GradleUtil.html
+++ b/snapshot/api/org/grails/cli/gradle/GradleUtil.html
@@ -307,7 +307,7 @@ extends java.lang.Object</pre>
                         <a name="runBuildActionWithConsoleOutput(org.grails.cli.profile.ProjectContext, BuildAction, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; static&nbsp;T <strong>runBuildActionWithConsoleOutput</strong>(<a href='../../../../org/grails/cli/profile/ProjectContext.html'>ProjectContext</a> context, BuildAction&lt;T&gt; buildAction, @groovy.transform.stc.ClosureParams(value: FromString.class, options: org.gradle.tooling.BuildActionExecuter<T>)<br>groovy.lang.Closure&lt;?&gt; buildActionExecuterCustomizationClosure)</h4>
+                                <h4>&lt;T&gt; static&nbsp;T <strong>runBuildActionWithConsoleOutput</strong>(<a href='../../../../org/grails/cli/profile/ProjectContext.html'>ProjectContext</a> context, BuildAction&lt;T&gt; buildAction, @groovy.transform.stc.ClosureParams(value: FromString, options: org.gradle.tooling.BuildActionExecuter<T>)<br>groovy.lang.Closure&lt;?&gt; buildActionExecuterCustomizationClosure)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -323,7 +323,7 @@ extends java.lang.Object</pre>
                         <a name="runBuildActionWithConsoleOutput(org.gradle.tooling.ProjectConnection, org.grails.cli.profile.ProjectContext, BuildAction, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; static&nbsp;T <strong>runBuildActionWithConsoleOutput</strong>(<a href='../../../../org.gradle.tooling.ProjectConnection.html'>ProjectConnection</a> connection, <a href='../../../../org/grails/cli/profile/ProjectContext.html'>ProjectContext</a> context, BuildAction&lt;T&gt; buildAction, @groovy.transform.stc.ClosureParams(value: FromString.class, options: org.gradle.tooling.BuildActionExecuter<T>)<br>groovy.lang.Closure&lt;?&gt; buildActionEx [...]
+                                <h4>&lt;T&gt; static&nbsp;T <strong>runBuildActionWithConsoleOutput</strong>(<a href='../../../../org.gradle.tooling.ProjectConnection.html'>ProjectConnection</a> connection, <a href='../../../../org/grails/cli/profile/ProjectContext.html'>ProjectContext</a> context, BuildAction&lt;T&gt; buildAction, @groovy.transform.stc.ClosureParams(value: FromString, options: org.gradle.tooling.BuildActionExecuter<T>)<br>groovy.lang.Closure&lt;?&gt; buildActionExecuter [...]
                                 <p></p>
                             </li>
                         </ul>
@@ -331,7 +331,7 @@ extends java.lang.Object</pre>
                         <a name="runBuildWithConsoleOutput(org.grails.cli.profile.ExecutionContext, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;void <strong>runBuildWithConsoleOutput</strong>(<a href='../../../../org/grails/cli/profile/ExecutionContext.html'>ExecutionContext</a> context, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.gradle.tooling.BuildLauncher)<br>groovy.lang.Closure&lt;?&gt; buildLauncherCustomizationClosure)</h4>
+                                <h4>static&nbsp;void <strong>runBuildWithConsoleOutput</strong>(<a href='../../../../org/grails/cli/profile/ExecutionContext.html'>ExecutionContext</a> context, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.gradle.tooling.BuildLauncher)<br>groovy.lang.Closure&lt;?&gt; buildLauncherCustomizationClosure)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -355,7 +355,7 @@ extends java.lang.Object</pre>
                         <a name="withProjectConnection(java.io.File, boolean, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; static&nbsp;T <strong>withProjectConnection</strong>(java.io.File baseDir, boolean suppressOutput, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.gradle.tooling.ProjectConnection)<br>groovy.lang.Closure&lt;T&gt; closure)</h4>
+                                <h4>&lt;T&gt; static&nbsp;T <strong>withProjectConnection</strong>(java.io.File baseDir, boolean suppressOutput, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.gradle.tooling.ProjectConnection)<br>groovy.lang.Closure&lt;T&gt; closure)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/cli/groovy/DependencyManagementBom.html b/snapshot/api/org/grails/cli/groovy/DependencyManagementBom.html
index ace159777f..9bd564bc91 100644
--- a/snapshot/api/org/grails/cli/groovy/DependencyManagementBom.html
+++ b/snapshot/api/org/grails/cli/groovy/DependencyManagementBom.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>@java.lang.annotation.Target({ ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
-		ElementType.PARAMETER, ElementType.TYPE })
+            ElementType.PARAMETER, ElementType.TYPE })
 @java.lang.annotation.Retention(RetentionPolicy.SOURCE)
 @java.lang.annotation.Documented
 public @interface DependencyManagementBom</pre>
@@ -211,7 +211,7 @@ public @interface DependencyManagementBom</pre>
                                 <p> One or more sets of colon-separated coordinates (<CODE>group:module:version</CODE>) of a
  Maven bom that contains dependency management that will add to and override the
  default dependency management.
-	  <DL><DT><B>Returns:</B></DT><DD>the BOM coordinates</DD></DL></p>
+      <DL><DT><B>Returns:</B></DT><DD>the BOM coordinates</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/cli/groovy/EnableGroovyTemplates.html b/snapshot/api/org/grails/cli/groovy/EnableGroovyTemplates.html
index a148556030..377d35d060 100644
--- a/snapshot/api/org/grails/cli/groovy/EnableGroovyTemplates.html
+++ b/snapshot/api/org/grails/cli/groovy/EnableGroovyTemplates.html
@@ -106,7 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 @java.lang.annotation.Retention(RetentionPolicy.RUNTIME)
 public @interface EnableGroovyTemplates</pre>
 
-    <p> Pseudo annotation used to trigger GroovyTemplatesCompilerAutoConfiguration.
+    <p> Pseudo annotation used to trigger <a href='../../../../org/grails/cli/compiler/autoconfigure/GroovyTemplatesCompilerAutoConfiguration.html' title='GroovyTemplatesCompilerAutoConfiguration'>GroovyTemplatesCompilerAutoConfiguration</a>.
   <DL><DT><B>Authors:</B></DT><DD>Dave Syer</DD></DL><DL><DT><B>Since:</B></DT><DD>1.1.0</DD></DL></p>
 
           </li>
diff --git a/snapshot/api/org/grails/cli/groovy/package-summary.html b/snapshot/api/org/grails/cli/groovy/package-summary.html
index 62d903fca9..acd19eeded 100644
--- a/snapshot/api/org/grails/cli/groovy/package-summary.html
+++ b/snapshot/api/org/grails/cli/groovy/package-summary.html
@@ -133,7 +133,7 @@ function windowTitle()
                                     EnableGroovyTemplates
                                 </a></strong>
                             </td>
-                            <td>Pseudo annotation used to trigger GroovyTemplatesCompilerAutoConfiguration.</td>
+                            <td>Pseudo annotation used to trigger <a href='../../../../org/grails/cli/compiler/autoconfigure/GroovyTemplatesCompilerAutoConfiguration.html' title='GroovyTemplatesCompilerAutoConfiguration'>GroovyTemplatesCompilerAutoConfiguration</a>.</td>
                         </tr>
 
                     </tbody>
diff --git a/snapshot/api/org/grails/cli/util/ResourceUtils.html b/snapshot/api/org/grails/cli/util/ResourceUtils.html
index 47d8fcf835..44d8ba4047 100644
--- a/snapshot/api/org/grails/cli/util/ResourceUtils.html
+++ b/snapshot/api/org/grails/cli/util/ResourceUtils.html
@@ -233,7 +233,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;static&nbsp;final&nbsp;java.lang.String <strong>ALL_CLASSPATH_URL_PREFIX</strong></h4>
                                 <p> Pseudo URL prefix for loading all resources from the class path: "classpath*:".
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
@@ -242,7 +242,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;static&nbsp;final&nbsp;java.lang.String <strong>CLASSPATH_URL_PREFIX</strong></h4>
                                 <p> Pseudo URL prefix for loading from the class path: "classpath:".
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
@@ -251,7 +251,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;static&nbsp;final&nbsp;java.lang.String <strong>FILE_URL_PREFIX</strong></h4>
                                 <p> URL prefix for loading from the file system: "file:".
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
@@ -281,7 +281,7 @@ extends java.lang.Object</pre>
                                 <p> Return URLs from a given source path. Source paths can be simple file locations
  (/some/file.java) or wildcard patterns (/some/**). Additionally the prefixes
  "file:", "classpath:" and "classpath*:" can be used for specific path types.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>path</code> -  the source path</DD><DD><code>classLoader</code> -  the class loader or <CODE>null</CODE> to use the default</DD></DL><DL><DT><B>Returns:</B></DT><DD>a list of URLs</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>path</code> -  the source path</DD><DD><code>classLoader</code> -  the class loader or <CODE>null</CODE> to use the default</DD></DL><DL><DT><B>Returns:</B></DT><DD>a list of URLs</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/compiler/injection/GrailsASTUtils.html b/snapshot/api/org/grails/compiler/injection/GrailsASTUtils.html
index e7acf4a73a..ba8b5b9313 100644
--- a/snapshot/api/org/grails/compiler/injection/GrailsASTUtils.html
+++ b/snapshot/api/org/grails/compiler/injection/GrailsASTUtils.html
@@ -1259,7 +1259,7 @@ extends java.lang.Object</pre>
                                 <h4>public&nbsp;static&nbsp;org.codehaus.groovy.ast.MethodNode <strong>addDelegateStaticMethod</strong>(org.codehaus.groovy.ast.expr.Expression delegate, org.codehaus.groovy.ast.ClassNode classNode, org.codehaus.groovy.ast.MethodNode delegateMethod, org.codehaus.groovy.ast.AnnotationNode markerAnnotation, java.util.Map&lt;java.lang.String, org.codehaus.groovy.ast.ClassNode&gt; genericsPlaceholders, boolean noNullCheck)</h4>
                                 <p> Adds a static method to the given class node that delegates to the given method
  and resolves the object to invoke the method on from the given expression.
-          <DL><DT><B>Parameters:</B></DT><DD><code>delegate</code> -  The expression</DD><DD><code>classNode</code> -  The class node</DD><DD><code>delegateMethod</code> -  The delegate method</DD><DD><code>markerAnnotation</code> -  A marker annotation to be added to all methods</DD></DL><DL><DT><B>Returns:</B></DT><DD>The added method node or null if it couldn't be added</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>delegate</code> -  The expression</DD><DD><code>classNode</code> -  The class node</DD><DD><code>delegateMethod</code> -  The delegate method</DD><DD><code>markerAnnotation</code> -  A marker annotation to be added to all methods</DD></DL><DL><DT><B>Returns:</B></DT><DD>The added method node or null if it couldn't be added</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -1332,7 +1332,7 @@ extends java.lang.Object</pre>
                             <li class="blockList">
                                 <h4>public&nbsp;static&nbsp;org.codehaus.groovy.ast.expr.MethodCallExpression <strong>applyMethodTarget</strong>(org.codehaus.groovy.ast.expr.MethodCallExpression methodCallExpression, org.codehaus.groovy.ast.ClassNode targetClassNode, org.codehaus.groovy.ast.ClassNode targetParameterTypes)</h4>
                                 <p> Set the method target of a MethodCallExpression to the first matching method with same number and type of arguments.
- 
+
  A null parameter type will match any type
       <DL><DT><B>Parameters:</B></DT><DD>methodCallExpression</DD><DD>targetClassNode</DD><DD>targetParameterTypes</DD></DL><DL><DT><B>Returns:</B></DT><DD>The method call expression</DD></DL></p>
                             </li>
diff --git a/snapshot/api/org/grails/databinding/converters/CurrencyValueConverter.html b/snapshot/api/org/grails/databinding/converters/CurrencyValueConverter.html
index 919e89a2ca..9b89886b10 100644
--- a/snapshot/api/org/grails/databinding/converters/CurrencyValueConverter.html
+++ b/snapshot/api/org/grails/databinding/converters/CurrencyValueConverter.html
@@ -111,7 +111,7 @@ class CurrencyValueConverter
 extends java.lang.Object
 implements <a href='../../../../grails/databinding/converters/ValueConverter.html'>ValueConverter</a></pre>
 
-    <p> 
+    <p>
  A ValueConverter for converting String to Currency.
  <DL><DT><B>See Also:</B></DT><DD>ValueConverter</DD></DL><DL><DT><B>Since:</B></DT><DD>2.3.10</DD></DL></p>
 
diff --git a/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html b/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html
index 93445db5d4..fb772847c2 100644
--- a/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html
+++ b/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code>protected&nbsp;<strong><a href="#Context(AbstractBsonReader.Context, BsonContextType)">Context</a></strong>(<a href='../../../../../AbstractBsonReader.Context.html'>Context</a> parentContext, <a href='../../../../../BsonContextType.html'>BsonContextType</a> contextType)</code><br></td>
+                                <code>protected&nbsp;<strong><a href="#Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)">Context</a></strong>(<a href='../../../../../org.bson.AbstractBsonReader.Context.html'>Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType)</code><br></td>
                         </tr>
                         
                     </table>
@@ -165,7 +165,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../BsonContextType.html'>BsonContextType</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContextType()">getContextType</a></strong>()</code><br></td>
                         </tr>
                         
@@ -204,10 +204,10 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(AbstractBsonReader.Context, BsonContextType)"><!-- --></a>
+                        <a name="Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<strong>Context</strong>(<a href='../../../../../AbstractBsonReader.Context.html'>Context</a> parentContext, <a href='../../../../../BsonContextType.html'>BsonContextType</a> contextType)</h4>
+                                <h4>protected&nbsp;<strong>Context</strong>(<a href='../../../../../org.bson.AbstractBsonReader.Context.html'>Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -228,7 +228,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         <a name="getContextType()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../BsonContextType.html'>BsonContextType</a> <strong>getContextType</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> <strong>getContextType</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/datastore/bson/json/JsonReader.html b/snapshot/api/org/grails/datastore/bson/json/JsonReader.html
index bd5f3ee740..ca70d84f25 100644
--- a/snapshot/api/org/grails/datastore/bson/json/JsonReader.html
+++ b/snapshot/api/org/grails/datastore/bson/json/JsonReader.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public class JsonReader
-extends <a href='../../../../../AbstractBsonReader.html'>AbstractBsonReader</a></pre>
+extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonReader</a></pre>
 
     <p> A simplified fork of org.bson.json.JsonReader that works with readers and removes processing related to MongoDB
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>6.0</DD></DL></p>
@@ -226,7 +226,7 @@ extends <a href='../../../../../AbstractBsonReader.html'>AbstractBsonReader</a><
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../BsonDbPointer.html'>BsonDbPointer</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org.bson.BsonDbPointer.html'>BsonDbPointer</a></code></td>
                             <td class="colLast"><code><strong><a href="#doReadDBPointer()">doReadDBPointer</a></strong>()</code><br></td>
                         </tr>
                         
@@ -370,7 +370,7 @@ extends <a href='../../../../../AbstractBsonReader.html'>AbstractBsonReader</a><
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../BsonReaderMark.html'>BsonReaderMark</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org.bson.BsonReaderMark.html'>BsonReaderMark</a></code></td>
                             <td class="colLast"><code><strong><a href="#getMark()">getMark</a></strong>()</code><br></td>
                         </tr>
                         
@@ -475,7 +475,7 @@ extends <a href='../../../../../AbstractBsonReader.html'>AbstractBsonReader</a><
                         <a name="doReadDBPointer()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../BsonDbPointer.html'>BsonDbPointer</a> <strong>doReadDBPointer</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org.bson.BsonDbPointer.html'>BsonDbPointer</a> <strong>doReadDBPointer</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -667,7 +667,7 @@ extends <a href='../../../../../AbstractBsonReader.html'>AbstractBsonReader</a><
                         <a name="getMark()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../BsonReaderMark.html'>BsonReaderMark</a> <strong>getMark</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org.bson.BsonReaderMark.html'>BsonReaderMark</a> <strong>getMark</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html b/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html
index 45ea03c89a..ff67dc5671 100644
--- a/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html
+++ b/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
+                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
                         </tr>
                         
                     </table>
@@ -198,10 +198,10 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
+                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
                                 <p> Creates a new context.
           <DL><DT><B>Parameters:</B></DT><DD><code>parentContext</code> -  the parent context that can be used for going back up to the parent level</DD><DD><code>contextType</code> -    the type of this context</DD><DD><code>indentChars</code> -    the String to use for indentation at this level.</DD></DL></p>
                             </li>
diff --git a/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html b/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html
index b4beb5050a..e16a8acaac 100644
--- a/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html
+++ b/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public class JsonWriter
-extends <a href='../../../../../AbstractBsonWriter.html'>AbstractBsonWriter</a></pre>
+extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWriter</a></pre>
 
     <p> Simplified fork of org.bson.json.JsonWriter that ignores behaviour specific to MongoDB and produces more compat output
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>6.0</DD></DL></p>
@@ -251,7 +251,7 @@ extends <a href='../../../../../AbstractBsonWriter.html'>AbstractBsonWriter</a><
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#doWriteDBPointer(BsonDbPointer)">doWriteDBPointer</a></strong>(<a href='../../../../../BsonDbPointer.html'>BsonDbPointer</a> value)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#doWriteDBPointer(org.bson.BsonDbPointer)">doWriteDBPointer</a></strong>(<a href='../../../../../org.bson.BsonDbPointer.html'>BsonDbPointer</a> value)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -508,10 +508,10 @@ extends <a href='../../../../../AbstractBsonWriter.html'>AbstractBsonWriter</a><
                             </li>
                         </ul>
                     
-                        <a name="doWriteDBPointer(BsonDbPointer)"><!-- --></a>
+                        <a name="doWriteDBPointer(org.bson.BsonDbPointer)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;void <strong>doWriteDBPointer</strong>(<a href='../../../../../BsonDbPointer.html'>BsonDbPointer</a> value)</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;void <strong>doWriteDBPointer</strong>(<a href='../../../../../org.bson.BsonDbPointer.html'>BsonDbPointer</a> value)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.html b/snapshot/api/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.html
index 0dbe66d28d..9b81fcfdfe 100644
--- a/snapshot/api/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.html
+++ b/snapshot/api/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>public class DataSourceConnectionSourceFactory
 extends <a href='../../../../../../org/grails/datastore/mapping/core/connections/AbstractConnectionSourceFactory.html'>AbstractConnectionSourceFactory</a></pre>
 
-    <p> A ConnectionSourceFactory for creating JDBC javax.sql.DataSource connections
+    <p> A <a href='../../../../../../org/grails/datastore/mapping/core/connections/ConnectionSourceFactory.html' title='ConnectionSourceFactory'>ConnectionSourceFactory</a> for creating JDBC javax.sql.DataSource connections
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>6.0</DD></DL></p>
 
           </li>
diff --git a/snapshot/api/org/grails/datastore/gorm/jdbc/connections/package-summary.html b/snapshot/api/org/grails/datastore/gorm/jdbc/connections/package-summary.html
index d29d950cbf..9189305ecc 100644
--- a/snapshot/api/org/grails/datastore/gorm/jdbc/connections/package-summary.html
+++ b/snapshot/api/org/grails/datastore/gorm/jdbc/connections/package-summary.html
@@ -110,7 +110,7 @@ function windowTitle()
                                     DataSourceConnectionSourceFactory
                                 </a></strong>
                             </td>
-                            <td>A ConnectionSourceFactory for creating JDBC javax.sql.DataSource connections</td>
+                            <td>A <a href='../../../../../../org/grails/datastore/mapping/core/connections/ConnectionSourceFactory.html' title='ConnectionSourceFactory'>ConnectionSourceFactory</a> for creating JDBC javax.sql.DataSource connections</td>
                         </tr>
 <tr class="altColor">
                             <td class="colOne">
diff --git a/snapshot/api/org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html b/snapshot/api/org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html
index 0c8871e72a..2645f7ae8a 100644
--- a/snapshot/api/org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html
+++ b/snapshot/api/org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html
@@ -189,7 +189,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code>&lt;T&gt;</code></td>
                             <td class="colLast"><code>static&nbsp;T</code></td>
-                            <td class="colLast"><code><strong><a href="#asType(FindIterable, Class)">asType</a></strong>(<a href='../../../../../../FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#asType(com.mongodb.client.FindIterable, Class)">asType</a></strong>(<a href='../../../../../../com.mongodb.client.FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -243,7 +243,7 @@ extends java.lang.Object</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#createIndex(MongoCollection, Map, IndexOptions)">createIndex</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; keys, <a href='../../../../../../IndexOptions.html'>IndexOptions</a> options)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#createIndex(MongoCollection, Map, com.mongodb.client.model.IndexOptions)">createIndex</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; keys, <a href='../../../../../../com.mongodb.client.model.IndexOptions.html'>IndexOptions</a> options)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -333,7 +333,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#dropIndex(MongoCollection, Map, DropIndexOptions)">dropIndex</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; index, <a href='../../../../../../DropIndexOptions.html'>DropIndexOptions</a> dropIndexOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#dropIndex(MongoCollection, Map, com.mongodb.client.model.DropIndexOptions)">dropIndex</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; index, <a href='../../../../../../com.mongodb.client.model.DropIndexOptions.html'>DropIndexOptions</a> dropIndexOptions)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -543,13 +543,13 @@ extends java.lang.Object</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;MongoCollection&lt;Document&gt;</code></td>
-                            <td class="colLast"><code><strong><a href="#insert(MongoCollection, List, com.mongodb.WriteConcern, InsertManyOptions)">insert</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; documents, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern, <a href='../../../../../../InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</cod [...]
+                            <td class="colLast"><code><strong><a href="#insert(MongoCollection, List, com.mongodb.WriteConcern, com.mongodb.client.model.InsertManyOptions)">insert</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; documents, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern, <a href='../../../../../../com.mongodb.client.model.InsertManyOptio [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;MongoCollection&lt;Document&gt;</code></td>
-                            <td class="colLast"><code><strong><a href="#insert(MongoCollection, List, InsertManyOptions)">insert</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&gt; documents, <a href='../../../../../../InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#insert(MongoCollection, List, com.mongodb.client.model.InsertManyOptions)">insert</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&gt; documents, <a href='../../../../../../com.mongodb.client.model.InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -608,13 +608,13 @@ extends java.lang.Object</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>static&nbsp;<a href='../../../../../../MongoCollection.html'>MongoCollection</a></code></td>
+                            <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.MongoCollection.html'>MongoCollection</a></code></td>
                             <td class="colLast"><code><strong><a href="#save(MongoCollection, Map)">save</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; document)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>static&nbsp;<a href='../../../../../../MongoCollection.html'>MongoCollection</a></code></td>
+                            <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.MongoCollection.html'>MongoCollection</a></code></td>
                             <td class="colLast"><code><strong><a href="#save(MongoCollection, Map, com.mongodb.WriteConcern)">save</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; document, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern)</code><br></td>
                         </tr>
                         
@@ -633,7 +633,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code>&lt;T&gt;</code></td>
                             <td class="colLast"><code>static&nbsp;java.util.List&lt;T&gt;</code></td>
-                            <td class="colLast"><code><strong><a href="#toList(FindIterable, Class)">toList</a></strong>(<a href='../../../../../../FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#toList(com.mongodb.client.FindIterable, Class)">toList</a></strong>(<a href='../../../../../../com.mongodb.client.FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -651,7 +651,7 @@ extends java.lang.Object</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a></code></td>
-                            <td class="colLast"><code><strong><a href="#update(MongoCollection, Map, Map, UpdateOptions)">update</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#update(MongoCollection, Map, Map, com.mongodb.client.model.UpdateOptions)">update</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -669,7 +669,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a></code></td>
-                            <td class="colLast"><code><strong><a href="#updateMany(MongoCollection, Map, Map, UpdateOptions)">updateMany</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#updateMany(MongoCollection, Map, Map, com.mongodb.client.model.UpdateOptions)">updateMany</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -687,7 +687,7 @@ extends java.lang.Object</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a></code></td>
-                            <td class="colLast"><code><strong><a href="#updateMany(MongoCollection, Map, List, UpdateOptions)">updateMany</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#updateMany(MongoCollection, Map, List, com.mongodb.client.model.UpdateOptions)">updateMany</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</code>< [...]
                         </tr>
                         
                         <tr class="rowColor">
@@ -705,7 +705,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a></code></td>
-                            <td class="colLast"><code><strong><a href="#updateOne(MongoCollection, Map, Map, UpdateOptions)">updateOne</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#updateOne(MongoCollection, Map, Map, com.mongodb.client.model.UpdateOptions)">updateOne</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -723,7 +723,7 @@ extends java.lang.Object</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a></code></td>
-                            <td class="colLast"><code><strong><a href="#updateOne(MongoCollection, Map, List, UpdateOptions)">updateOne</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#updateOne(MongoCollection, Map, List, com.mongodb.client.model.UpdateOptions)">updateOne</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -830,10 +830,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="asType(FindIterable, Class)"><!-- --></a>
+                        <a name="asType(com.mongodb.client.FindIterable, Class)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; static&nbsp;T <strong>asType</strong>(<a href='../../../../../../FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</h4>
+                                <h4>&lt;T&gt; static&nbsp;T <strong>asType</strong>(<a href='../../../../../../com.mongodb.client.FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -902,10 +902,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="createIndex(MongoCollection, Map, IndexOptions)"><!-- --></a>
+                        <a name="createIndex(MongoCollection, Map, com.mongodb.client.model.IndexOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;void <strong>createIndex</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; keys, <a href='../../../../../../IndexOptions.html'>IndexOptions</a> options)</h4>
+                                <h4>static&nbsp;void <strong>createIndex</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; keys, <a href='../../../../../../com.mongodb.client.model.IndexOptions.html'>IndexOptions</a> options)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1022,10 +1022,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="dropIndex(MongoCollection, Map, DropIndexOptions)"><!-- --></a>
+                        <a name="dropIndex(MongoCollection, Map, com.mongodb.client.model.DropIndexOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;void <strong>dropIndex</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; index, <a href='../../../../../../DropIndexOptions.html'>DropIndexOptions</a> dropIndexOptions)</h4>
+                                <h4>static&nbsp;void <strong>dropIndex</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; index, <a href='../../../../../../com.mongodb.client.model.DropIndexOptions.html'>DropIndexOptions</a> dropIndexOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1302,18 +1302,18 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="insert(MongoCollection, List, com.mongodb.WriteConcern, InsertManyOptions)"><!-- --></a>
+                        <a name="insert(MongoCollection, List, com.mongodb.WriteConcern, com.mongodb.client.model.InsertManyOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;MongoCollection&lt;Document&gt; <strong>insert</strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; documents, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern, <a href='../../../../../../InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</h4>
+                                <h4>static&nbsp;MongoCollection&lt;Document&gt; <strong>insert</strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; documents, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern, <a href='../../../../../../com.mongodb.client.model.InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="insert(MongoCollection, List, InsertManyOptions)"><!-- --></a>
+                        <a name="insert(MongoCollection, List, com.mongodb.client.model.InsertManyOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;MongoCollection&lt;Document&gt; <strong>insert</strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&gt; documents, <a href='../../../../../../InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</h4>
+                                <h4>static&nbsp;MongoCollection&lt;Document&gt; <strong>insert</strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&gt; documents, <a href='../../../../../../com.mongodb.client.model.InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1393,7 +1393,7 @@ extends java.lang.Object</pre>
                         <a name="save(MongoCollection, Map)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../MongoCollection.html'>MongoCollection</a> <strong>save</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; document)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.MongoCollection.html'>MongoCollection</a> <strong>save</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; document)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1401,7 +1401,7 @@ extends java.lang.Object</pre>
                         <a name="save(MongoCollection, Map, com.mongodb.WriteConcern)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../MongoCollection.html'>MongoCollection</a> <strong>save</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; document, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.MongoCollection.html'>MongoCollection</a> <strong>save</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; document, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1422,10 +1422,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="toList(FindIterable, Class)"><!-- --></a>
+                        <a name="toList(com.mongodb.client.FindIterable, Class)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; static&nbsp;java.util.List&lt;T&gt; <strong>toList</strong>(<a href='../../../../../../FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</h4>
+                                <h4>&lt;T&gt; static&nbsp;java.util.List&lt;T&gt; <strong>toList</strong>(<a href='../../../../../../com.mongodb.client.FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1446,10 +1446,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="update(MongoCollection, Map, Map, UpdateOptions)"><!-- --></a>
+                        <a name="update(MongoCollection, Map, Map, com.mongodb.client.model.UpdateOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>update</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>update</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1470,10 +1470,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="updateMany(MongoCollection, Map, Map, UpdateOptions)"><!-- --></a>
+                        <a name="updateMany(MongoCollection, Map, Map, com.mongodb.client.model.UpdateOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateMany</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateMany</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1494,10 +1494,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="updateMany(MongoCollection, Map, List, UpdateOptions)"><!-- --></a>
+                        <a name="updateMany(MongoCollection, Map, List, com.mongodb.client.model.UpdateOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateMany</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateMany</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1518,10 +1518,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="updateOne(MongoCollection, Map, Map, UpdateOptions)"><!-- --></a>
+                        <a name="updateOne(MongoCollection, Map, Map, com.mongodb.client.model.UpdateOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateOne</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateOne</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1542,10 +1542,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="updateOne(MongoCollection, Map, List, UpdateOptions)"><!-- --></a>
+                        <a name="updateOne(MongoCollection, Map, List, com.mongodb.client.model.UpdateOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateOne</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateOne</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/datastore/gorm/mongo/simple/EnumType.html b/snapshot/api/org/grails/datastore/gorm/mongo/simple/EnumType.html
index b41ca1923c..04c84fa759 100644
--- a/snapshot/api/org/grails/datastore/gorm/mongo/simple/EnumType.html
+++ b/snapshot/api/org/grails/datastore/gorm/mongo/simple/EnumType.html
@@ -107,7 +107,7 @@ extends AbstractMappingAwareCustomTypeMarshaller&lt;java.lang.Object, Document,
 
     <p> A custom type for persisting Enum which have an id field in domain classes.
  For example: To save identity instead of string in database for field <b>type</b>.
- 
+
  <pre>
       class User {
           UserType type
@@ -116,7 +116,7 @@ extends AbstractMappingAwareCustomTypeMarshaller&lt;java.lang.Object, Document,
 
       enum UserType {
           A(1), B(2)
-          
+
           final int id
           UserType(int id) {
               this.id = id
diff --git a/snapshot/api/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.html b/snapshot/api/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.html
index 301c7860c1..c86ff3530b 100644
--- a/snapshot/api/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.html
+++ b/snapshot/api/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.html
@@ -114,7 +114,7 @@ implements <a href='../../../../../../org.springframework.beans.factory.support.
     <p> BeanDefinitionRegistryPostProcessor that replaces multiple discovered PersistenceContextInterceptor beans with
  a single aggregating instance. The previous multiple PersistenceContextInterceptor beans will be removed from
  the context and re-added as inner beans of the new AggregatePersistenceContextInterceptor bean.
- 
+
  PersistenceContextInterceptor beans are discovered by the bean name. The default pattern used for matching
  the beans is ^.*[pP]ersistenceInterceptor$ <DL><DT><B>Authors:</B></DT><DD>Burt Beckwith</DD><DD>Lari Hotari</DD></DL></p>
 
diff --git a/snapshot/api/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.html b/snapshot/api/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.html
index 1108781242..12bbe65207 100644
--- a/snapshot/api/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.html
+++ b/snapshot/api/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.html
@@ -106,7 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase= CompilePhase.CANONICALIZATION)
+<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase = CompilePhase.CANONICALIZATION)
 public class DetachedCriteriaASTTransformation
 extends java.lang.Object
 implements org.codehaus.groovy.transform.ASTTransformation, org.codehaus.groovy.transform.TransformWithPriority</pre>
diff --git a/snapshot/api/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.html b/snapshot/api/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.html
index 085b395014..fd344b642f 100644
--- a/snapshot/api/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.html
+++ b/snapshot/api/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.html
@@ -106,7 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase= CompilePhase.CANONICALIZATION)
+<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase = CompilePhase.CANONICALIZATION)
 public class GlobalDetachedCriteriaASTTransformation
 extends java.lang.Object
 implements org.codehaus.groovy.transform.ASTTransformation, org.codehaus.groovy.transform.TransformWithPriority</pre>
diff --git a/snapshot/api/org/grails/datastore/gorm/services/DefaultTransactionService.html b/snapshot/api/org/grails/datastore/gorm/services/DefaultTransactionService.html
index dd0624811b..01a7cd1365 100644
--- a/snapshot/api/org/grails/datastore/gorm/services/DefaultTransactionService.html
+++ b/snapshot/api/org/grails/datastore/gorm/services/DefaultTransactionService.html
@@ -299,7 +299,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withNewTransaction(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withNewTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withNewTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -307,7 +307,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withNewTransaction(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withNewTransaction</strong>(<a href='../../../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withNewTransaction</strong>(<a href='../../../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -315,7 +315,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withRollback(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -323,7 +323,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withRollback(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withRollback</strong>(<a href='../../../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withRollback</strong>(<a href='../../../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -331,7 +331,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withTransaction(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -339,7 +339,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withTransaction(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(<a href='../../../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(<a href='../../../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -347,7 +347,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withTransaction(java.util.Map, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(java.util.Map definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(java.util.Map definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.html b/snapshot/api/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.html
index b46ed72711..acfb962a63 100644
--- a/snapshot/api/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.html
+++ b/snapshot/api/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.html
@@ -111,9 +111,9 @@ extends java.lang.Object
 implements <a href='../../../../../org/grails/datastore/gorm/timestamp/TimestampProvider.html'>TimestampProvider</a></pre>
 
     <p> Default implementation of TimestampProvider
- 
+
  supports creating timestamps for any class that supports a constructor that accepts a Long or long value.
- 
+
  "currentTimeMillis" can be overrided in subclasses (useful for testing purposes)
 
  </p>
diff --git a/snapshot/api/org/grails/datastore/gorm/transactions/transform/RollbackTransform.html b/snapshot/api/org/grails/datastore/gorm/transactions/transform/RollbackTransform.html
index 5a548af99f..0121cb4b56 100644
--- a/snapshot/api/org/grails/datastore/gorm/transactions/transform/RollbackTransform.html
+++ b/snapshot/api/org/grails/datastore/gorm/transactions/transform/RollbackTransform.html
@@ -262,7 +262,7 @@ extends <a href='../../../../../../org/grails/datastore/gorm/transactions/transf
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html'>TransactionalTransform</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html#applyTransactionalAttributeSettings(org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.expr.VariableExpression, org.codehaus.groovy.ast.stmt.BlockStatement, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode)'>applyTransactionalAttributeSettings</a>, <a href='../../../../../../org/grails/datastore/gor [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html#applyTransactionalAttributeSettings(org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.expr.VariableExpression, org.codehaus.groovy.ast.stmt.BlockStatement, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode)'>applyTransactionalAttributeSettings</a>, <a href='../../../../../../org/grails/datastore/gor [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/gorm/transform/AbstractDatastoreMethodDecoratingTransformation.html'>AbstractDatastoreMethodDecoratingTransformation</a></code></td>
diff --git a/snapshot/api/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html b/snapshot/api/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html
index 7cfaab809b..81b8d30ffc 100644
--- a/snapshot/api/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html
+++ b/snapshot/api/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html
@@ -367,18 +367,6 @@ extends <a href='../../../../../../org/grails/datastore/gorm/transform/AbstractD
                             <td class="colLast"><code><strong><a href="#priority()">priority</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
-                            <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)">weaveClassNode</a></strong>(org.codehaus.groovy.control.SourceUnit source, org.codehaus.groovy.ast.AnnotationNode annotationNode, org.codehaus.groovy.ast.ClassNode classNode)</code><br></td>
-                        </tr>
-                        
-                        <tr class="altColor">
-                            <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.codehaus.groovy.ast.MethodNode</code></td>
-                            <td class="colLast"><code><strong><a href="#weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, Map)">weaveNewMethod</a></strong>(org.codehaus.groovy.control.SourceUnit sourceUnit, org.codehaus.groovy.ast.AnnotationNode annotationNode, org.codehaus.groovy.ast.ClassNode classNode, org.codehaus.groovy.ast.MethodNode methodNode, java.util.Map&lt;java. [...]
-                        </tr>
-                        
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
@@ -620,22 +608,6 @@ extends <a href='../../../../../../org/grails/datastore/gorm/transform/AbstractD
                             </li>
                         </ul>
                     
-                        <a name="weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)"><!-- --></a>
-                        <ul class="blockListLast">
-                            <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;void <strong>weaveClassNode</strong>(org.codehaus.groovy.control.SourceUnit source, org.codehaus.groovy.ast.AnnotationNode annotationNode, org.codehaus.groovy.ast.ClassNode classNode)</h4>
-                                <p></p>
-                            </li>
-                        </ul>
-                    
-                        <a name="weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, Map)"><!-- --></a>
-                        <ul class="blockListLast">
-                            <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;org.codehaus.groovy.ast.MethodNode <strong>weaveNewMethod</strong>(org.codehaus.groovy.control.SourceUnit sourceUnit, org.codehaus.groovy.ast.AnnotationNode annotationNode, org.codehaus.groovy.ast.ClassNode classNode, org.codehaus.groovy.ast.MethodNode methodNode, java.util.Map&lt;java.lang.String, org.codehaus.groovy.ast.ClassNode&gt; genericsSpec)</h4>
-                                <p></p>
-                            </li>
-                        </ul>
-                    
                         <a name="weaveSetTargetDatastoreBody(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.expr.Expression, org.codehaus.groovy.ast.stmt.BlockStatement)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
diff --git a/snapshot/api/org/grails/datastore/gorm/validation/constraints/MaxConstraint.html b/snapshot/api/org/grails/datastore/gorm/validation/constraints/MaxConstraint.html
index adfa036e7c..c6f5bac706 100644
--- a/snapshot/api/org/grails/datastore/gorm/validation/constraints/MaxConstraint.html
+++ b/snapshot/api/org/grails/datastore/gorm/validation/constraints/MaxConstraint.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 public class MaxConstraint
 extends <a href='../../../../../../org/grails/datastore/gorm/validation/constraints/AbstractConstraint.html'>AbstractConstraint</a></pre>
 
diff --git a/snapshot/api/org/grails/datastore/gorm/validation/constraints/RangeConstraint.html b/snapshot/api/org/grails/datastore/gorm/validation/constraints/RangeConstraint.html
index abf464637b..a15486044f 100644
--- a/snapshot/api/org/grails/datastore/gorm/validation/constraints/RangeConstraint.html
+++ b/snapshot/api/org/grails/datastore/gorm/validation/constraints/RangeConstraint.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 public class RangeConstraint
 extends <a href='../../../../../../org/grails/datastore/gorm/validation/constraints/AbstractConstraint.html'>AbstractConstraint</a></pre>
 
diff --git a/snapshot/api/org/grails/datastore/mapping/engine/EntityPersister.html b/snapshot/api/org/grails/datastore/mapping/engine/EntityPersister.html
index ce9d6b7e9e..0a127f90d3 100644
--- a/snapshot/api/org/grails/datastore/mapping/engine/EntityPersister.html
+++ b/snapshot/api/org/grails/datastore/mapping/engine/EntityPersister.html
@@ -590,7 +590,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/engine/Persister
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>cancelInsert</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> persistentEntity, <a href='../../../../../org/grails/datastore/mapping/engine/EntityAccess.html'>EntityAccess</a> entityAccess)</h4>
                                 <p> Fire the beforeInsert even on an entityAccess object and return true if the operation should be cancelled
-     <DL><DT><B>Parameters:</B></DT><DD><code>persistentEntity</code> -  The entity</DD><DD><code>entityAccess</code> -  The entity access</DD></DL><DL><DT><B>Returns:</B></DT><DD>true if the operation should be cancelled</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>persistentEntity</code> -  The entity</DD><DD><code>entityAccess</code> -  The entity access</DD></DL><DL><DT><B>Returns:</B></DT><DD>true if the operation should be cancelled</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -608,7 +608,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/engine/Persister
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>cancelUpdate</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> persistentEntity, <a href='../../../../../org/grails/datastore/mapping/engine/EntityAccess.html'>EntityAccess</a> entityAccess)</h4>
                                 <p> Fire the beforeUpdate event on an entityAccess object and return true if the operation should be cancelled
-     <DL><DT><B>Parameters:</B></DT><DD><code>persistentEntity</code> -  The entity</DD><DD><code>entityAccess</code> -  The entity access</DD></DL><DL><DT><B>Returns:</B></DT><DD>true if the operation should be cancelled</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>persistentEntity</code> -  The entity</DD><DD><code>entityAccess</code> -  The entity access</DD></DL><DL><DT><B>Returns:</B></DT><DD>true if the operation should be cancelled</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/datastore/mapping/mongo/config/MongoCollection.html b/snapshot/api/org/grails/datastore/mapping/mongo/config/MongoCollection.html
index 3a4643e614..f8852a807c 100644
--- a/snapshot/api/org/grails/datastore/mapping/mongo/config/MongoCollection.html
+++ b/snapshot/api/org/grails/datastore/mapping/mongo/config/MongoCollection.html
@@ -456,7 +456,7 @@ extends java.util.Collection</pre>
                         <a name="id(groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>Entity&lt;Attribute&gt; <strong>id</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute.class)<br>groovy.lang.Closure identityConfig)</h4>
+                                <h4>@java.lang.Override<br>Entity&lt;Attribute&gt; <strong>id</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute)<br>groovy.lang.Closure identityConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -488,7 +488,7 @@ extends java.util.Collection</pre>
                         <a name="property(java.lang.String, groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/config/Entity.html'>Entity</a> <strong>property</strong>(java.lang.String name, @groovy.lang.DelegatesTo(value: MongoAttribute.class)<br>groovy.lang.Closure propertyConfig)</h4>
+                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/config/Entity.html'>Entity</a> <strong>property</strong>(java.lang.String name, @groovy.lang.DelegatesTo(value: MongoAttribute)<br>groovy.lang.Closure propertyConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -496,7 +496,7 @@ extends java.util.Collection</pre>
                         <a name="property(groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/mongo/config/MongoAttribute.html'>MongoAttribute</a> <strong>property</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute.class)<br>groovy.lang.Closure propertyConfig)</h4>
+                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/mongo/config/MongoAttribute.html'>MongoAttribute</a> <strong>property</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute)<br>groovy.lang.Closure propertyConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -544,7 +544,7 @@ extends java.util.Collection</pre>
                         <a name="version(groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/config/Entity.html'>Entity</a> <strong>version</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute.class)<br>groovy.lang.Closure versionConfig)</h4>
+                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/config/Entity.html'>Entity</a> <strong>version</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute)<br>groovy.lang.Closure versionConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html b/snapshot/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
index 0320cdd481..c9016b6165 100644
--- a/snapshot/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
+++ b/snapshot/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
@@ -225,14 +225,14 @@ extends <a href='../../../../../../org/grails/datastore/mapping/document/config/
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../../Binary.html'>Binary</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../../org.bson.types.Binary.html'>Binary</a></code></td>
                             <td class="colLast"><code><strong><a href="#convert(byte[])">convert</a></strong>(byte[] source)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;byte[]</code></td>
-                            <td class="colLast"><code><strong><a href="#convert(Binary)">convert</a></strong>(<a href='../../../../../../Binary.html'>Binary</a> source)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#convert(org.bson.types.Binary)">convert</a></strong>(<a href='../../../../../../org.bson.types.Binary.html'>Binary</a> source)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -428,15 +428,15 @@ extends <a href='../../../../../../org/grails/datastore/mapping/document/config/
                         <a name="convert(byte[])"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../../Binary.html'>Binary</a> <strong>convert</strong>(byte[] source)</h4>
+                                <h4>public&nbsp;<a href='../../../../../../org.bson.types.Binary.html'>Binary</a> <strong>convert</strong>(byte[] source)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="convert(Binary)"><!-- --></a>
+                        <a name="convert(org.bson.types.Binary)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;byte[] <strong>convert</strong>(<a href='../../../../../../Binary.html'>Binary</a> source)</h4>
+                                <h4>public&nbsp;byte[] <strong>convert</strong>(<a href='../../../../../../org.bson.types.Binary.html'>Binary</a> source)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/datastore/mapping/mongo/engine/MongoCodecEntityPersister.html b/snapshot/api/org/grails/datastore/mapping/mongo/engine/MongoCodecEntityPersister.html
index ece7e05f60..5da13c6a06 100644
--- a/snapshot/api/org/grails/datastore/mapping/mongo/engine/MongoCodecEntityPersister.html
+++ b/snapshot/api/org/grails/datastore/mapping/mongo/engine/MongoCodecEntityPersister.html
@@ -341,7 +341,7 @@ extends ThirdPartyCacheEntityPersister&lt;java.lang.Object&gt;</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../../MongoCollection.html'>MongoCollection</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../../com.mongodb.client.MongoCollection.html'>MongoCollection</a></code></td>
                             <td class="colLast"><code><strong><a href="#getMongoCollection(org.grails.datastore.mapping.model.PersistentEntity)">getMongoCollection</a></strong>(<a href='../../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> pe)</code><br></td>
                         </tr>
                         
@@ -658,7 +658,7 @@ extends ThirdPartyCacheEntityPersister&lt;java.lang.Object&gt;</pre>
                         <a name="getMongoCollection(org.grails.datastore.mapping.model.PersistentEntity)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../../MongoCollection.html'>MongoCollection</a> <strong>getMongoCollection</strong>(<a href='../../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> pe)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../../com.mongodb.client.MongoCollection.html'>MongoCollection</a> <strong>getMongoCollection</strong>(<a href='../../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> pe)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/datastore/mapping/query/api/BuildableCriteria.html b/snapshot/api/org/grails/datastore/mapping/query/api/BuildableCriteria.html
index 38a85e47e3..bf99d5f45c 100644
--- a/snapshot/api/org/grails/datastore/mapping/query/api/BuildableCriteria.html
+++ b/snapshot/api/org/grails/datastore/mapping/query/api/BuildableCriteria.html
@@ -314,7 +314,7 @@ extends <a href='../../../../../../org.hibernate.Criteria.html'>Criteria</a></pr
                         <ul class="blockListLast">
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.Object <strong>listDistinct</strong>(@groovy.lang.DelegatesTo(Criteria.class)<br>groovy.lang.Closure closure)</h4>
-                                <p> Defines and executes a list distinct query in a single call. Example: Foo.createCriteria().listDistinct { } 
+                                <p> Defines and executes a list distinct query in a single call. Example: Foo.createCriteria().listDistinct { }
       <DL><DT><B>Parameters:</B></DT><DD><code>closure</code> -  The closure to execute</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/datastore/mapping/query/api/Criteria.html b/snapshot/api/org/grails/datastore/mapping/query/api/Criteria.html
index 54536a7d07..76914fe1fc 100644
--- a/snapshot/api/org/grails/datastore/mapping/query/api/Criteria.html
+++ b/snapshot/api/org/grails/datastore/mapping/query/api/Criteria.html
@@ -1148,7 +1148,7 @@ public interface Criteria</pre>
                                 <h4>public&nbsp;<a href='../../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>readOnly</strong>(boolean readOnly)</h4>
                                 <p> <p>Configures the hibernate readOnly property to avoid checking for changes on the objects if the passed argument is true
 
- <code> { readOnly true } </code>          
+ <code> { readOnly true } </code>
       <DL><DT><B>Parameters:</B></DT><DD><code>readOnly</code> -  True to disable dirty checking</DD></DL><DL><DT><B>Returns:</B></DT><DD>This Criteria instance</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/datastore/mapping/reflect/ClosureToMapPopulator.html b/snapshot/api/org/grails/datastore/mapping/reflect/ClosureToMapPopulator.html
index e7e901454b..83cb9ba461 100644
--- a/snapshot/api/org/grails/datastore/mapping/reflect/ClosureToMapPopulator.html
+++ b/snapshot/api/org/grails/datastore/mapping/reflect/ClosureToMapPopulator.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 public class ClosureToMapPopulator
 extends groovy.lang.GroovyObjectSupport</pre>
 
diff --git a/snapshot/api/org/grails/datastore/mapping/reflect/ReflectionUtils.html b/snapshot/api/org/grails/datastore/mapping/reflect/ReflectionUtils.html
index 0c28b8bce6..bcd19438ee 100644
--- a/snapshot/api/org/grails/datastore/mapping/reflect/ReflectionUtils.html
+++ b/snapshot/api/org/grails/datastore/mapping/reflect/ReflectionUtils.html
@@ -352,7 +352,7 @@ extends java.lang.Object</pre>
  to avoid unnecessary conflicts with a JVM SecurityManager (if active).
 
  Based on the same method in Spring core.
-     <DL><DT><B>Parameters:</B></DT><DD><code>field</code> -  the field to make accessible</DD></DL><DL><DT><B>See Also:</B></DT><DD>java.lang.reflect.Field#setAccessible</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>field</code> -  the field to make accessible</DD></DL><DL><DT><B>See Also:</B></DT><DD>java.lang.reflect.Field#setAccessible</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/gsp/compiler/transform/LineNumberTransform.html b/snapshot/api/org/grails/gsp/compiler/transform/LineNumberTransform.html
index 2d9d857fa6..4488f4b6d2 100644
--- a/snapshot/api/org/grails/gsp/compiler/transform/LineNumberTransform.html
+++ b/snapshot/api/org/grails/gsp/compiler/transform/LineNumberTransform.html
@@ -106,7 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase=CompilePhase.SEMANTIC_ANALYSIS)
+<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase = CompilePhase.SEMANTIC_ANALYSIS)
 public class LineNumberTransform
 extends java.lang.Object
 implements org.codehaus.groovy.transform.ASTTransformation, org.codehaus.groovy.transform.TransformWithPriority</pre>
diff --git a/snapshot/api/org/grails/gsp/jsp/GroovyPagesJspApplicationContext.html b/snapshot/api/org/grails/gsp/jsp/GroovyPagesJspApplicationContext.html
index 27c26d4cd9..0cf3894fde 100644
--- a/snapshot/api/org/grails/gsp/jsp/GroovyPagesJspApplicationContext.html
+++ b/snapshot/api/org/grails/gsp/jsp/GroovyPagesJspApplicationContext.html
@@ -175,18 +175,18 @@ implements <a href='../../../../jakarta.servlet.jsp.JspApplicationContext.html'>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addELContextListener(ELContextListener)">addELContextListener</a></strong>(<a href='../../../../ELContextListener.html'>ELContextListener</a> elContextListener)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#addELContextListener(jakarta.el.ELContextListener)">addELContextListener</a></strong>(<a href='../../../../jakarta.el.ELContextListener.html'>ELContextListener</a> elContextListener)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addELResolver(ELResolver)">addELResolver</a></strong>(<a href='../../../../ELResolver.html'>ELResolver</a> resolver)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#addELResolver(jakarta.el.ELResolver)">addELResolver</a></strong>(<a href='../../../../jakarta.el.ELResolver.html'>ELResolver</a> resolver)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../ExpressionFactory.html'>ExpressionFactory</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../jakarta.el.ExpressionFactory.html'>ExpressionFactory</a></code></td>
                             <td class="colLast"><code><strong><a href="#getExpressionFactory()">getExpressionFactory</a></strong>()</code><br></td>
                         </tr>
                         
@@ -258,18 +258,18 @@ implements <a href='../../../../jakarta.servlet.jsp.JspApplicationContext.html'>
                 </a>
                     <h3>Method Detail</h3>
                     
-                        <a name="addELContextListener(ELContextListener)"><!-- --></a>
+                        <a name="addELContextListener(jakarta.el.ELContextListener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addELContextListener</strong>(<a href='../../../../ELContextListener.html'>ELContextListener</a> elContextListener)</h4>
+                                <h4>public&nbsp;void <strong>addELContextListener</strong>(<a href='../../../../jakarta.el.ELContextListener.html'>ELContextListener</a> elContextListener)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="addELResolver(ELResolver)"><!-- --></a>
+                        <a name="addELResolver(jakarta.el.ELResolver)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addELResolver</strong>(<a href='../../../../ELResolver.html'>ELResolver</a> resolver)</h4>
+                                <h4>public&nbsp;void <strong>addELResolver</strong>(<a href='../../../../jakarta.el.ELResolver.html'>ELResolver</a> resolver)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -277,7 +277,7 @@ implements <a href='../../../../jakarta.servlet.jsp.JspApplicationContext.html'>
                         <a name="getExpressionFactory()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../ExpressionFactory.html'>ExpressionFactory</a> <strong>getExpressionFactory</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../jakarta.el.ExpressionFactory.html'>ExpressionFactory</a> <strong>getExpressionFactory</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/gsp/jsp/GroovyPagesPageContext.html b/snapshot/api/org/grails/gsp/jsp/GroovyPagesPageContext.html
index a8f917646f..95f841ecff 100644
--- a/snapshot/api/org/grails/gsp/jsp/GroovyPagesPageContext.html
+++ b/snapshot/api/org/grails/gsp/jsp/GroovyPagesPageContext.html
@@ -226,7 +226,7 @@ extends <a href='../../../../jakarta.servlet.jsp.PageContext.html'>PageContext</
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../JspWriter.html'>JspWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../jakarta.servlet.jsp.JspWriter.html'>JspWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getOut()">getOut</a></strong>()</code><br></td>
                         </tr>
                         
@@ -328,7 +328,7 @@ extends <a href='../../../../jakarta.servlet.jsp.PageContext.html'>PageContext</
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../JspWriter.html'>JspWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../jakarta.servlet.jsp.JspWriter.html'>JspWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#popBody()">popBody</a></strong>()</code><br></td>
                         </tr>
                         
@@ -507,7 +507,7 @@ extends <a href='../../../../jakarta.servlet.jsp.PageContext.html'>PageContext</
                         <a name="getOut()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../JspWriter.html'>JspWriter</a> <strong>getOut</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../jakarta.servlet.jsp.JspWriter.html'>JspWriter</a> <strong>getOut</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -643,7 +643,7 @@ extends <a href='../../../../jakarta.servlet.jsp.PageContext.html'>PageContext</
                         <a name="popBody()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../JspWriter.html'>JspWriter</a> <strong>popBody</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../jakarta.servlet.jsp.JspWriter.html'>JspWriter</a> <strong>popBody</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/gsp/jsp/JspFragmentImpl.html b/snapshot/api/org/grails/gsp/jsp/JspFragmentImpl.html
index 17155baba9..0e3cd954ec 100644
--- a/snapshot/api/org/grails/gsp/jsp/JspFragmentImpl.html
+++ b/snapshot/api/org/grails/gsp/jsp/JspFragmentImpl.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class JspFragmentImpl
-extends <a href='../../../../JspFragment.html'>JspFragment</a></pre>
+extends <a href='../../../../jakarta.servlet.jsp.tagext.JspFragment.html'>JspFragment</a></pre>
 
           </li>
     </ul>
diff --git a/snapshot/api/org/grails/gsp/jsp/JspTagImpl.html b/snapshot/api/org/grails/gsp/jsp/JspTagImpl.html
index 1d10630df4..a650b7539f 100644
--- a/snapshot/api/org/grails/gsp/jsp/JspTagImpl.html
+++ b/snapshot/api/org/grails/gsp/jsp/JspTagImpl.html
@@ -256,7 +256,7 @@ implements <a href='../../../../org/grails/gsp/jsp/JspTag.html'>JspTag</a></pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;java.lang.Object</code></td>
-                            <td class="colLast"><code><strong><a href="#handleSimpleTag(SimpleTag, java.util.Map, org.grails.gsp.jsp.GroovyPagesPageContext, java.io.Writer, groovy.lang.Closure)">handleSimpleTag</a></strong>(<a href='../../../../SimpleTag.html'>SimpleTag</a> tag, java.util.Map attributes, <a href='../../../../org/grails/gsp/jsp/GroovyPagesPageContext.html'>GroovyPagesPageContext</a> pageContext, java.io.Writer targetWriter, groovy.lang.Closure body)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#handleSimpleTag(jakarta.servlet.jsp.tagext.SimpleTag, java.util.Map, org.grails.gsp.jsp.GroovyPagesPageContext, java.io.Writer, groovy.lang.Closure)">handleSimpleTag</a></strong>(<a href='../../../../jakarta.servlet.jsp.tagext.SimpleTag.html'>SimpleTag</a> tag, java.util.Map attributes, <a href='../../../../org/grails/gsp/jsp/GroovyPagesPageContext.html'>GroovyPagesPageContext</a> pageContext, java.io.Writer targetWr [...]
                         </tr>
                         
                         <tr class="rowColor">
@@ -457,10 +457,10 @@ implements <a href='../../../../org/grails/gsp/jsp/JspTag.html'>JspTag</a></pre>
                             </li>
                         </ul>
                     
-                        <a name="handleSimpleTag(SimpleTag, java.util.Map, org.grails.gsp.jsp.GroovyPagesPageContext, java.io.Writer, groovy.lang.Closure)"><!-- --></a>
+                        <a name="handleSimpleTag(jakarta.servlet.jsp.tagext.SimpleTag, java.util.Map, org.grails.gsp.jsp.GroovyPagesPageContext, java.io.Writer, groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;java.lang.Object <strong>handleSimpleTag</strong>(<a href='../../../../SimpleTag.html'>SimpleTag</a> tag, java.util.Map attributes, <a href='../../../../org/grails/gsp/jsp/GroovyPagesPageContext.html'>GroovyPagesPageContext</a> pageContext, java.io.Writer targetWriter, groovy.lang.Closure body)</h4>
+                                <h4>protected&nbsp;java.lang.Object <strong>handleSimpleTag</strong>(<a href='../../../../jakarta.servlet.jsp.tagext.SimpleTag.html'>SimpleTag</a> tag, java.util.Map attributes, <a href='../../../../org/grails/gsp/jsp/GroovyPagesPageContext.html'>GroovyPagesPageContext</a> pageContext, java.io.Writer targetWriter, groovy.lang.Closure body)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/gsp/jsp/JspWriterDelegate.html b/snapshot/api/org/grails/gsp/jsp/JspWriterDelegate.html
index bf8cdc4c1b..5811617c07 100644
--- a/snapshot/api/org/grails/gsp/jsp/JspWriterDelegate.html
+++ b/snapshot/api/org/grails/gsp/jsp/JspWriterDelegate.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public class JspWriterDelegate
-extends <a href='../../../../JspWriter.html'>JspWriter</a></pre>
+extends <a href='../../../../jakarta.servlet.jsp.JspWriter.html'>JspWriter</a></pre>
 
     <p> Delegates to another java.io.Writer.
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>1.0</DD></DL></p>
diff --git a/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index 5d15fc5b40..e4518091af 100644
--- a/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
+++ b/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../MessageSourceAware.html'>MessageSourceAware</a>, <a href='../../../../org/grails/datastore/mapping/core/connections/MultipleConnectionSourceCapableDatastore.html'>MultipleConnectionSourceCapableDatastore</a>, <a href='../../../../org/grails/datastore/mapping/multitenancy/SchemaMultiTenantCapableDatastore.html'>SchemaMultiTenantCapableDatasto [...]
+                <dd><a href='../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../org.springframework.context.MessageSourceAware.html'>MessageSourceAware</a>, <a href='../../../../org/grails/datastore/mapping/core/connections/MultipleConnectionSourceCapableDatastore.html'>MultipleConnectionSourceCapableDatastore</a>, <a href='../../../../org/grails/datastore/mapping/multitenancy/SchemaMultiTenantCapableDatastore.html'>Sch [...]
             </dl>
     
 
@@ -108,7 +108,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
 <pre>public abstract class AbstractHibernateDatastore
 extends <a href='../../../../org/grails/datastore/mapping/core/AbstractDatastore.html'>AbstractDatastore</a>
-implements <a href='../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../MessageSourceAware.html'>MessageSourceAware</a>, <a href='../../../../org/grails/datastore/mapping/core/connections/MultipleConnectionSourceCapableDatastore.html'>MultipleConnectionSourceCapableDatastore</a>, <a href='../../../../org/grails/datastore/mapping/multitenancy/SchemaMultiTenantCapableDatastore.html'>SchemaMultiTenantCapableDatastore</a>, < [...]
+implements <a href='../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../org.springframework.context.MessageSourceAware.html'>MessageSourceAware</a>, <a href='../../../../org/grails/datastore/mapping/core/connections/MultipleConnectionSourceCapableDatastore.html'>MultipleConnectionSourceCapableDatastore</a>, <a href='../../../../org/grails/datastore/mapping/multitenancy/SchemaMultiTenantCapableDatastore.html'>SchemaMultiT [...]
 
     <p> Datastore implementation that uses a Hibernate SessionFactory underneath.
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>2.0</DD></DL></p>
@@ -531,7 +531,7 @@ implements <a href='../../../../org.springframework.context.ApplicationContextAw
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;abstract&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1042,10 +1042,10 @@ implements <a href='../../../../org.springframework.context.ApplicationContextAw
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p> Execute the given operation with the given flush mode
       <DL><DT><B>Parameters:</B></DT><DD>flushMode</DD><DD><code>callable</code> -  The callable</DD></DL></p>
                             </li>
diff --git a/snapshot/api/org/grails/orm/hibernate/AbstractHibernateSession.html b/snapshot/api/org/grails/orm/hibernate/AbstractHibernateSession.html
index 1f583f3c90..bc282398da 100644
--- a/snapshot/api/org/grails/orm/hibernate/AbstractHibernateSession.html
+++ b/snapshot/api/org/grails/orm/hibernate/AbstractHibernateSession.html
@@ -111,7 +111,7 @@ public abstract class AbstractHibernateSession
 extends <a href='../../../../org/grails/datastore/mapping/core/AbstractAttributeStoringSession.html'>AbstractAttributeStoringSession</a>
 implements <a href='../../../../org/grails/datastore/mapping/query/api/QueryAliasAwareSession.html'>QueryAliasAwareSession</a></pre>
 
-    <p> Session implementation that wraps a Hibernate Session.
+    <p> Session implementation that wraps a Hibernate org.hibernate.Session.
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>1.0</DD></DL></p>
 
           </li>
diff --git a/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index d0164f56ad..c7397364c6 100644
--- a/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
+++ b/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
@@ -306,7 +306,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../FlushMode.html'>FlushMode</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#applyFlushMode(org.hibernate.Session, boolean)">applyFlushMode</a></strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</code><br>Apply the flush mode that's been specified for this accessor to the given Session.</td>
                         </tr>
                         
@@ -337,13 +337,13 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;<a href='../../../../org.springframework.dao.DataAccessException.html'>DataAccessException</a></code></td>
-                            <td class="colLast"><code><strong><a href="#convertHibernateAccessException(HibernateException)">convertHibernateAccessException</a></strong>(<a href='../../../../HibernateException.html'>HibernateException</a> ex)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#convertHibernateAccessException(org.hibernate.HibernateException)">convertHibernateAccessException</a></strong>(<a href='../../../../org.hibernate.HibernateException.html'>HibernateException</a> ex)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;<a href='../../../../org.springframework.dao.DataAccessException.html'>DataAccessException</a></code></td>
-                            <td class="colLast"><code><strong><a href="#convertJdbcAccessException(JDBCException, org.springframework.jdbc.support.SQLExceptionTranslator)">convertJdbcAccessException</a></strong>(<a href='../../../../JDBCException.html'>JDBCException</a> ex, <a href='../../../../org.springframework.jdbc.support.SQLExceptionTranslator.html'>SQLExceptionTranslator</a> translator)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#convertJdbcAccessException(org.hibernate.JDBCException, org.springframework.jdbc.support.SQLExceptionTranslator)">convertJdbcAccessException</a></strong>(<a href='../../../../org.hibernate.JDBCException.html'>JDBCException</a> ex, <a href='../../../../org.springframework.jdbc.support.SQLExceptionTranslator.html'>SQLExceptionTranslator</a> translator)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -822,7 +822,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="applyFlushMode(org.hibernate.Session, boolean)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../FlushMode.html'>FlushMode</a> <strong>applyFlushMode</strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</h4>
+                                <h4>protected&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>applyFlushMode</strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</h4>
                                 <p> Apply the flush mode that's been specified for this accessor to the given Session.
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -              the current Hibernate Session</DD><DD><code>existingTransaction</code> -  if executing within an existing transaction</DD></DL><DL><DT><B>Returns:</B></DT><DD>the previous flush mode to restore after the operation, or <code>null</code> if none</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFlushMode'>setFlushMode</a></DD><DD>org.hibernate.Session#setFlushMode</DD></DL></p>
                             </li>
@@ -860,18 +860,18 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                             </li>
                         </ul>
                     
-                        <a name="convertHibernateAccessException(HibernateException)"><!-- --></a>
+                        <a name="convertHibernateAccessException(org.hibernate.HibernateException)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.SuppressWarnings("ConstantConditions")<br>protected&nbsp;<a href='../../../../org.springframework.dao.DataAccessException.html'>DataAccessException</a> <strong>convertHibernateAccessException</strong>(<a href='../../../../HibernateException.html'>HibernateException</a> ex)</h4>
+                                <h4>@java.lang.SuppressWarnings("ConstantConditions")<br>protected&nbsp;<a href='../../../../org.springframework.dao.DataAccessException.html'>DataAccessException</a> <strong>convertHibernateAccessException</strong>(<a href='../../../../org.hibernate.HibernateException.html'>HibernateException</a> ex)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="convertJdbcAccessException(JDBCException, org.springframework.jdbc.support.SQLExceptionTranslator)"><!-- --></a>
+                        <a name="convertJdbcAccessException(org.hibernate.JDBCException, org.springframework.jdbc.support.SQLExceptionTranslator)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.SuppressWarnings("SqlDialectInspection")<br>protected&nbsp;<a href='../../../../org.springframework.dao.DataAccessException.html'>DataAccessException</a> <strong>convertJdbcAccessException</strong>(<a href='../../../../JDBCException.html'>JDBCException</a> ex, <a href='../../../../org.springframework.jdbc.support.SQLExceptionTranslator.html'>SQLExceptionTranslator</a> translator)</h4>
+                                <h4>@java.lang.SuppressWarnings("SqlDialectInspection")<br>protected&nbsp;<a href='../../../../org.springframework.dao.DataAccessException.html'>DataAccessException</a> <strong>convertJdbcAccessException</strong>(<a href='../../../../org.hibernate.JDBCException.html'>JDBCException</a> ex, <a href='../../../../org.springframework.jdbc.support.SQLExceptionTranslator.html'>SQLExceptionTranslator</a> translator)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html b/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
index 84ae7088fa..81cdefa59f 100644
--- a/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
+++ b/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
@@ -137,7 +137,7 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#defaultFlushMode">defaultFlushMode</a></code><br></td>
                         </tr>
                         
@@ -170,17 +170,17 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                     </table>
@@ -250,7 +250,7 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                         <a name="defaultFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>final&nbsp;<a href='../../../../FlushMode.html'>FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>defaultFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -277,26 +277,26 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsHibernateTransactionManager(FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html b/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html
index e89f82103f..c0d3867e54 100644
--- a/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html
+++ b/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../MessageSourceAware.html'>MessageSourceAware</a></dd>
+                <dd><a href='../../../../org.springframework.context.MessageSourceAware.html'>MessageSourceAware</a></dd>
             </dl>
     
 
@@ -108,7 +108,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
 <pre>public class HibernateDatastore
 extends <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html'>AbstractHibernateDatastore</a>
-implements <a href='../../../../MessageSourceAware.html'>MessageSourceAware</a></pre>
+implements <a href='../../../../org.springframework.context.MessageSourceAware.html'>MessageSourceAware</a></pre>
 
     <p> Datastore implementation that uses a Hibernate SessionFactory underneath.
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>2.0</DD></DL></p>
@@ -477,7 +477,7 @@ implements <a href='../../../../MessageSourceAware.html'>MessageSourceAware</a><
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
                         </tr>
                         
                     </table>
@@ -496,7 +496,7 @@ implements <a href='../../../../MessageSourceAware.html'>MessageSourceAware</a><
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html'>AbstractHibernateDatastore</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/datastore/mapping/core/AbstractDatastore.html'>AbstractDatastore</a></code></td>
@@ -946,10 +946,10 @@ implements <a href='../../../../MessageSourceAware.html'>MessageSourceAware</a><
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.html b/snapshot/api/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.html
index a6a005f918..206e33a6f9 100644
--- a/snapshot/api/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.html
+++ b/snapshot/api/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../PropertyAccessStrategy.html'>PropertyAccessStrategy</a></dd>
+                <dd><a href='../../../../../org.hibernate.property.access.spi.PropertyAccessStrategy.html'>PropertyAccessStrategy</a></dd>
             </dl>
     
 
@@ -108,7 +108,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
 <pre>public class TraitPropertyAccessStrategy
 extends java.lang.Object
-implements <a href='../../../../../PropertyAccessStrategy.html'>PropertyAccessStrategy</a></pre>
+implements <a href='../../../../../org.hibernate.property.access.spi.PropertyAccessStrategy.html'>PropertyAccessStrategy</a></pre>
 
     <p> Support reading and writing trait fields with Hibernate 5+
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>6.1.3</DD></DL></p>
@@ -153,25 +153,25 @@ implements <a href='../../../../../PropertyAccessStrategy.html'>PropertyAccessSt
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyAccess.html'>PropertyAccess</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org.hibernate.property.access.spi.PropertyAccess.html'>PropertyAccess</a></code></td>
                             <td class="colLast"><code><strong><a href="#buildPropertyAccess(java.lang.Class, java.lang.String)">buildPropertyAccess</a></strong>(java.lang.Class containerJavaType, java.lang.String propertyName)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Getter.html'>Getter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org.hibernate.property.access.spi.Getter.html'>Getter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getGetter()">getGetter</a></strong>()</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyAccessStrategy.html'>PropertyAccessStrategy</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org.hibernate.property.access.spi.PropertyAccessStrategy.html'>PropertyAccessStrategy</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyAccessStrategy()">getPropertyAccessStrategy</a></strong>()</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Setter.html'>Setter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org.hibernate.property.access.spi.Setter.html'>Setter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getSetter()">getSetter</a></strong>()</code><br></td>
                         </tr>
                         
@@ -228,7 +228,7 @@ implements <a href='../../../../../PropertyAccessStrategy.html'>PropertyAccessSt
                         <a name="buildPropertyAccess(java.lang.Class, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../PropertyAccess.html'>PropertyAccess</a> <strong>buildPropertyAccess</strong>(java.lang.Class containerJavaType, java.lang.String propertyName)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org.hibernate.property.access.spi.PropertyAccess.html'>PropertyAccess</a> <strong>buildPropertyAccess</strong>(java.lang.Class containerJavaType, java.lang.String propertyName)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -236,7 +236,7 @@ implements <a href='../../../../../PropertyAccessStrategy.html'>PropertyAccessSt
                         <a name="getGetter()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../Getter.html'>Getter</a> <strong>getGetter</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org.hibernate.property.access.spi.Getter.html'>Getter</a> <strong>getGetter</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -244,7 +244,7 @@ implements <a href='../../../../../PropertyAccessStrategy.html'>PropertyAccessSt
                         <a name="getPropertyAccessStrategy()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../PropertyAccessStrategy.html'>PropertyAccessStrategy</a> <strong>getPropertyAccessStrategy</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org.hibernate.property.access.spi.PropertyAccessStrategy.html'>PropertyAccessStrategy</a> <strong>getPropertyAccessStrategy</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -252,7 +252,7 @@ implements <a href='../../../../../PropertyAccessStrategy.html'>PropertyAccessSt
                         <a name="getSetter()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../Setter.html'>Setter</a> <strong>getSetter</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org.hibernate.property.access.spi.Setter.html'>Setter</a> <strong>getSetter</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html b/snapshot/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html
index a1ea24e660..a12c5f5ff3 100644
--- a/snapshot/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html
+++ b/snapshot/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../MetadataContributor.html'>MetadataContributor</a></dd>
+                <dd><a href='../../../../../org.hibernate.boot.spi.MetadataContributor.html'>MetadataContributor</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@java.lang.SuppressWarnings("WeakerAccess")
 public class GrailsDomainBinder
 extends java.lang.Object
-implements <a href='../../../../../MetadataContributor.html'>MetadataContributor</a></pre>
+implements <a href='../../../../../org.hibernate.boot.spi.MetadataContributor.html'>MetadataContributor</a></pre>
 
     <p> Handles the binding Grails domain classes and properties to the Hibernate runtime meta model.
  Based on the HbmBinder code in Hibernate core and influenced by AnnotationsBinder.
@@ -262,7 +262,7 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../MetadataBuildingContext.html'>MetadataBuildingContext</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org.hibernate.boot.spi.MetadataBuildingContext.html'>MetadataBuildingContext</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#metadataBuildingContext">metadataBuildingContext</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -333,7 +333,7 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)">addMultiTenantFilterIfNecessary</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> entity, <a href='../../../../../PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../ [...]
+                            <td class="colLast"><code><strong><a href="#addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">addMultiTenantFilterIfNecessary</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> entity, <a href='../../../../../org.hibernate.mapping.Persistent [...]
                         </tr>
                         
                         <tr class="rowColor">
@@ -345,20 +345,20 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindClass(org.grails.datastore.mapping.model.PersistentEntity, InFlightMetadataCollector, java.lang.String)">bindClass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</code><br>Binds a Grails domain class to [...]
+                            <td class="colLast"><code><strong><a href="#bindClass(org.grails.datastore.mapping.model.PersistentEntity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindClass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBean [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindClass(org.grails.datastore.mapping.model.PersistentEntity, PersistentClass, InFlightMetadataCollector)">bindClass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> domainClass, <a href='../../../../../PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mapp [...]
+                            <td class="colLast"><code><strong><a href="#bindClass(org.grails.datastore.mapping.model.PersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector)">bindClass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> domainClass, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../../.. [...]
  properties defined in the domain class</td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindCollection(org.grails.datastore.mapping.model.types.ToMany, java.util.Collection, PersistentClass, InFlightMetadataCollector, java.lang.String, java.lang.String)">bindCollection</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, java.util.Collection collection, <a href='../../../../../PersistentClass.html'>PersistentClass</a> owner, <a href='../../../.. [...]
+                            <td class="colLast"><code><strong><a href="#bindCollection(org.grails.datastore.mapping.model.types.ToMany, java.util.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String, java.lang.String)">bindCollection</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, java.util.Collection collection, <a href='../../../../../org.hibernate.mapping.Pe [...]
                         </tr>
                         
                         <tr class="rowColor">
@@ -370,263 +370,263 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, Map, java.util.Collection, java.lang.String)">bindCollectionSecondPass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Map&lt;?, ?&gt; persistentClas [...]
+                            <td class="colLast"><code><strong><a href="#bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, java.util.Collection, java.lang.String)">bindCollectionSecondPass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mapp [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindCollectionTable(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.Table, java.lang.String)">bindCollectionTable</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Collectio [...]
+                            <td class="colLast"><code><strong><a href="#bindCollectionTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.Table, java.lang.String)">bindCollectionTable</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetad [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindCollectionWithJoinTable(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)">bindCollectionWithJoinTable</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mapp [...]
+                            <td class="colLast"><code><strong><a href="#bindCollectionWithJoinTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)">bindCollectionWithJoinTable</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataColl [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindColumn(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, Column, org.grails.orm.hibernate.cfg.ColumnConfig, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String)">bindColumn</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org/grails [...]
+                            <td class="colLast"><code><strong><a href="#bindColumn(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.grails.orm.hibernate.cfg.ColumnConfig, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String)">bindColumn</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../ [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindColumnConfigToColumn(org.grails.datastore.mapping.model.PersistentProperty, Column, org.grails.orm.hibernate.cfg.ColumnConfig)">bindColumnConfigToColumn</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../org/grails/orm/hibernate/cfg/ColumnConfig.html'>Colum [...]
+                            <td class="colLast"><code><strong><a href="#bindColumnConfigToColumn(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.grails.orm.hibernate.cfg.ColumnConfig)">bindColumnConfigToColumn</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org/grail [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindComponent(Component, org.grails.datastore.mapping.model.types.Embedded, boolean, InFlightMetadataCollector, java.lang.String)">bindComponent</a></strong>(<a href='../../../../../Component.html'>Component</a> component, <a href='../../../../../org/grails/datastore/mapping/model/types/Embedded.html'>Embedded</a> property, boolean isNullable, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCo [...]
+                            <td class="colLast"><code><strong><a href="#bindComponent(org.hibernate.mapping.Component, org.grails.datastore.mapping.model.types.Embedded, boolean, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindComponent</a></strong>(<a href='../../../../../org.hibernate.mapping.Component.html'>Component</a> component, <a href='../../../../../org/grails/datastore/mapping/model/types/Embedded.html'>Embedded</a> property, boolean isNullable, <a href [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindComponentProperty(Component, org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, PersistentClass, java.lang.String, org.grails.orm.hibernate.cfg.Table, InFlightMetadataCollector, java.lang.String)">bindComponentProperty</a></strong>(<a href='../../../../../Component.html'>Component</a> component, <a href='../../../../../org/grails/datastore/mapping/model/P [...]
+                            <td class="colLast"><code><strong><a href="#bindComponentProperty(org.hibernate.mapping.Component, org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.PersistentClass, java.lang.String, org.grails.orm.hibernate.cfg.Table, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindComponentProperty</a></strong>(<a href='../../../../../org.hibernate.mapping.Component.ht [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindCompositeId(org.grails.datastore.mapping.model.PersistentEntity, RootClass, org.grails.orm.hibernate.cfg.CompositeIdentity, InFlightMetadataCollector, java.lang.String)">bindCompositeId</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> domainClass, <a href='../../../../../RootClass.html'>RootClass</a> root, <a href='../../../../../org/grails/orm/hi [...]
+                            <td class="colLast"><code><strong><a href="#bindCompositeId(org.grails.datastore.mapping.model.PersistentEntity, org.hibernate.mapping.RootClass, org.grails.orm.hibernate.cfg.CompositeIdentity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindCompositeId</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> domainClass, <a href='../../../../../org.hibernate.mapping.RootClass. [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindCompositeIdentifierToManyToOne(org.grails.datastore.mapping.model.types.Association, SimpleValue, org.grails.orm.hibernate.cfg.CompositeIdentity, org.grails.datastore.mapping.model.PersistentEntity, java.lang.String, java.lang.String)">bindCompositeIdentifierToManyToOne</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../.. [...]
+                            <td class="colLast"><code><strong><a href="#bindCompositeIdentifierToManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.SimpleValue, org.grails.orm.hibernate.cfg.CompositeIdentity, org.grails.datastore.mapping.model.PersistentEntity, java.lang.String, java.lang.String)">bindCompositeIdentifierToManyToOne</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, < [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindDependentKeyValue(org.grails.datastore.mapping.model.PersistentProperty, DependantValue, InFlightMetadataCollector, java.lang.String)">bindDependentKeyValue</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../DependantValue.html'>DependantValue</a> key, <a href='../../../../../InFlightMetadataCollector.html'>InFl [...]
+                            <td class="colLast"><code><strong><a href="#bindDependentKeyValue(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.DependantValue, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindDependentKeyValue</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org.hibernate.mapping.DependantValue.html'>DependantValue</a [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindDiscriminatorProperty(org.grails.orm.hibernate.cfg.Table, RootClass, InFlightMetadataCollector)">bindDiscriminatorProperty</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, <a href='../../../../../RootClass.html'>RootClass</a> entity, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings)</code><br>Creates and binds the discrimi [...]
+                            <td class="colLast"><code><strong><a href="#bindDiscriminatorProperty(org.grails.orm.hibernate.cfg.Table, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector)">bindDiscriminatorProperty</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, <a href='../../../../../org.hibernate.mapping.RootClass.html'>RootClass</a> entity, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollec [...]
  discriminate between sub class instances</td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindEnumType(org.grails.datastore.mapping.model.PersistentProperty, SimpleValue, java.lang.String, java.lang.String)">bindEnumType</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String path, java.lang.String sessionFactoryBeanName)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#bindEnumType(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.SimpleValue, java.lang.String, java.lang.String)">bindEnumType</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String path, java.lang.String sess [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindEnumType(org.grails.datastore.mapping.model.PersistentProperty, Class, SimpleValue, java.lang.String)">bindEnumType</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, java.lang.Class&lt;?&gt; propertyType, <a href='../../../../../SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String columnName)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#bindEnumType(org.grails.datastore.mapping.model.PersistentProperty, Class, org.hibernate.mapping.SimpleValue, java.lang.String)">bindEnumType</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, java.lang.Class&lt;?&gt; propertyType, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindIdentity(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, RootClass, InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)">bindIdentity</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../RootClass.html'>RootClass</a> root, <a href='../../../../../InFlightMetadataCo [...]
+                            <td class="colLast"><code><strong><a href="#bindIdentity(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)">bindIdentity</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../org.hibernate.mapping.RootClass.h [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindIndex(java.lang.String, Column, org.grails.orm.hibernate.cfg.ColumnConfig, org.grails.orm.hibernate.cfg.Table)">bindIndex</a></strong>(java.lang.String columnName, <a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../org/grails/orm/hibernate/cfg/ColumnConfig.html'>ColumnConfig</a> cc, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#bindIndex(java.lang.String, org.hibernate.mapping.Column, org.grails.orm.hibernate.cfg.ColumnConfig, org.grails.orm.hibernate.cfg.Table)">bindIndex</a></strong>(java.lang.String columnName, <a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org/grails/orm/hibernate/cfg/ColumnConfig.html'>ColumnConfig</a> cc, <a href='../../../../../org/grails/orm/hibernate/cfg/Table. [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindJoinedSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, JoinedSubclass, InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)">bindJoinedSubClass</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../JoinedSubclass.html'>JoinedSubclass</a> joinedSubclass, <a href='../. [...]
+                            <td class="colLast"><code><strong><a href="#bindJoinedSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.JoinedSubclass, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)">bindJoinedSubClass</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../org.hibernate.mapping.Jo [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, Map, org.hibernate.mapping.List, java.lang.String)">bindListSecondPass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Map&lt;?, ?&gt; persistentClasses, < [...]
+                            <td class="colLast"><code><strong><a href="#bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, org.hibernate.mapping.List, java.lang.String)">bindListSecondPass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings,  [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, InFlightMetadataCollector, java.lang.String)">bindManyToMany</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> element, <a href='../ [...]
+                            <td class="colLast"><code><strong><a href="#bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindManyToMany</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org.hibernate.mapping.ManyToOne.html'>ManyToOne</a> element, <a href='../../../../../org [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, java.lang.String, InFlightMetadataCollector, java.lang.String)">bindManyToOne</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> manyT [...]
+                            <td class="colLast"><code><strong><a href="#bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindManyToOne</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org.hibernate.mapping.ManyToOne.html'>ManyToOne</a> manyToOne, java.lang [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne)">bindManyToOneValues</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> manyToOne)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne)">bindManyToOneValues</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org.hibernate.mapping.ManyToOne.html'>ManyToOne</a> manyToOne)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, Map, org.hibernate.mapping.Map, java.lang.String)">bindMapSecondPass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Map&lt;?, ?&gt; persistentClasses, <a h [...]
+                            <td class="colLast"><code><strong><a href="#bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, org.hibernate.mapping.Map, java.lang.String)">bindMapSecondPass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, jav [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindNaturalIdentifier(org.grails.orm.hibernate.cfg.Table, org.grails.orm.hibernate.cfg.Mapping, PersistentClass)">bindNaturalIdentifier</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, <a href='../../../../../org/grails/orm/hibernate/cfg/Mapping.html'>Mapping</a> mapping, <a href='../../../../../PersistentClass.html'>PersistentClass</a> persistentClass)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#bindNaturalIdentifier(org.grails.orm.hibernate.cfg.Table, org.grails.orm.hibernate.cfg.Mapping, org.hibernate.mapping.PersistentClass)">bindNaturalIdentifier</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, <a href='../../../../../org/grails/orm/hibernate/cfg/Mapping.html'>Mapping</a> mapping, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentC [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindNumericColumnConstraints(Column, org.grails.datastore.mapping.model.PersistentProperty)">bindNumericColumnConstraints</a></strong>(<a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> constrainedProperty)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#bindNumericColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty)">bindNumericColumnConstraints</a></strong>(<a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> constrainedProperty)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindNumericColumnConstraints(Column, org.grails.datastore.mapping.model.PersistentProperty, org.grails.orm.hibernate.cfg.ColumnConfig)">bindNumericColumnConstraints</a></strong>(<a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org/grails/orm/hibernate/cfg/ColumnConfig.htm [...]
+                            <td class="colLast"><code><strong><a href="#bindNumericColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty, org.grails.orm.hibernate.cfg.ColumnConfig)">bindNumericColumnConstraints</a></strong>(<a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../o [...]
  precision and/or scale of the property's value.  </td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.grails.datastore.mapping.model.types.OneToMany, InFlightMetadataCollector)">bindOneToMany</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> currentGrailsProp, <a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> one, <a href='../../../../../InFlightM [...]
+                            <td class="colLast"><code><strong><a href="#bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.mapping.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)">bindOneToMany</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> currentGrailsProp, <a href='../../../../../org.hibernate.mapping.OneToMany.html'>OneToMany</a> one, <a href='../../../../../org.hibernate.boot.spi.I [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String, java.lang.String)">bindOneToOne</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> oneToOne, java.lang.String path, java.lang.Str [...]
+                            <td class="colLast"><code><strong><a href="#bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String, java.lang.String)">bindOneToOne</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, <a href='../../../../../org.hibernate.mapping.OneToOne.html'>OneToOne</a> oneToOne, java.lang.String path, java.lang.String sessionFactoryBeanName)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String)">bindOneToOneInternal</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> oneToOne, java.lang.String path)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)">bindOneToOneInternal</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, <a href='../../../../../org.hibernate.mapping.OneToOne.html'>OneToOne</a> oneToOne, java.lang.String path)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, InFlightMetadataCollector)">bindProperty</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProperty, <a href='../../../../../org/grails/datastore/mapping/config/Property.html'>Property</a> prop, <a href='../../../../../InFlightMet [...]
+                            <td class="colLast"><code><strong><a href="#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)">bindProperty</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProperty, <a href='../../../../../org/grails/datastore/mapping/config/Property.html'>Property</a> prop, <a href='../ [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindRoot(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, InFlightMetadataCollector, java.lang.String)">bindRoot</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> entity, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</code><br>Binds a root clas [...]
+                            <td class="colLast"><code><strong><a href="#bindRoot(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindRoot</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> entity, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessi [...]
  based on the supplied Grails domain class</td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindRootPersistentClassCommonValues(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, RootClass, InFlightMetadataCollector, java.lang.String)">bindRootPersistentClassCommonValues</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../RootClass.html'>RootClass</a> root, <a href='../../../../../InFlightMe [...]
+                            <td class="colLast"><code><strong><a href="#bindRootPersistentClassCommonValues(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindRootPersistentClassCommonValues</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../org.hibernate.mapping.Roo [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindSimpleId(org.grails.datastore.mapping.model.PersistentProperty, RootClass, InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Identity, java.lang.String)">bindSimpleId</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> identifier, <a href='../../../../../RootClass.html'>RootClass</a> entity, <a href='../../../../../InFlightMetadataCollector [...]
+                            <td class="colLast"><code><strong><a href="#bindSimpleId(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Identity, java.lang.String)">bindSimpleId</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> identifier, <a href='../../../../../org.hibernate.mapping.RootClass.html'>Root [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindSimpleValue(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, SimpleValue, java.lang.String, InFlightMetadataCollector, java.lang.String)">bindSimpleValue</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org/grails/datastore/mapping/model/PersistentPr [...]
+                            <td class="colLast"><code><strong><a href="#bindSimpleValue(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.SimpleValue, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindSimpleValue</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../or [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindSimpleValue(org.grails.datastore.mapping.model.PersistentProperty, SimpleValue, java.lang.String, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)">bindSimpleValue</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, <a href='../../../../../SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String path, <a href='../ [...]
+                            <td class="colLast"><code><strong><a href="#bindSimpleValue(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.SimpleValue, java.lang.String, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)">bindSimpleValue</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> simp [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindSimpleValue(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, SimpleValue, java.lang.String, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)">bindSimpleValue</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, <a href='../../../../../org/grails/datastore/mappin [...]
+                            <td class="colLast"><code><strong><a href="#bindSimpleValue(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.SimpleValue, java.lang.String, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)">bindSimpleValue</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, <a href='../../../../../org/g [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindSimpleValue(java.lang.String, SimpleValue, boolean, java.lang.String, InFlightMetadataCollector)">bindSimpleValue</a></strong>(java.lang.String type, <a href='../../../../../SimpleValue.html'>SimpleValue</a> simpleValue, boolean nullable, java.lang.String columnName, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings)</code><br>Binds a value for the specified parameters [...]
+                            <td class="colLast"><code><strong><a href="#bindSimpleValue(java.lang.String, org.hibernate.mapping.SimpleValue, boolean, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector)">bindSimpleValue</a></strong>(java.lang.String type, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> simpleValue, boolean nullable, java.lang.String columnName, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>In [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindStringColumnConstraints(Column, org.grails.datastore.mapping.model.PersistentProperty)">bindStringColumnConstraints</a></strong>(<a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> constrainedProperty)</code><br>Interrogates the specified constraints looking for any constraints that would limit the
+                            <td class="colLast"><code><strong><a href="#bindStringColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty)">bindStringColumnConstraints</a></strong>(<a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> constrainedProperty)</code><br>Interrogates the specified constraints looking fo [...]
  length of the property's value.  </td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)">bindSubClass</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../PersistentClass.html'>PersistentClass</a> parent, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMeta [...]
+                            <td class="colLast"><code><strong><a href="#bindSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindSubClass</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> parent, < [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, Subclass, InFlightMetadataCollector, java.lang.String)">bindSubClass</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../Subclass.html'>Subclass</a> subClass, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> m [...]
+                            <td class="colLast"><code><strong><a href="#bindSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.Subclass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindSubClass</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../org.hibernate.mapping.Subclass.html'>Subclass</a> subClass, <a href='../../../.. [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindSubClasses(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)">bindSubClasses</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../PersistentClass.html'>PersistentClass</a> parent, <a href='../../../../../InFlightMetadataCollector.html'> [...]
+                            <td class="colLast"><code><strong><a href="#bindSubClasses(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindSubClasses</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</ [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, InFlightMetadataCollector, java.util.Collection)">bindUnidirectionalOneToMany</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> property, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Collection collection)</code><br>Binds [...]
+                            <td class="colLast"><code><strong><a href="#bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection)">bindUnidirectionalOneToMany</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> property, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, ja [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.grails.datastore.mapping.model.types.ManyToOne)">bindUnidirectionalOneToManyInverseValues</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> manyToOne)</code><br> <DL><DT [...]
+                            <td class="colLast"><code><strong><a href="#bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.ManyToOne)">bindUnidirectionalOneToManyInverseValues</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.mapping.ManyToOne.html'>ManyToOne</a> manyToOne)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>prop [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindUnionSubclass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, UnionSubclass, InFlightMetadataCollector, java.lang.String)">bindUnionSubclass</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> subClass, <a href='../../../../../UnionSubclass.html'>UnionSubclass</a> unionSubclass, <a href='../../../../../InFlightMetadataCollector.ht [...]
+                            <td class="colLast"><code><strong><a href="#bindUnionSubclass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.UnionSubclass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindUnionSubclass</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> subClass, <a href='../../../../../org.hibernate.mapping.UnionSubclass.html'>UnionSubclass</a>  [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindVersion(org.grails.datastore.mapping.model.PersistentProperty, RootClass, InFlightMetadataCollector, java.lang.String)">bindVersion</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> version, <a href='../../../../../RootClass.html'>RootClass</a> entity, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mapping [...]
+                            <td class="colLast"><code><strong><a href="#bindVersion(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindVersion</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> version, <a href='../../../../../org.hibernate.mapping.RootClass.html'>RootClass</a> entity, <a href='../../../../../or [...]
                         </tr>
                         
                         <tr class="rowColor">
@@ -638,7 +638,7 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;java.lang.String</code></td>
-                            <td class="colLast"><code><strong><a href="#buildOrderByClause(java.lang.String, PersistentClass, java.lang.String, java.lang.String)">buildOrderByClause</a></strong>(java.lang.String hqlOrderBy, <a href='../../../../../PersistentClass.html'>PersistentClass</a> associatedClass, java.lang.String role, java.lang.String defaultOrder)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#buildOrderByClause(java.lang.String, org.hibernate.mapping.PersistentClass, java.lang.String, java.lang.String)">buildOrderByClause</a></strong>(java.lang.String hqlOrderBy, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> associatedClass, java.lang.String role, java.lang.String defaultOrder)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -687,7 +687,7 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#contribute(InFlightMetadataCollector, org.jboss.jandex.IndexView)">contribute</a></strong>(<a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> metadataCollector, <a href='../../../../../org.jboss.jandex.IndexView.html'>IndexView</a> jandexIndex)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#contribute(org.hibernate.boot.spi.InFlightMetadataCollector, org.jboss.jandex.IndexView)">contribute</a></strong>(<a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> metadataCollector, <a href='../../../../../org.jboss.jandex.IndexView.html'>IndexView</a> jandexIndex)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -699,13 +699,13 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;java.util.Collection</code></td>
-                            <td class="colLast"><code><strong><a href="#create(org.grails.datastore.mapping.model.types.ToMany, PersistentClass, java.lang.String, InFlightMetadataCollector, java.lang.String)">create</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../PersistentClass.html'>PersistentClass</a> owner, java.lang.String path, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMeta [...]
+                            <td class="colLast"><code><strong><a href="#create(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.PersistentClass, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">create</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> owner, java.lang.String path, < [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#createClassProperties(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)">createClassProperties</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../../../InFlightM [...]
+                            <td class="colLast"><code><strong><a href="#createClassProperties(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">createClassProperties</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>Per [...]
  and binds them to the Hibernate runtime meta model</td>
                         </tr>
                         
@@ -717,14 +717,14 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../DependantValue.html'>DependantValue</a></code></td>
-                            <td class="colLast"><code><strong><a href="#createPrimaryKeyValue(InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map)">createPrimaryKeyValue</a></strong>(<a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, java.util.Collection collection, java.ut [...]
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org.hibernate.mapping.DependantValue.html'>DependantValue</a></code></td>
+                            <td class="colLast"><code><strong><a href="#createPrimaryKeyValue(org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map)">createPrimaryKeyValue</a></strong>(<a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> prop [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/config/Property.html'>Property</a></code></td>
-                            <td class="colLast"><code><strong><a href="#createProperty(org.springframework.beans.factory.annotation.Value, PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, InFlightMetadataCollector)">createProperty</a></strong>(<a href='../../../../../org.springframework.beans.factory.annotation.Value.html'>Value</a> value, <a href='../../../../../PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../../../org/grails/datastore [...]
+                            <td class="colLast"><code><strong><a href="#createProperty(org.springframework.beans.factory.annotation.Value, org.hibernate.mapping.PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.boot.spi.InFlightMetadataCollector)">createProperty</a></strong>(<a href='../../../../../org.springframework.beans.factory.annotation.Value.html'>Value</a> value, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClas [...]
                         </tr>
                         
                         <tr class="rowColor">
@@ -759,8 +759,8 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../Column.html'>Column</a></code></td>
-                            <td class="colLast"><code><strong><a href="#getColumnForSimpleValue(SimpleValue)">getColumnForSimpleValue</a></strong>(<a href='../../../../../SimpleValue.html'>SimpleValue</a> element)</code><br></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org.hibernate.mapping.Column.html'>Column</a></code></td>
+                            <td class="colLast"><code><strong><a href="#getColumnForSimpleValue(org.hibernate.mapping.SimpleValue)">getColumnForSimpleValue</a></strong>(<a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> element)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -802,7 +802,7 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;java.lang.String</code></td>
-                            <td class="colLast"><code><strong><a href="#getJoinedSubClassTableName(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, org.grails.orm.hibernate.cfg.Table, InFlightMetadataCollector, java.lang.String)">getJoinedSubClassTableName</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../PersistentClass.html'>PersistentClass</a> model, <a hr [...]
+                            <td class="colLast"><code><strong><a href="#getJoinedSubClassTableName(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.grails.orm.hibernate.cfg.Table, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">getJoinedSubClassTableName</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../org.hiber [...]
                         </tr>
                         
                         <tr class="altColor">
@@ -837,7 +837,7 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../MetadataBuildingContext.html'>MetadataBuildingContext</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org.hibernate.boot.spi.MetadataBuildingContext.html'>MetadataBuildingContext</a></code></td>
                             <td class="colLast"><code><strong><a href="#getMetadataBuildingContext()">getMetadataBuildingContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -856,7 +856,7 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/config/Property.html'>Property</a></code></td>
-                            <td class="colLast"><code><strong><a href="#getProperty(PersistentClass, java.lang.String)">getProperty</a></strong>(<a href='../../../../../PersistentClass.html'>PersistentClass</a> associatedClass, java.lang.String propertyName)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#getProperty(org.hibernate.mapping.PersistentClass, java.lang.String)">getProperty</a></strong>(<a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> associatedClass, java.lang.String propertyName)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -904,7 +904,7 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#handleUniqueConstraint(org.grails.datastore.mapping.model.PersistentProperty, Column, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String, java.lang.String)">handleUniqueConstraint</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../Column.html'>Column</a> column, java.lang.String path, <a href='.. [...]
+                            <td class="colLast"><code><strong><a href="#handleUniqueConstraint(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String, java.lang.String)">handleUniqueConstraint</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org.hibernate.mapping.Column.html'>Column</a [...]
                         </tr>
                         
                         <tr class="rowColor">
@@ -1006,13 +1006,13 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#linkBidirectionalOneToMany(java.util.Collection, PersistentClass, DependantValue, org.grails.datastore.mapping.model.PersistentProperty)">linkBidirectionalOneToMany</a></strong>(java.util.Collection collection, <a href='../../../../../PersistentClass.html'>PersistentClass</a> associatedClass, <a href='../../../../../DependantValue.html'>DependantValue</a> key, <a href='../../../../../org/grails/datastore/mapping/mode [...]
+                            <td class="colLast"><code><strong><a href="#linkBidirectionalOneToMany(java.util.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.mapping.DependantValue, org.grails.datastore.mapping.model.PersistentProperty)">linkBidirectionalOneToMany</a></strong>(java.util.Collection collection, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> associatedClass, <a href='../../../../../org.hibernate.mapping.DependantValue [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#linkValueUsingAColumnCopy(org.grails.datastore.mapping.model.PersistentProperty, Column, DependantValue)">linkValueUsingAColumnCopy</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> prop, <a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../DependantValue.html'>DependantValue</a> key)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#linkValueUsingAColumnCopy(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.hibernate.mapping.DependantValue)">linkValueUsingAColumnCopy</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> prop, <a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org.hibernate.ma [...]
                         </tr>
                         
                         <tr class="rowColor">
@@ -1048,7 +1048,7 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setGeneratedUniqueName(UniqueKey)">setGeneratedUniqueName</a></strong>(<a href='../../../../../UniqueKey.html'>UniqueKey</a> uk)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#setGeneratedUniqueName(org.hibernate.mapping.UniqueKey)">setGeneratedUniqueName</a></strong>(<a href='../../../../../org.hibernate.mapping.UniqueKey.html'>UniqueKey</a> uk)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1060,7 +1060,7 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setTypeForPropertyConfig(org.grails.datastore.mapping.model.PersistentProperty, SimpleValue, org.grails.orm.hibernate.cfg.PropertyConfig)">setTypeForPropertyConfig</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, <a href='../../../../../SimpleValue.html'>SimpleValue</a> simpleValue, <a href='../../../../../org/grails/orm/hibernate/cfg/ [...]
+                            <td class="colLast"><code><strong><a href="#setTypeForPropertyConfig(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.SimpleValue, org.grails.orm.hibernate.cfg.PropertyConfig)">setTypeForPropertyConfig</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> simpleValue, <a href=' [...]
                         </tr>
                         
                         <tr class="rowColor">
@@ -1305,7 +1305,7 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <a name="metadataBuildingContext"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../MetadataBuildingContext.html'>MetadataBuildingContext</a> <strong>metadataBuildingContext</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.hibernate.boot.spi.MetadataBuildingContext.html'>MetadataBuildingContext</a> <strong>metadataBuildingContext</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1363,10 +1363,10 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                 </a>
                     <h3>Method Detail</h3>
                     
-                        <a name="addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>addMultiTenantFilterIfNecessary</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> entity, <a href='../../../../../PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>addMultiTenantFilterIfNecessary</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> entity, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p> Add a Hibernate filter for multitenancy if the persistent class is multitenant
       <DL><DT><B>Parameters:</B></DT><DD><code>entity</code> -  target persistent entity for get tenant information</DD><DD><code>persistentClass</code> -  persistent class for add the filter and get tenant property info</DD><DD><code>mappings</code> -  mappings to add the filter</DD><DD><code>sessionFactoryBeanName</code> -  the session factory bean name</DD></DL></p>
                             </li>
@@ -1380,29 +1380,29 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="bindClass(org.grails.datastore.mapping.model.PersistentEntity, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindClass(org.grails.datastore.mapping.model.PersistentEntity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>bindClass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>public&nbsp;void <strong>bindClass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p> Binds a Grails domain class to the Hibernate runtime meta model<DL><DT><B>throws:</B></DT><DD>MappingException Thrown if the domain class uses inheritance which is not supported</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>entity</code> -  The domain class to bind</DD><DD><code>mappings</code> -     The existing mappings</DD><DD><code>sessionFactoryBeanName</code> -   the session factory bean name</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindClass(org.grails.datastore.mapping.model.PersistentEntity, PersistentClass, InFlightMetadataCollector)"><!-- --></a>
+                        <a name="bindClass(org.grails.datastore.mapping.model.PersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindClass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> domainClass, <a href='../../../../../PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings)</h4>
+                                <h4>protected&nbsp;void <strong>bindClass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> domainClass, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings)</h4>
                                 <p> Binds the specified persistant class to the runtime model based on the
  properties defined in the domain class
       <DL><DT><B>Parameters:</B></DT><DD><code>domainClass</code> -      The Grails domain class</DD><DD><code>persistentClass</code> -  The persistant class</DD><DD><code>mappings</code> -         Existing mappings</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindCollection(org.grails.datastore.mapping.model.types.ToMany, java.util.Collection, PersistentClass, InFlightMetadataCollector, java.lang.String, java.lang.String)"><!-- --></a>
+                        <a name="bindCollection(org.grails.datastore.mapping.model.types.ToMany, java.util.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindCollection</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, java.util.Collection collection, <a href='../../../../../PersistentClass.html'>PersistentClass</a> owner, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String path, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindCollection</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, java.util.Collection collection, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> owner, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String path, java.lang.String sessionFactoryBean [...]
                                 <p> First pass to bind collection to Hibernate metamodel, sets up second pass
       <DL><DT><B>Parameters:</B></DT><DD><code>property</code> -    The GrailsDomainClassProperty instance</DD><DD><code>collection</code> -  The collection</DD><DD><code>owner</code> -       The owning persistent class</DD><DD><code>mappings</code> -    The Hibernate mappings instance</DD><DD>path</DD></DL></p>
                             </li>
@@ -1416,152 +1416,152 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, Map, java.util.Collection, java.lang.String)"><!-- --></a>
+                        <a name="bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, java.util.Collection, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindCollectionSecondPass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Map&lt;?, ?&gt; persistentClasses, java.util.Collection collection, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindCollectionSecondPass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Map&lt;?, ?&gt; persistentClasses, java.util.Collection collection, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindCollectionTable(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.Table, java.lang.String)"><!-- --></a>
+                        <a name="bindCollectionTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.Table, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindCollectionTable</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Collection collection, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> ownerTable, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindCollectionTable</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Collection collection, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> ownerTable, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindCollectionWithJoinTable(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)"><!-- --></a>
+                        <a name="bindCollectionWithJoinTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindCollectionWithJoinTable</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Collection collection, <a href='../../../../../org/grails/orm/hibernate/cfg/PropertyConfig.html'>PropertyConfig</a> config, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindCollectionWithJoinTable</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Collection collection, <a href='../../../../../org/grails/orm/hibernate/cfg/PropertyConfig.html'>PropertyConfig</a> config, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindColumn(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, Column, org.grails.orm.hibernate.cfg.ColumnConfig, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String)"><!-- --></a>
+                        <a name="bindColumn(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.grails.orm.hibernate.cfg.ColumnConfig, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindColumn</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> parentProperty, <a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../org/grails/orm/hibernate/cfg/ColumnConfig.html'>ColumnConfig</a> cc, java.lang.String pa [...]
+                                <h4>protected&nbsp;void <strong>bindColumn</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> parentProperty, <a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org/grails/orm/hibernate/cfg/ColumnConfig.html'>ColumnConfig</a> c [...]
                                 <p> Binds a Column instance to the Hibernate meta model
       <DL><DT><B>Parameters:</B></DT><DD><code>property</code> -  The Grails domain class property</DD><DD>parentProperty</DD><DD><code>column</code> -      The column to bind</DD><DD>path</DD><DD><code>table</code> -       The table name</DD><DD><code>sessionFactoryBeanName</code> -   the session factory bean name</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindColumnConfigToColumn(org.grails.datastore.mapping.model.PersistentProperty, Column, org.grails.orm.hibernate.cfg.ColumnConfig)"><!-- --></a>
+                        <a name="bindColumnConfigToColumn(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.grails.orm.hibernate.cfg.ColumnConfig)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindColumnConfigToColumn</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../org/grails/orm/hibernate/cfg/ColumnConfig.html'>ColumnConfig</a> columnConfig)</h4>
+                                <h4>protected&nbsp;void <strong>bindColumnConfigToColumn</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org/grails/orm/hibernate/cfg/ColumnConfig.html'>ColumnConfig</a> columnConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindComponent(Component, org.grails.datastore.mapping.model.types.Embedded, boolean, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindComponent(org.hibernate.mapping.Component, org.grails.datastore.mapping.model.types.Embedded, boolean, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindComponent</strong>(<a href='../../../../../Component.html'>Component</a> component, <a href='../../../../../org/grails/datastore/mapping/model/types/Embedded.html'>Embedded</a> property, boolean isNullable, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindComponent</strong>(<a href='../../../../../org.hibernate.mapping.Component.html'>Component</a> component, <a href='../../../../../org/grails/datastore/mapping/model/types/Embedded.html'>Embedded</a> property, boolean isNullable, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p> Binds a Hibernate component type using the given GrailsDomainClassProperty instance
       <DL><DT><B>Parameters:</B></DT><DD><code>component</code> -   The component to bind</DD><DD><code>property</code> -    The property</DD><DD><code>isNullable</code> -  Whether it is nullable or not</DD><DD><code>mappings</code> -    The Hibernate Mappings object</DD><DD><code>sessionFactoryBeanName</code> -   the session factory bean name</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindComponentProperty(Component, org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, PersistentClass, java.lang.String, org.grails.orm.hibernate.cfg.Table, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindComponentProperty(org.hibernate.mapping.Component, org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.PersistentClass, java.lang.String, org.grails.orm.hibernate.cfg.Table, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindComponentProperty</strong>(<a href='../../../../../Component.html'>Component</a> component, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> componentProperty, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> currentGrailsProp, <a href='../../../../../PersistentClass.html'>PersistentClass</a> persistentClas [...]
+                                <h4>protected&nbsp;void <strong>bindComponentProperty</strong>(<a href='../../../../../org.hibernate.mapping.Component.html'>Component</a> component, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> componentProperty, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> currentGrailsProp, <a href='../../../../../org.hibernate.mapping.PersistentCl [...]
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindCompositeId(org.grails.datastore.mapping.model.PersistentEntity, RootClass, org.grails.orm.hibernate.cfg.CompositeIdentity, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindCompositeId(org.grails.datastore.mapping.model.PersistentEntity, org.hibernate.mapping.RootClass, org.grails.orm.hibernate.cfg.CompositeIdentity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindCompositeId</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> domainClass, <a href='../../../../../RootClass.html'>RootClass</a> root, <a href='../../../../../org/grails/orm/hibernate/cfg/CompositeIdentity.html'>CompositeIdentity</a> compositeIdentity, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.Str [...]
+                                <h4>protected&nbsp;void <strong>bindCompositeId</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> domainClass, <a href='../../../../../org.hibernate.mapping.RootClass.html'>RootClass</a> root, <a href='../../../../../org/grails/orm/hibernate/cfg/CompositeIdentity.html'>CompositeIdentity</a> compositeIdentity, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlight [...]
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindCompositeIdentifierToManyToOne(org.grails.datastore.mapping.model.types.Association, SimpleValue, org.grails.orm.hibernate.cfg.CompositeIdentity, org.grails.datastore.mapping.model.PersistentEntity, java.lang.String, java.lang.String)"><!-- --></a>
+                        <a name="bindCompositeIdentifierToManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.SimpleValue, org.grails.orm.hibernate.cfg.CompositeIdentity, org.grails.datastore.mapping.model.PersistentEntity, java.lang.String, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindCompositeIdentifierToManyToOne</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../SimpleValue.html'>SimpleValue</a> value, <a href='../../../../../org/grails/orm/hibernate/cfg/CompositeIdentity.html'>CompositeIdentity</a> compositeId, <a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity [...]
+                                <h4>protected&nbsp;void <strong>bindCompositeIdentifierToManyToOne</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> value, <a href='../../../../../org/grails/orm/hibernate/cfg/CompositeIdentity.html'>CompositeIdentity</a> compositeId, <a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity. [...]
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindDependentKeyValue(org.grails.datastore.mapping.model.PersistentProperty, DependantValue, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindDependentKeyValue(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.DependantValue, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindDependentKeyValue</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../DependantValue.html'>DependantValue</a> key, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindDependentKeyValue</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org.hibernate.mapping.DependantValue.html'>DependantValue</a> key, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p> Binds the primary key value column
       <DL><DT><B>Parameters:</B></DT><DD><code>property</code> -  The property</DD><DD><code>key</code> -       The key</DD><DD><code>mappings</code> -  The mappings</DD><DD><code>sessionFactoryBeanName</code> -  The name of the session factory</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindDiscriminatorProperty(org.grails.orm.hibernate.cfg.Table, RootClass, InFlightMetadataCollector)"><!-- --></a>
+                        <a name="bindDiscriminatorProperty(org.grails.orm.hibernate.cfg.Table, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindDiscriminatorProperty</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, <a href='../../../../../RootClass.html'>RootClass</a> entity, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings)</h4>
+                                <h4>protected&nbsp;void <strong>bindDiscriminatorProperty</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, <a href='../../../../../org.hibernate.mapping.RootClass.html'>RootClass</a> entity, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings)</h4>
                                 <p> Creates and binds the discriminator property used in table-per-hierarchy inheritance to
  discriminate between sub class instances
       <DL><DT><B>Parameters:</B></DT><DD><code>table</code> -     The table to bind onto</DD><DD><code>entity</code> -    The root class entity</DD><DD><code>mappings</code> -  The mappings instance</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindEnumType(org.grails.datastore.mapping.model.PersistentProperty, SimpleValue, java.lang.String, java.lang.String)"><!-- --></a>
+                        <a name="bindEnumType(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.SimpleValue, java.lang.String, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindEnumType</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String path, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindEnumType</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String path, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindEnumType(org.grails.datastore.mapping.model.PersistentProperty, Class, SimpleValue, java.lang.String)"><!-- --></a>
+                        <a name="bindEnumType(org.grails.datastore.mapping.model.PersistentProperty, Class, org.hibernate.mapping.SimpleValue, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindEnumType</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, java.lang.Class&lt;?&gt; propertyType, <a href='../../../../../SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String columnName)</h4>
+                                <h4>protected&nbsp;void <strong>bindEnumType</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, java.lang.Class&lt;?&gt; propertyType, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String columnName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindIdentity(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, RootClass, InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)"><!-- --></a>
+                        <a name="bindIdentity(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindIdentity</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../RootClass.html'>RootClass</a> root, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, <a href='../../../../../org/grails/orm/hibernate/cfg/Mapping.html'>Mapping</a> gormMapping, java.lang.String sessionFactor [...]
+                                <h4>protected&nbsp;void <strong>bindIdentity</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../org.hibernate.mapping.RootClass.html'>RootClass</a> root, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, <a href='../../../../../org/grails/orm/hibernate/cfg/Mapping.html'>Mapping</a [...]
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindIndex(java.lang.String, Column, org.grails.orm.hibernate.cfg.ColumnConfig, org.grails.orm.hibernate.cfg.Table)"><!-- --></a>
+                        <a name="bindIndex(java.lang.String, org.hibernate.mapping.Column, org.grails.orm.hibernate.cfg.ColumnConfig, org.grails.orm.hibernate.cfg.Table)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindIndex</strong>(java.lang.String columnName, <a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../org/grails/orm/hibernate/cfg/ColumnConfig.html'>ColumnConfig</a> cc, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table)</h4>
+                                <h4>protected&nbsp;void <strong>bindIndex</strong>(java.lang.String columnName, <a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org/grails/orm/hibernate/cfg/ColumnConfig.html'>ColumnConfig</a> cc, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindJoinedSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, JoinedSubclass, InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)"><!-- --></a>
+                        <a name="bindJoinedSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.JoinedSubclass, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Mapping, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindJoinedSubClass</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../JoinedSubclass.html'>JoinedSubclass</a> joinedSubclass, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, <a href='../../../../../org/grails/orm/hibernate/cfg/Mapping.html'>Mapping</a> gormMapping, java.lang.St [...]
+                                <h4>protected&nbsp;void <strong>bindJoinedSubClass</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../org.hibernate.mapping.JoinedSubclass.html'>JoinedSubclass</a> joinedSubclass, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, <a href='../../../../../org/grails/orm/hibernate/cfg/Mappin [...]
                                 <p> Binds a joined sub-class mapping using table-per-subclass
       <DL><DT><B>Parameters:</B></DT><DD><code>sub</code> -             The Grails sub class</DD><DD><code>joinedSubclass</code> -  The Hibernate Subclass object</DD><DD><code>mappings</code> -        The mappings Object</DD><DD><code>gormMapping</code> -     The GORM mapping object</DD><DD><code>sessionFactoryBeanName</code> -   the session factory bean name</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, Map, org.hibernate.mapping.List, java.lang.String)"><!-- --></a>
+                        <a name="bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, org.hibernate.mapping.List, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindListSecondPass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Map&lt;?, ?&gt; persistentClasses, <a href='../../../../../org.hibernate.mapping.List.html'>List</a> list, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindListSecondPass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Map&lt;?, ?&gt; persistentClasses, <a href='../../../../../org.hibernate.mapping.List.html'>List</a> list, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindManyToMany</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> element, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindManyToMany</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org.hibernate.mapping.ManyToOne.html'>ManyToOne</a> element, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p> Binds a many-to-many relationship. A many-to-many consists of
  - a key (a DependentValue)
  - an element
@@ -1571,53 +1571,53 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, java.lang.String, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.SuppressWarnings("unchecked")<br>protected&nbsp;void <strong>bindManyToOne</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> manyToOne, java.lang.String path, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFac [...]
+                                <h4>@java.lang.SuppressWarnings("unchecked")<br>protected&nbsp;void <strong>bindManyToOne</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org.hibernate.mapping.ManyToOne.html'>ManyToOne</a> manyToOne, java.lang.String path, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessio [...]
                                 <p> Binds a many-to-one relationship to the
 
      </p>
                             </li>
                         </ul>
                     
-                        <a name="bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne)"><!-- --></a>
+                        <a name="bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindManyToOneValues</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> manyToOne)</h4>
+                                <h4>protected&nbsp;void <strong>bindManyToOneValues</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org.hibernate.mapping.ManyToOne.html'>ManyToOne</a> manyToOne)</h4>
                                 <p>
      </p>
                             </li>
                         </ul>
                     
-                        <a name="bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, InFlightMetadataCollector, Map, org.hibernate.mapping.Map, java.lang.String)"><!-- --></a>
+                        <a name="bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, org.hibernate.mapping.Map, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindMapSecondPass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Map&lt;?, ?&gt; persistentClasses, <a href='../../../../../org.hibernate.mapping.Map.html'>Map</a> map, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindMapSecondPass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Map&lt;?, ?&gt; persistentClasses, <a href='../../../../../org.hibernate.mapping.Map.html'>Map</a> map, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindNaturalIdentifier(org.grails.orm.hibernate.cfg.Table, org.grails.orm.hibernate.cfg.Mapping, PersistentClass)"><!-- --></a>
+                        <a name="bindNaturalIdentifier(org.grails.orm.hibernate.cfg.Table, org.grails.orm.hibernate.cfg.Mapping, org.hibernate.mapping.PersistentClass)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindNaturalIdentifier</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, <a href='../../../../../org/grails/orm/hibernate/cfg/Mapping.html'>Mapping</a> mapping, <a href='../../../../../PersistentClass.html'>PersistentClass</a> persistentClass)</h4>
+                                <h4>protected&nbsp;void <strong>bindNaturalIdentifier</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, <a href='../../../../../org/grails/orm/hibernate/cfg/Mapping.html'>Mapping</a> mapping, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> persistentClass)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindNumericColumnConstraints(Column, org.grails.datastore.mapping.model.PersistentProperty)"><!-- --></a>
+                        <a name="bindNumericColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindNumericColumnConstraints</strong>(<a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> constrainedProperty)</h4>
+                                <h4>protected&nbsp;void <strong>bindNumericColumnConstraints</strong>(<a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> constrainedProperty)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindNumericColumnConstraints(Column, org.grails.datastore.mapping.model.PersistentProperty, org.grails.orm.hibernate.cfg.ColumnConfig)"><!-- --></a>
+                        <a name="bindNumericColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty, org.grails.orm.hibernate.cfg.ColumnConfig)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindNumericColumnConstraints</strong>(<a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org/grails/orm/hibernate/cfg/ColumnConfig.html'>ColumnConfig</a> cc)</h4>
+                                <h4>protected&nbsp;void <strong>bindNumericColumnConstraints</strong>(<a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org/grails/orm/hibernate/cfg/ColumnConfig.html'>ColumnConfig</a> cc)</h4>
                                 <p> Interrogates the specified constraints looking for any constraints that would limit the
  precision and/or scale of the property's value.  If such constraints exist, this method adjusts
  the precision and/or scale of the column accordingly.
@@ -1625,104 +1625,104 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.grails.datastore.mapping.model.types.OneToMany, InFlightMetadataCollector)"><!-- --></a>
+                        <a name="bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.mapping.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindOneToMany</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> currentGrailsProp, <a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> one, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings)</h4>
+                                <h4>protected&nbsp;void <strong>bindOneToMany</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> currentGrailsProp, <a href='../../../../../org.hibernate.mapping.OneToMany.html'>OneToMany</a> one, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String, java.lang.String)"><!-- --></a>
+                        <a name="bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindOneToOne</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> oneToOne, java.lang.String path, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindOneToOne</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, <a href='../../../../../org.hibernate.mapping.OneToOne.html'>OneToOne</a> oneToOne, java.lang.String path, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String)"><!-- --></a>
+                        <a name="bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindOneToOneInternal</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> oneToOne, java.lang.String path)</h4>
+                                <h4>protected&nbsp;void <strong>bindOneToOneInternal</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, <a href='../../../../../org.hibernate.mapping.OneToOne.html'>OneToOne</a> oneToOne, java.lang.String path)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, InFlightMetadataCollector)"><!-- --></a>
+                        <a name="bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindProperty</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProperty, <a href='../../../../../org/grails/datastore/mapping/config/Property.html'>Property</a> prop, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings)</h4>
+                                <h4>protected&nbsp;void <strong>bindProperty</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProperty, <a href='../../../../../org/grails/datastore/mapping/config/Property.html'>Property</a> prop, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings)</h4>
                                 <p> Binds a property to Hibernate runtime meta model. Deals with cascade strategy based on the Grails domain model
       <DL><DT><B>Parameters:</B></DT><DD><code>grailsProperty</code> -  The grails property instance</DD><DD><code>prop</code> -            The Hibernate property</DD><DD><code>mappings</code> -        The Hibernate mappings</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindRoot(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindRoot(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>bindRoot</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> entity, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>public&nbsp;void <strong>bindRoot</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> entity, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p> Binds a root class (one with no super classes) to the runtime meta model
  based on the supplied Grails domain class
       <DL><DT><B>Parameters:</B></DT><DD><code>entity</code> -  The Grails domain class</DD><DD><code>mappings</code> -     The Hibernate Mappings object</DD><DD><code>sessionFactoryBeanName</code> -   the session factory bean name</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindRootPersistentClassCommonValues(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, RootClass, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindRootPersistentClassCommonValues(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindRootPersistentClassCommonValues</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../RootClass.html'>RootClass</a> root, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindRootPersistentClassCommonValues</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../org.hibernate.mapping.RootClass.html'>RootClass</a> root, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindSimpleId(org.grails.datastore.mapping.model.PersistentProperty, RootClass, InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Identity, java.lang.String)"><!-- --></a>
+                        <a name="bindSimpleId(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.orm.hibernate.cfg.Identity, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.SuppressWarnings("unchecked")<br>protected&nbsp;void <strong>bindSimpleId</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> identifier, <a href='../../../../../RootClass.html'>RootClass</a> entity, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, <a href='../../../../../org/grails/orm/hibernate/cfg/Identity.html'>Identity</a> mapp [...]
+                                <h4>@java.lang.SuppressWarnings("unchecked")<br>protected&nbsp;void <strong>bindSimpleId</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> identifier, <a href='../../../../../org.hibernate.mapping.RootClass.html'>RootClass</a> entity, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, <a href='../../../../../org/grails/orm/h [...]
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindSimpleValue(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, SimpleValue, java.lang.String, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindSimpleValue(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.SimpleValue, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindSimpleValue</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> parentProperty, <a href='../../../../../SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String path, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetad [...]
+                                <h4>protected&nbsp;void <strong>bindSimpleValue</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> parentProperty, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String path, <a href='../../../../../org.hibernate.boot.spi. [...]
                                 <p> Binds a simple value to the Hibernate metamodel. A simple value is
  any type within the Hibernate type system
       <DL><DT><B>Parameters:</B></DT><DD>property</DD><DD>parentProperty</DD><DD><code>simpleValue</code> -  The simple value to bind</DD><DD>path</DD><DD><code>mappings</code> -     The Hibernate mappings instance</DD><DD><code>sessionFactoryBeanName</code> -   the session factory bean name</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindSimpleValue(org.grails.datastore.mapping.model.PersistentProperty, SimpleValue, java.lang.String, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)"><!-- --></a>
+                        <a name="bindSimpleValue(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.SimpleValue, java.lang.String, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindSimpleValue</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, <a href='../../../../../SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String path, <a href='../../../../../org/grails/orm/hibernate/cfg/PropertyConfig.html'>PropertyConfig</a> propertyConfig, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindSimpleValue</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String path, <a href='../../../../../org/grails/orm/hibernate/cfg/PropertyConfig.html'>PropertyConfig</a> propertyConfig, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindSimpleValue(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, SimpleValue, java.lang.String, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)"><!-- --></a>
+                        <a name="bindSimpleValue(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.SimpleValue, java.lang.String, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindSimpleValue</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> parentProperty, <a href='../../../../../SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String path, <a href='../../../../../org/grails/orm/hibernate/cfg/PropertyConfig [...]
+                                <h4>protected&nbsp;void <strong>bindSimpleValue</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> parentProperty, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> simpleValue, java.lang.String path, <a href='../../../../../org/grails/orm/hibern [...]
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindSimpleValue(java.lang.String, SimpleValue, boolean, java.lang.String, InFlightMetadataCollector)"><!-- --></a>
+                        <a name="bindSimpleValue(java.lang.String, org.hibernate.mapping.SimpleValue, boolean, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindSimpleValue</strong>(java.lang.String type, <a href='../../../../../SimpleValue.html'>SimpleValue</a> simpleValue, boolean nullable, java.lang.String columnName, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings)</h4>
+                                <h4>protected&nbsp;void <strong>bindSimpleValue</strong>(java.lang.String type, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> simpleValue, boolean nullable, java.lang.String columnName, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings)</h4>
                                 <p> Binds a value for the specified parameters to the meta model.
       <DL><DT><B>Parameters:</B></DT><DD><code>type</code> -         The type of the property</DD><DD><code>simpleValue</code> -  The simple value instance</DD><DD><code>nullable</code> -     Whether it is nullable</DD><DD><code>columnName</code> -   The property name</DD><DD><code>mappings</code> -     The mappings</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindStringColumnConstraints(Column, org.grails.datastore.mapping.model.PersistentProperty)"><!-- --></a>
+                        <a name="bindStringColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindStringColumnConstraints</strong>(<a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> constrainedProperty)</h4>
+                                <h4>protected&nbsp;void <strong>bindStringColumnConstraints</strong>(<a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> constrainedProperty)</h4>
                                 <p> Interrogates the specified constraints looking for any constraints that would limit the
  length of the property's value.  If such constraints exist, this method adjusts the length
  of the column accordingly.
@@ -1730,63 +1730,63 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="bindSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindSubClass</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../PersistentClass.html'>PersistentClass</a> parent, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindSubClass</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> parent, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p> Binds a sub class.
       <DL><DT><B>Parameters:</B></DT><DD><code>sub</code> -       The sub domain class instance</DD><DD><code>parent</code> -    The parent persistent class instance</DD><DD><code>mappings</code> -  The mappings instance</DD><DD><code>sessionFactoryBeanName</code> -   the session factory bean name</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, Subclass, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindSubClass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.Subclass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindSubClass</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../Subclass.html'>Subclass</a> subClass, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindSubClass</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../org.hibernate.mapping.Subclass.html'>Subclass</a> subClass, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p> Binds a sub-class using table-per-hierarchy inheritance mapping
       <DL><DT><B>Parameters:</B></DT><DD><code>sub</code> -       The Grails domain class instance representing the sub-class</DD><DD><code>subClass</code> -  The Hibernate SubClass instance</DD><DD><code>mappings</code> -  The mappings instance</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindSubClasses(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindSubClasses(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindSubClasses</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../PersistentClass.html'>PersistentClass</a> parent, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindSubClasses</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> parent, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p> Binds the sub classes of a root class using table-per-heirarchy inheritance mapping
       <DL><DT><B>Parameters:</B></DT><DD><code>domainClass</code> -  The root domain class to bind</DD><DD><code>parent</code> -       The parent class instance</DD><DD><code>mappings</code> -     The mappings instance</DD><DD><code>sessionFactoryBeanName</code> -   the session factory bean name</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, InFlightMetadataCollector, java.util.Collection)"><!-- --></a>
+                        <a name="bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindUnidirectionalOneToMany</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> property, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Collection collection)</h4>
+                                <h4>protected&nbsp;void <strong>bindUnidirectionalOneToMany</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> property, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.util.Collection collection)</h4>
                                 <p> Binds a unidirectional one-to-many creating a psuedo back reference property in the process.
       <DL><DT><B>Parameters:</B></DT><DD>property</DD><DD>mappings</DD><DD>collection</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.grails.datastore.mapping.model.types.ManyToOne)"><!-- --></a>
+                        <a name="bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.ManyToOne)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindUnidirectionalOneToManyInverseValues</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> manyToOne)</h4>
+                                <h4>protected&nbsp;void <strong>bindUnidirectionalOneToManyInverseValues</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.mapping.ManyToOne.html'>ManyToOne</a> manyToOne)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>property</code> -  The property to bind</DD><DD><code>manyToOne</code> -  The inverse side</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="bindUnionSubclass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, UnionSubclass, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindUnionSubclass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.UnionSubclass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>bindUnionSubclass</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> subClass, <a href='../../../../../UnionSubclass.html'>UnionSubclass</a> unionSubclass, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>public&nbsp;void <strong>bindUnionSubclass</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> subClass, <a href='../../../../../org.hibernate.mapping.UnionSubclass.html'>UnionSubclass</a> unionSubclass, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindVersion(org.grails.datastore.mapping.model.PersistentProperty, RootClass, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindVersion(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.RootClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindVersion</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> version, <a href='../../../../../RootClass.html'>RootClass</a> entity, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindVersion</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> version, <a href='../../../../../org.hibernate.mapping.RootClass.html'>RootClass</a> entity, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1799,10 +1799,10 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="buildOrderByClause(java.lang.String, PersistentClass, java.lang.String, java.lang.String)"><!-- --></a>
+                        <a name="buildOrderByClause(java.lang.String, org.hibernate.mapping.PersistentClass, java.lang.String, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.SuppressWarnings("unchecked")<br>protected&nbsp;java.lang.String <strong>buildOrderByClause</strong>(java.lang.String hqlOrderBy, <a href='../../../../../PersistentClass.html'>PersistentClass</a> associatedClass, java.lang.String role, java.lang.String defaultOrder)</h4>
+                                <h4>@java.lang.SuppressWarnings("unchecked")<br>protected&nbsp;java.lang.String <strong>buildOrderByClause</strong>(java.lang.String hqlOrderBy, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> associatedClass, java.lang.String role, java.lang.String defaultOrder)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1869,10 +1869,10 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="contribute(InFlightMetadataCollector, org.jboss.jandex.IndexView)"><!-- --></a>
+                        <a name="contribute(org.hibernate.boot.spi.InFlightMetadataCollector, org.jboss.jandex.IndexView)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>contribute</strong>(<a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> metadataCollector, <a href='../../../../../org.jboss.jandex.IndexView.html'>IndexView</a> jandexIndex)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>contribute</strong>(<a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> metadataCollector, <a href='../../../../../org.jboss.jandex.IndexView.html'>IndexView</a> jandexIndex)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1886,18 +1886,18 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="create(org.grails.datastore.mapping.model.types.ToMany, PersistentClass, java.lang.String, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="create(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.PersistentClass, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;java.util.Collection <strong>create</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../PersistentClass.html'>PersistentClass</a> owner, java.lang.String path, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>public&nbsp;java.util.Collection <strong>create</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> owner, java.lang.String path, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="createClassProperties(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="createClassProperties(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>createClassProperties</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>createClassProperties</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p> Creates and binds the properties for the specified Grails domain class and PersistentClass
  and binds them to the Hibernate runtime meta model
       <DL><DT><B>Parameters:</B></DT><DD><code>domainClass</code> -      The Grails domain class</DD><DD><code>persistentClass</code> -  The Hibernate PersistentClass instance</DD><DD><code>mappings</code> -         The Hibernate Mappings instance</DD><DD><code>sessionFactoryBeanName</code> -   the session factory bean name</DD></DL></p>
@@ -1912,19 +1912,19 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="createPrimaryKeyValue(InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map)"><!-- --></a>
+                        <a name="createPrimaryKeyValue(org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../DependantValue.html'>DependantValue</a> <strong>createPrimaryKeyValue</strong>(<a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, java.util.Collection collection, java.util.Map&lt;?, ?&gt; persistentClasses)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.hibernate.mapping.DependantValue.html'>DependantValue</a> <strong>createPrimaryKeyValue</strong>(<a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCollector.html'>InFlightMetadataCollector</a> mappings, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, java.util.Collection collection, java.util.Map&lt;?, ?&gt; persistentClasses)</h4>
                                 <p> Creates the DependentValue object that forms a primary key reference for the collection.
       <DL><DT><B>Parameters:</B></DT><DD>mappings</DD><DD><code>property</code> -           The grails property</DD><DD><code>collection</code> -         The collection object</DD><DD>persistentClasses</DD></DL><DL><DT><B>Returns:</B></DT><DD>The DependantValue (key)</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="createProperty(org.springframework.beans.factory.annotation.Value, PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, InFlightMetadataCollector)"><!-- --></a>
+                        <a name="createProperty(org.springframework.beans.factory.annotation.Value, org.hibernate.mapping.PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/config/Property.html'>Property</a> <strong>createProperty</strong>(<a href='../../../../../org.springframework.beans.factory.annotation.Value.html'>Value</a> value, <a href='../../../../../PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProperty, <a href='../../.. [...]
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/config/Property.html'>Property</a> <strong>createProperty</strong>(<a href='../../../../../org.springframework.beans.factory.annotation.Value.html'>Value</a> value, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> persistentClass, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsPrope [...]
                                 <p></p>
                             </li>
                         </ul>
@@ -1970,10 +1970,10 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="getColumnForSimpleValue(SimpleValue)"><!-- --></a>
+                        <a name="getColumnForSimpleValue(org.hibernate.mapping.SimpleValue)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../Column.html'>Column</a> <strong>getColumnForSimpleValue</strong>(<a href='../../../../../SimpleValue.html'>SimpleValue</a> element)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> <strong>getColumnForSimpleValue</strong>(<a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> element)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2026,10 +2026,10 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="getJoinedSubClassTableName(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, PersistentClass, org.grails.orm.hibernate.cfg.Table, InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="getJoinedSubClassTableName(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.grails.orm.hibernate.cfg.Table, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;java.lang.String <strong>getJoinedSubClassTableName</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../PersistentClass.html'>PersistentClass</a> model, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> denormalizedSuperTable, <a href='../../../../../InFlightMetadataCollector.html'>InFlightMetadataCollector</a> ma [...]
+                                <h4>protected&nbsp;java.lang.String <strong>getJoinedSubClassTableName</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> sub, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> model, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> denormalizedSuperTable, <a href='../../../../../org.hibernate.boot.spi.InFlightMetadataCol [...]
                                 <p></p>
                             </li>
                         </ul>
@@ -2080,7 +2080,7 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                         <a name="getMetadataBuildingContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../MetadataBuildingContext.html'>MetadataBuildingContext</a> <strong>getMetadataBuildingContext</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../org.hibernate.boot.spi.MetadataBuildingContext.html'>MetadataBuildingContext</a> <strong>getMetadataBuildingContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2101,10 +2101,10 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="getProperty(PersistentClass, java.lang.String)"><!-- --></a>
+                        <a name="getProperty(org.hibernate.mapping.PersistentClass, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/config/Property.html'>Property</a> <strong>getProperty</strong>(<a href='../../../../../PersistentClass.html'>PersistentClass</a> associatedClass, java.lang.String propertyName)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/config/Property.html'>Property</a> <strong>getProperty</strong>(<a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> associatedClass, java.lang.String propertyName)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2166,10 +2166,10 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="handleUniqueConstraint(org.grails.datastore.mapping.model.PersistentProperty, Column, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String, java.lang.String)"><!-- --></a>
+                        <a name="handleUniqueConstraint(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>handleUniqueConstraint</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../Column.html'>Column</a> column, java.lang.String path, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, java.lang.String columnName, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>handleUniqueConstraint</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, <a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, java.lang.String path, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, java.lang.String columnName, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2305,19 +2305,19 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="linkBidirectionalOneToMany(java.util.Collection, PersistentClass, DependantValue, org.grails.datastore.mapping.model.PersistentProperty)"><!-- --></a>
+                        <a name="linkBidirectionalOneToMany(java.util.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.mapping.DependantValue, org.grails.datastore.mapping.model.PersistentProperty)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>linkBidirectionalOneToMany</strong>(java.util.Collection collection, <a href='../../../../../PersistentClass.html'>PersistentClass</a> associatedClass, <a href='../../../../../DependantValue.html'>DependantValue</a> key, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> otherSide)</h4>
+                                <h4>protected&nbsp;void <strong>linkBidirectionalOneToMany</strong>(java.util.Collection collection, <a href='../../../../../org.hibernate.mapping.PersistentClass.html'>PersistentClass</a> associatedClass, <a href='../../../../../org.hibernate.mapping.DependantValue.html'>DependantValue</a> key, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> otherSide)</h4>
                                 <p> Links a bidirectional one-to-many, configuring the inverse side and using a column copy to perform the link
       <DL><DT><B>Parameters:</B></DT><DD><code>collection</code> -       The collection one-to-many</DD><DD><code>associatedClass</code> -  The associated class</DD><DD><code>key</code> -              The key</DD><DD><code>otherSide</code> -        The other side of the relationship</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="linkValueUsingAColumnCopy(org.grails.datastore.mapping.model.PersistentProperty, Column, DependantValue)"><!-- --></a>
+                        <a name="linkValueUsingAColumnCopy(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.hibernate.mapping.DependantValue)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>linkValueUsingAColumnCopy</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> prop, <a href='../../../../../Column.html'>Column</a> column, <a href='../../../../../DependantValue.html'>DependantValue</a> key)</h4>
+                                <h4>protected&nbsp;void <strong>linkValueUsingAColumnCopy</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> prop, <a href='../../../../../org.hibernate.mapping.Column.html'>Column</a> column, <a href='../../../../../org.hibernate.mapping.DependantValue.html'>DependantValue</a> key)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2363,10 +2363,10 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="setGeneratedUniqueName(UniqueKey)"><!-- --></a>
+                        <a name="setGeneratedUniqueName(org.hibernate.mapping.UniqueKey)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>setGeneratedUniqueName</strong>(<a href='../../../../../UniqueKey.html'>UniqueKey</a> uk)</h4>
+                                <h4>protected&nbsp;void <strong>setGeneratedUniqueName</strong>(<a href='../../../../../org.hibernate.mapping.UniqueKey.html'>UniqueKey</a> uk)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2380,10 +2380,10 @@ implements <a href='../../../../../MetadataContributor.html'>MetadataContributor
                             </li>
                         </ul>
                     
-                        <a name="setTypeForPropertyConfig(org.grails.datastore.mapping.model.PersistentProperty, SimpleValue, org.grails.orm.hibernate.cfg.PropertyConfig)"><!-- --></a>
+                        <a name="setTypeForPropertyConfig(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.SimpleValue, org.grails.orm.hibernate.cfg.PropertyConfig)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>setTypeForPropertyConfig</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, <a href='../../../../../SimpleValue.html'>SimpleValue</a> simpleValue, <a href='../../../../../org/grails/orm/hibernate/cfg/PropertyConfig.html'>PropertyConfig</a> config)</h4>
+                                <h4>protected&nbsp;void <strong>setTypeForPropertyConfig</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, <a href='../../../../../org.hibernate.mapping.SimpleValue.html'>SimpleValue</a> simpleValue, <a href='../../../../../org/grails/orm/hibernate/cfg/PropertyConfig.html'>PropertyConfig</a> config)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.html b/snapshot/api/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.html
index 3b36ef9f4d..149a415eb8 100644
--- a/snapshot/api/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.html
+++ b/snapshot/api/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.html
@@ -306,7 +306,7 @@ implements <a href='../../../../../org.springframework.context.ApplicationContex
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setMetadataContributor(MetadataContributor)">setMetadataContributor</a></strong>(<a href='../../../../../MetadataContributor.html'>MetadataContributor</a> metadataContributor)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#setMetadataContributor(org.hibernate.boot.spi.MetadataContributor)">setMetadataContributor</a></strong>(<a href='../../../../../org.hibernate.boot.spi.MetadataContributor.html'>MetadataContributor</a> metadataContributor)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -544,10 +544,10 @@ implements <a href='../../../../../org.springframework.context.ApplicationContex
                             </li>
                         </ul>
                     
-                        <a name="setMetadataContributor(MetadataContributor)"><!-- --></a>
+                        <a name="setMetadataContributor(org.hibernate.boot.spi.MetadataContributor)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>setMetadataContributor</strong>(<a href='../../../../../MetadataContributor.html'>MetadataContributor</a> metadataContributor)</h4>
+                                <h4>public&nbsp;void <strong>setMetadataContributor</strong>(<a href='../../../../../org.hibernate.boot.spi.MetadataContributor.html'>MetadataContributor</a> metadataContributor)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.html b/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.html
index 8ed5435dc7..fa38846684 100644
--- a/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.html
+++ b/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../../MessageSourceAware.html'>MessageSourceAware</a></dd>
+                <dd><a href='../../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../../org.springframework.context.MessageSourceAware.html'>MessageSourceAware</a></dd>
             </dl>
     
 
@@ -108,7 +108,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
 <pre>public class HibernateConnectionSourceFactory
 extends <a href='../../../../../org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.html'>AbstractHibernateConnectionSourceFactory</a>
-implements <a href='../../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../../MessageSourceAware.html'>MessageSourceAware</a></pre>
+implements <a href='../../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../../org.springframework.context.MessageSourceAware.html'>MessageSourceAware</a></pre>
 
     <p> Constructs SessionFactory instances from a HibernateMappingContext
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>6.0</DD></DL></p>
@@ -164,7 +164,7 @@ implements <a href='../../../../../org.springframework.context.ApplicationContex
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../MetadataContributor.html'>MetadataContributor</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org.hibernate.boot.spi.MetadataContributor.html'>MetadataContributor</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#metadataContributor">metadataContributor</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -294,7 +294,7 @@ implements <a href='../../../../../org.springframework.context.ApplicationContex
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setMetadataContributor(MetadataContributor)">setMetadataContributor</a></strong>(<a href='../../../../../MetadataContributor.html'>MetadataContributor</a> metadataContributor)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#setMetadataContributor(org.hibernate.boot.spi.MetadataContributor)">setMetadataContributor</a></strong>(<a href='../../../../../org.hibernate.boot.spi.MetadataContributor.html'>MetadataContributor</a> metadataContributor)</code><br></td>
                         </tr>
                         
                     </table>
@@ -377,7 +377,7 @@ implements <a href='../../../../../org.springframework.context.ApplicationContex
                         <a name="metadataContributor"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../MetadataContributor.html'>MetadataContributor</a> <strong>metadataContributor</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.hibernate.boot.spi.MetadataContributor.html'>MetadataContributor</a> <strong>metadataContributor</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -491,10 +491,10 @@ implements <a href='../../../../../org.springframework.context.ApplicationContex
                             </li>
                         </ul>
                     
-                        <a name="setMetadataContributor(MetadataContributor)"><!-- --></a>
+                        <a name="setMetadataContributor(org.hibernate.boot.spi.MetadataContributor)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@org.springframework.beans.factory.annotation.Autowired(required = false)<br>public&nbsp;void <strong>setMetadataContributor</strong>(<a href='../../../../../MetadataContributor.html'>MetadataContributor</a> metadataContributor)</h4>
+                                <h4>@org.springframework.beans.factory.annotation.Autowired(required = false)<br>public&nbsp;void <strong>setMetadataContributor</strong>(<a href='../../../../../org.hibernate.boot.spi.MetadataContributor.html'>MetadataContributor</a> metadataContributor)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html b/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
index cf7619151a..9adf7138e5 100644
--- a/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
+++ b/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
@@ -158,7 +158,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../../FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code><br>The default flush mode</td>
                         </tr>
                         
@@ -241,7 +241,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><a href='../../../../../FlushMode.html'>FlushMode</a> <strong>mode</strong></h4>
+                                <h4><a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>mode</strong></h4>
                                 <p> The default flush mode</p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/event/listener/HibernateEventListener.html b/snapshot/api/org/grails/orm/hibernate/event/listener/HibernateEventListener.html
index 5fba4e59be..073ceb4ae6 100644
--- a/snapshot/api/org/grails/orm/hibernate/event/listener/HibernateEventListener.html
+++ b/snapshot/api/org/grails/orm/hibernate/event/listener/HibernateEventListener.html
@@ -232,55 +232,55 @@ extends <a href='../../../../../../org/grails/orm/hibernate/event/listener/Abstr
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPostDelete(PostDeleteEvent)">onPostDelete</a></strong>(<a href='../../../../../../PostDeleteEvent.html'>PostDeleteEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPostDelete(org.hibernate.event.spi.PostDeleteEvent)">onPostDelete</a></strong>(<a href='../../../../../../org.hibernate.event.spi.PostDeleteEvent.html'>PostDeleteEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPostInsert(PostInsertEvent)">onPostInsert</a></strong>(<a href='../../../../../../PostInsertEvent.html'>PostInsertEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPostInsert(org.hibernate.event.spi.PostInsertEvent)">onPostInsert</a></strong>(<a href='../../../../../../org.hibernate.event.spi.PostInsertEvent.html'>PostInsertEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPostLoad(PostLoadEvent)">onPostLoad</a></strong>(<a href='../../../../../../PostLoadEvent.html'>PostLoadEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPostLoad(org.hibernate.event.spi.PostLoadEvent)">onPostLoad</a></strong>(<a href='../../../../../../org.hibernate.event.spi.PostLoadEvent.html'>PostLoadEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPostUpdate(PostUpdateEvent)">onPostUpdate</a></strong>(<a href='../../../../../../PostUpdateEvent.html'>PostUpdateEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPostUpdate(org.hibernate.event.spi.PostUpdateEvent)">onPostUpdate</a></strong>(<a href='../../../../../../org.hibernate.event.spi.PostUpdateEvent.html'>PostUpdateEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;boolean</code></td>
-                            <td class="colLast"><code><strong><a href="#onPreDelete(PreDeleteEvent)">onPreDelete</a></strong>(<a href='../../../../../../PreDeleteEvent.html'>PreDeleteEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPreDelete(org.hibernate.event.spi.PreDeleteEvent)">onPreDelete</a></strong>(<a href='../../../../../../org.hibernate.event.spi.PreDeleteEvent.html'>PreDeleteEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;boolean</code></td>
-                            <td class="colLast"><code><strong><a href="#onPreInsert(PreInsertEvent)">onPreInsert</a></strong>(<a href='../../../../../../PreInsertEvent.html'>PreInsertEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPreInsert(org.hibernate.event.spi.PreInsertEvent)">onPreInsert</a></strong>(<a href='../../../../../../org.hibernate.event.spi.PreInsertEvent.html'>PreInsertEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPreLoad(PreLoadEvent)">onPreLoad</a></strong>(<a href='../../../../../../PreLoadEvent.html'>PreLoadEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPreLoad(org.hibernate.event.spi.PreLoadEvent)">onPreLoad</a></strong>(<a href='../../../../../../org.hibernate.event.spi.PreLoadEvent.html'>PreLoadEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;boolean</code></td>
-                            <td class="colLast"><code><strong><a href="#onPreUpdate(PreUpdateEvent)">onPreUpdate</a></strong>(<a href='../../../../../../PreUpdateEvent.html'>PreUpdateEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPreUpdate(org.hibernate.event.spi.PreUpdateEvent)">onPreUpdate</a></strong>(<a href='../../../../../../org.hibernate.event.spi.PreUpdateEvent.html'>PreUpdateEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onSaveOrUpdate(SaveOrUpdateEvent)">onSaveOrUpdate</a></strong>(<a href='../../../../../../SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onSaveOrUpdate(org.hibernate.event.spi.SaveOrUpdateEvent)">onSaveOrUpdate</a></strong>(<a href='../../../../../../org.hibernate.event.spi.SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -416,74 +416,74 @@ extends <a href='../../../../../../org/grails/orm/hibernate/event/listener/Abstr
                             </li>
                         </ul>
                     
-                        <a name="onPostDelete(PostDeleteEvent)"><!-- --></a>
+                        <a name="onPostDelete(org.hibernate.event.spi.PostDeleteEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPostDelete</strong>(<a href='../../../../../../PostDeleteEvent.html'>PostDeleteEvent</a> event)</h4>
+                                <h4>public&nbsp;void <strong>onPostDelete</strong>(<a href='../../../../../../org.hibernate.event.spi.PostDeleteEvent.html'>PostDeleteEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPostInsert(PostInsertEvent)"><!-- --></a>
+                        <a name="onPostInsert(org.hibernate.event.spi.PostInsertEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPostInsert</strong>(<a href='../../../../../../PostInsertEvent.html'>PostInsertEvent</a> event)</h4>
+                                <h4>public&nbsp;void <strong>onPostInsert</strong>(<a href='../../../../../../org.hibernate.event.spi.PostInsertEvent.html'>PostInsertEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPostLoad(PostLoadEvent)"><!-- --></a>
+                        <a name="onPostLoad(org.hibernate.event.spi.PostLoadEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPostLoad</strong>(<a href='../../../../../../PostLoadEvent.html'>PostLoadEvent</a> event)</h4>
+                                <h4>public&nbsp;void <strong>onPostLoad</strong>(<a href='../../../../../../org.hibernate.event.spi.PostLoadEvent.html'>PostLoadEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPostUpdate(PostUpdateEvent)"><!-- --></a>
+                        <a name="onPostUpdate(org.hibernate.event.spi.PostUpdateEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPostUpdate</strong>(<a href='../../../../../../PostUpdateEvent.html'>PostUpdateEvent</a> event)</h4>
+                                <h4>public&nbsp;void <strong>onPostUpdate</strong>(<a href='../../../../../../org.hibernate.event.spi.PostUpdateEvent.html'>PostUpdateEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPreDelete(PreDeleteEvent)"><!-- --></a>
+                        <a name="onPreDelete(org.hibernate.event.spi.PreDeleteEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;boolean <strong>onPreDelete</strong>(<a href='../../../../../../PreDeleteEvent.html'>PreDeleteEvent</a> event)</h4>
+                                <h4>public&nbsp;boolean <strong>onPreDelete</strong>(<a href='../../../../../../org.hibernate.event.spi.PreDeleteEvent.html'>PreDeleteEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPreInsert(PreInsertEvent)"><!-- --></a>
+                        <a name="onPreInsert(org.hibernate.event.spi.PreInsertEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;boolean <strong>onPreInsert</strong>(<a href='../../../../../../PreInsertEvent.html'>PreInsertEvent</a> event)</h4>
+                                <h4>public&nbsp;boolean <strong>onPreInsert</strong>(<a href='../../../../../../org.hibernate.event.spi.PreInsertEvent.html'>PreInsertEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPreLoad(PreLoadEvent)"><!-- --></a>
+                        <a name="onPreLoad(org.hibernate.event.spi.PreLoadEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPreLoad</strong>(<a href='../../../../../../PreLoadEvent.html'>PreLoadEvent</a> event)</h4>
+                                <h4>public&nbsp;void <strong>onPreLoad</strong>(<a href='../../../../../../org.hibernate.event.spi.PreLoadEvent.html'>PreLoadEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPreUpdate(PreUpdateEvent)"><!-- --></a>
+                        <a name="onPreUpdate(org.hibernate.event.spi.PreUpdateEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;boolean <strong>onPreUpdate</strong>(<a href='../../../../../../PreUpdateEvent.html'>PreUpdateEvent</a> event)</h4>
+                                <h4>public&nbsp;boolean <strong>onPreUpdate</strong>(<a href='../../../../../../org.hibernate.event.spi.PreUpdateEvent.html'>PreUpdateEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onSaveOrUpdate(SaveOrUpdateEvent)"><!-- --></a>
+                        <a name="onSaveOrUpdate(org.hibernate.event.spi.SaveOrUpdateEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onSaveOrUpdate</strong>(<a href='../../../../../../SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> event)</h4>
+                                <h4>public&nbsp;void <strong>onSaveOrUpdate</strong>(<a href='../../../../../../org.hibernate.event.spi.SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/package-summary.html b/snapshot/api/org/grails/orm/hibernate/package-summary.html
index c2c99c18f5..3422ec8af4 100644
--- a/snapshot/api/org/grails/orm/hibernate/package-summary.html
+++ b/snapshot/api/org/grails/orm/hibernate/package-summary.html
@@ -168,7 +168,7 @@ function windowTitle()
                                     AbstractHibernateSession
                                 </a></strong>
                             </td>
-                            <td>Session implementation that wraps a Hibernate Session.</td>
+                            <td>Session implementation that wraps a Hibernate org.hibernate.Session.</td>
                         </tr>
 <tr class="altColor">
                             <td class="colOne">
diff --git a/snapshot/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html b/snapshot/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
index f798c08521..5786f7e159 100644
--- a/snapshot/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
+++ b/snapshot/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
@@ -434,7 +434,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         </tr>
                         
                         <tr class="rowColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org.hibernate.Criteria.html'>Criteria</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#criteria">criteria</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -624,7 +624,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org.hibernate.Criteria.html'>Criteria</a></code></td>
                             <td class="colLast"><code><strong><a href="#buildCriteria(Closure)">buildCriteria</a></strong>(groovy.lang.Closure&lt;?&gt; criteriaClosure)</code><br></td>
                         </tr>
                         
@@ -708,13 +708,13 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org.hibernate.Criteria.html'>Criteria</a></code></td>
                             <td class="colLast"><code><strong><a href="#createAlias(java.lang.String, java.lang.String)">createAlias</a></strong>(java.lang.String associationPath, java.lang.String alias)</code><br>Join an association, assigning an alias to the joined association.</td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;abstract&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a></code></td>
+                            <td class="colLast"><code>public&nbsp;abstract&nbsp;<a href='../../../../../org.hibernate.Criteria.html'>Criteria</a></code></td>
                             <td class="colLast"><code><strong><a href="#createAlias(java.lang.String, java.lang.String, int)">createAlias</a></strong>(java.lang.String associationPath, java.lang.String alias, int joinType)</code><br>Join an association using the specified join-type, assigning an alias
  to the joined association.
  </td>
@@ -880,7 +880,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org.hibernate.Criteria.html'>Criteria</a></code></td>
                             <td class="colLast"><code><strong><a href="#getInstance()">getInstance</a></strong>()</code><br>Returns the criteria instance</td>
                         </tr>
                         
@@ -1834,7 +1834,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="criteria"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>criteria</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.hibernate.Criteria.html'>Criteria</a> <strong>criteria</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2062,7 +2062,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="buildCriteria(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>buildCriteria</strong>(groovy.lang.Closure&lt;?&gt; criteriaClosure)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org.hibernate.Criteria.html'>Criteria</a> <strong>buildCriteria</strong>(groovy.lang.Closure&lt;?&gt; criteriaClosure)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2182,11 +2182,11 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="createAlias(java.lang.String, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>createAlias</strong>(java.lang.String associationPath, java.lang.String alias)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org.hibernate.Criteria.html'>Criteria</a> <strong>createAlias</strong>(java.lang.String associationPath, java.lang.String alias)</h4>
                                 <p> Join an association, assigning an alias to the joined association.
 
  Functionally equivalent to createAlias(String, String, int) using
- CriteriaSpecificationINNER_JOIN for the joinType.<DL><DT><B>throws:</B></DT><DD>HibernateException Indicates a problem creating the sub criteria</DD></DL>
+ CriteriaSpecificationINNER_JOIN for the joinType.<DL><DT><B>throws:</B></DT><DD>org.hibernate.HibernateException Indicates a problem creating the sub criteria</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>associationPath</code> -  A dot-seperated property path</DD><DD><code>alias</code> -  The alias to assign to the joined association (for later reference).</DD></DL><DL><DT><B>Returns:</B></DT><DD>this (for method chaining)
  #see <a href='#createAlias(java.lang.String, java.lang.String, int)'>createAlias(String, String, int)</a></DD></DL></p>
                             </li>
@@ -2195,7 +2195,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="createAlias(java.lang.String, java.lang.String, int)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;abstract&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>createAlias</strong>(java.lang.String associationPath, java.lang.String alias, int joinType)</h4>
+                                <h4>public&nbsp;abstract&nbsp;<a href='../../../../../org.hibernate.Criteria.html'>Criteria</a> <strong>createAlias</strong>(java.lang.String associationPath, java.lang.String alias, int joinType)</h4>
                                 <p> Join an association using the specified join-type, assigning an alias
  to the joined association.
  sub
@@ -2434,7 +2434,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="getInstance()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>getInstance</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../org.hibernate.Criteria.html'>Criteria</a> <strong>getInstance</strong>()</h4>
                                 <p> Returns the criteria instance
       <DL><DT><B>Returns:</B></DT><DD>The criteria instance</DD></DL></p>
                             </li>
diff --git a/snapshot/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html b/snapshot/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html
index 1a98955777..d67c3fc27c 100644
--- a/snapshot/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html
+++ b/snapshot/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html
@@ -489,7 +489,7 @@ extends <a href='../../../../../org/grails/datastore/mapping/query/Query.html'>Q
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;abstract&nbsp;<a href='../../../../../Dialect.html'>Dialect</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;abstract&nbsp;<a href='../../../../../org.hibernate.dialect.Dialect.html'>Dialect</a></code></td>
                             <td class="colLast"><code><strong><a href="#getDialect(org.hibernate.SessionFactory)">getDialect</a></strong>(<a href='../../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory)</code><br></td>
                         </tr>
                         
@@ -1118,7 +1118,7 @@ extends <a href='../../../../../org/grails/datastore/mapping/query/Query.html'>Q
                         <a name="getDialect(org.hibernate.SessionFactory)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;abstract&nbsp;<a href='../../../../../Dialect.html'>Dialect</a> <strong>getDialect</strong>(<a href='../../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory)</h4>
+                                <h4>protected&nbsp;abstract&nbsp;<a href='../../../../../org.hibernate.dialect.Dialect.html'>Dialect</a> <strong>getDialect</strong>(<a href='../../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/query/HibernateQuery.html b/snapshot/api/org/grails/orm/hibernate/query/HibernateQuery.html
index 4c2640423b..b4f6fa3e3e 100644
--- a/snapshot/api/org/grails/orm/hibernate/query/HibernateQuery.html
+++ b/snapshot/api/org/grails/orm/hibernate/query/HibernateQuery.html
@@ -247,7 +247,7 @@ extends <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernate
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../Dialect.html'>Dialect</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org.hibernate.dialect.Dialect.html'>Dialect</a></code></td>
                             <td class="colLast"><code><strong><a href="#getDialect(org.hibernate.SessionFactory)">getDialect</a></strong>(<a href='../../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory)</code><br></td>
                         </tr>
                         
@@ -422,7 +422,7 @@ extends <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernate
                         <a name="getDialect(org.hibernate.SessionFactory)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>protected&nbsp;<a href='../../../../../Dialect.html'>Dialect</a> <strong>getDialect</strong>(<a href='../../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory)</h4>
+                                <h4>@java.lang.Deprecated<br>protected&nbsp;<a href='../../../../../org.hibernate.dialect.Dialect.html'>Dialect</a> <strong>getDialect</strong>(<a href='../../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.html b/snapshot/api/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.html
index 1c4fd3aa64..bdabd74679 100644
--- a/snapshot/api/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.html
+++ b/snapshot/api/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../../PostDeleteEventListener.html'>PostDeleteEventListener</a>, <a href='../../../../../PostInsertEventListener.html'>PostInsertEventListener</a>, <a href='../../../../../PostLoadEventListener.html'>PostLoadEventListener</a>, <a href='../../../../../PostUpdateEventListener.html'>PostUpdateEventListener</a>, <a href='../../../../../PreDelete [...]
+                <dd><a href='../../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../../org.hibernate.event.spi.PostDeleteEventListener.html'>PostDeleteEventListener</a>, <a href='../../../../../org.hibernate.event.spi.PostInsertEventListener.html'>PostInsertEventListener</a>, <a href='../../../../../org.hibernate.event.spi.PostLoadEventListener.html'>PostLoadEventListener</a>, <a href='../../../../../org.hibernate.event. [...]
             </dl>
     
 
@@ -108,7 +108,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
 <pre>public abstract class AbstractClosureEventTriggeringInterceptor
 extends <a href='../../../../../org.hibernate.event.internal.DefaultSaveOrUpdateEventListener.html'>DefaultSaveOrUpdateEventListener</a>
-implements <a href='../../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../../PostDeleteEventListener.html'>PostDeleteEventListener</a>, <a href='../../../../../PostInsertEventListener.html'>PostInsertEventListener</a>, <a href='../../../../../PostLoadEventListener.html'>PostLoadEventListener</a>, <a href='../../../../../PostUpdateEventListener.html'>PostUpdateEventListener</a>, <a href='../../../../../PreDeleteEventList [...]
+implements <a href='../../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../../org.hibernate.event.spi.PostDeleteEventListener.html'>PostDeleteEventListener</a>, <a href='../../../../../org.hibernate.event.spi.PostInsertEventListener.html'>PostInsertEventListener</a>, <a href='../../../../../org.hibernate.event.spi.PostLoadEventListener.html'>PostLoadEventListener</a>, <a href='../../../../../org.hibernate.event.spi.PostU [...]
 
     <p> Abstract class for defining the event triggering interceptor
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>6.0</DD></DL></p>
diff --git a/snapshot/api/org/grails/orm/hibernate/support/ClosureEventListener.html b/snapshot/api/org/grails/orm/hibernate/support/ClosureEventListener.html
index 7ff63bcbc4..0038ca989f 100644
--- a/snapshot/api/org/grails/orm/hibernate/support/ClosureEventListener.html
+++ b/snapshot/api/org/grails/orm/hibernate/support/ClosureEventListener.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../PostDeleteEventListener.html'>PostDeleteEventListener</a>, <a href='../../../../../PostInsertEventListener.html'>PostInsertEventListener</a>, <a href='../../../../../PostLoadEventListener.html'>PostLoadEventListener</a>, <a href='../../../../../PostUpdateEventListener.html'>PostUpdateEventListener</a>, <a href='../../../../../PreDeleteEventListener.html'>PreDeleteEventListener</a>, <a href='../../../../../PreLoadEventListener.html'>PreLoadEvent [...]
+                <dd><a href='../../../../../org.hibernate.event.spi.PostDeleteEventListener.html'>PostDeleteEventListener</a>, <a href='../../../../../org.hibernate.event.spi.PostInsertEventListener.html'>PostInsertEventListener</a>, <a href='../../../../../org.hibernate.event.spi.PostLoadEventListener.html'>PostLoadEventListener</a>, <a href='../../../../../org.hibernate.event.spi.PostUpdateEventListener.html'>PostUpdateEventListener</a>, <a href='../../../../../org.hibernate.event.spi. [...]
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@java.lang.SuppressWarnings({"rawtypes", "unchecked", "serial"})
 public class ClosureEventListener
 extends java.lang.Object
-implements <a href='../../../../../PostDeleteEventListener.html'>PostDeleteEventListener</a>, <a href='../../../../../PostInsertEventListener.html'>PostInsertEventListener</a>, <a href='../../../../../PostLoadEventListener.html'>PostLoadEventListener</a>, <a href='../../../../../PostUpdateEventListener.html'>PostUpdateEventListener</a>, <a href='../../../../../PreDeleteEventListener.html'>PreDeleteEventListener</a>, <a href='../../../../../PreLoadEventListener.html'>PreLoadEventListener< [...]
+implements <a href='../../../../../org.hibernate.event.spi.PostDeleteEventListener.html'>PostDeleteEventListener</a>, <a href='../../../../../org.hibernate.event.spi.PostInsertEventListener.html'>PostInsertEventListener</a>, <a href='../../../../../org.hibernate.event.spi.PostLoadEventListener.html'>PostLoadEventListener</a>, <a href='../../../../../org.hibernate.event.spi.PostUpdateEventListener.html'>PostUpdateEventListener</a>, <a href='../../../../../org.hibernate.event.spi.PreDelete [...]
 
     <p> <p>Invokes closure events on domain entities such as beforeInsert, beforeUpdate and beforeDelete.
 
@@ -256,55 +256,55 @@ implements <a href='../../../../../PostDeleteEventListener.html'>PostDeleteEvent
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPostDelete(PostDeleteEvent)">onPostDelete</a></strong>(<a href='../../../../../PostDeleteEvent.html'>PostDeleteEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPostDelete(org.hibernate.event.spi.PostDeleteEvent)">onPostDelete</a></strong>(<a href='../../../../../org.hibernate.event.spi.PostDeleteEvent.html'>PostDeleteEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPostInsert(PostInsertEvent)">onPostInsert</a></strong>(<a href='../../../../../PostInsertEvent.html'>PostInsertEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPostInsert(org.hibernate.event.spi.PostInsertEvent)">onPostInsert</a></strong>(<a href='../../../../../org.hibernate.event.spi.PostInsertEvent.html'>PostInsertEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPostLoad(PostLoadEvent)">onPostLoad</a></strong>(<a href='../../../../../PostLoadEvent.html'>PostLoadEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPostLoad(org.hibernate.event.spi.PostLoadEvent)">onPostLoad</a></strong>(<a href='../../../../../org.hibernate.event.spi.PostLoadEvent.html'>PostLoadEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPostUpdate(PostUpdateEvent)">onPostUpdate</a></strong>(<a href='../../../../../PostUpdateEvent.html'>PostUpdateEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPostUpdate(org.hibernate.event.spi.PostUpdateEvent)">onPostUpdate</a></strong>(<a href='../../../../../org.hibernate.event.spi.PostUpdateEvent.html'>PostUpdateEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;boolean</code></td>
-                            <td class="colLast"><code><strong><a href="#onPreDelete(PreDeleteEvent)">onPreDelete</a></strong>(<a href='../../../../../PreDeleteEvent.html'>PreDeleteEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPreDelete(org.hibernate.event.spi.PreDeleteEvent)">onPreDelete</a></strong>(<a href='../../../../../org.hibernate.event.spi.PreDeleteEvent.html'>PreDeleteEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;boolean</code></td>
-                            <td class="colLast"><code><strong><a href="#onPreInsert(PreInsertEvent)">onPreInsert</a></strong>(<a href='../../../../../PreInsertEvent.html'>PreInsertEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPreInsert(org.hibernate.event.spi.PreInsertEvent)">onPreInsert</a></strong>(<a href='../../../../../org.hibernate.event.spi.PreInsertEvent.html'>PreInsertEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPreLoad(PreLoadEvent)">onPreLoad</a></strong>(<a href='../../../../../PreLoadEvent.html'>PreLoadEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPreLoad(org.hibernate.event.spi.PreLoadEvent)">onPreLoad</a></strong>(<a href='../../../../../org.hibernate.event.spi.PreLoadEvent.html'>PreLoadEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;boolean</code></td>
-                            <td class="colLast"><code><strong><a href="#onPreUpdate(PreUpdateEvent)">onPreUpdate</a></strong>(<a href='../../../../../PreUpdateEvent.html'>PreUpdateEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPreUpdate(org.hibernate.event.spi.PreUpdateEvent)">onPreUpdate</a></strong>(<a href='../../../../../org.hibernate.event.spi.PreUpdateEvent.html'>PreUpdateEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onSaveOrUpdate(SaveOrUpdateEvent)">onSaveOrUpdate</a></strong>(<a href='../../../../../SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> event)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onSaveOrUpdate(org.hibernate.event.spi.SaveOrUpdateEvent)">onSaveOrUpdate</a></strong>(<a href='../../../../../org.hibernate.event.spi.SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> event)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -483,74 +483,74 @@ implements <a href='../../../../../PostDeleteEventListener.html'>PostDeleteEvent
                             </li>
                         </ul>
                     
-                        <a name="onPostDelete(PostDeleteEvent)"><!-- --></a>
+                        <a name="onPostDelete(org.hibernate.event.spi.PostDeleteEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPostDelete</strong>(<a href='../../../../../PostDeleteEvent.html'>PostDeleteEvent</a> event)</h4>
+                                <h4>public&nbsp;void <strong>onPostDelete</strong>(<a href='../../../../../org.hibernate.event.spi.PostDeleteEvent.html'>PostDeleteEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPostInsert(PostInsertEvent)"><!-- --></a>
+                        <a name="onPostInsert(org.hibernate.event.spi.PostInsertEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPostInsert</strong>(<a href='../../../../../PostInsertEvent.html'>PostInsertEvent</a> event)</h4>
+                                <h4>public&nbsp;void <strong>onPostInsert</strong>(<a href='../../../../../org.hibernate.event.spi.PostInsertEvent.html'>PostInsertEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPostLoad(PostLoadEvent)"><!-- --></a>
+                        <a name="onPostLoad(org.hibernate.event.spi.PostLoadEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPostLoad</strong>(<a href='../../../../../PostLoadEvent.html'>PostLoadEvent</a> event)</h4>
+                                <h4>public&nbsp;void <strong>onPostLoad</strong>(<a href='../../../../../org.hibernate.event.spi.PostLoadEvent.html'>PostLoadEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPostUpdate(PostUpdateEvent)"><!-- --></a>
+                        <a name="onPostUpdate(org.hibernate.event.spi.PostUpdateEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPostUpdate</strong>(<a href='../../../../../PostUpdateEvent.html'>PostUpdateEvent</a> event)</h4>
+                                <h4>public&nbsp;void <strong>onPostUpdate</strong>(<a href='../../../../../org.hibernate.event.spi.PostUpdateEvent.html'>PostUpdateEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPreDelete(PreDeleteEvent)"><!-- --></a>
+                        <a name="onPreDelete(org.hibernate.event.spi.PreDeleteEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;boolean <strong>onPreDelete</strong>(<a href='../../../../../PreDeleteEvent.html'>PreDeleteEvent</a> event)</h4>
+                                <h4>public&nbsp;boolean <strong>onPreDelete</strong>(<a href='../../../../../org.hibernate.event.spi.PreDeleteEvent.html'>PreDeleteEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPreInsert(PreInsertEvent)"><!-- --></a>
+                        <a name="onPreInsert(org.hibernate.event.spi.PreInsertEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;boolean <strong>onPreInsert</strong>(<a href='../../../../../PreInsertEvent.html'>PreInsertEvent</a> event)</h4>
+                                <h4>public&nbsp;boolean <strong>onPreInsert</strong>(<a href='../../../../../org.hibernate.event.spi.PreInsertEvent.html'>PreInsertEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPreLoad(PreLoadEvent)"><!-- --></a>
+                        <a name="onPreLoad(org.hibernate.event.spi.PreLoadEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPreLoad</strong>(<a href='../../../../../PreLoadEvent.html'>PreLoadEvent</a> event)</h4>
+                                <h4>public&nbsp;void <strong>onPreLoad</strong>(<a href='../../../../../org.hibernate.event.spi.PreLoadEvent.html'>PreLoadEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPreUpdate(PreUpdateEvent)"><!-- --></a>
+                        <a name="onPreUpdate(org.hibernate.event.spi.PreUpdateEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;boolean <strong>onPreUpdate</strong>(<a href='../../../../../PreUpdateEvent.html'>PreUpdateEvent</a> event)</h4>
+                                <h4>public&nbsp;boolean <strong>onPreUpdate</strong>(<a href='../../../../../org.hibernate.event.spi.PreUpdateEvent.html'>PreUpdateEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onSaveOrUpdate(SaveOrUpdateEvent)"><!-- --></a>
+                        <a name="onSaveOrUpdate(org.hibernate.event.spi.SaveOrUpdateEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onSaveOrUpdate</strong>(<a href='../../../../../SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> event)</h4>
+                                <h4>public&nbsp;void <strong>onSaveOrUpdate</strong>(<a href='../../../../../org.hibernate.event.spi.SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> event)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html b/snapshot/api/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html
index 24bd80f907..5a8ea63af2 100644
--- a/snapshot/api/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html
+++ b/snapshot/api/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.html
@@ -178,61 +178,61 @@ extends <a href='../../../../../org/grails/orm/hibernate/support/AbstractClosure
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;java.lang.Object</code></td>
-                            <td class="colLast"><code><strong><a href="#getEntity(SaveOrUpdateEvent)">getEntity</a></strong>(<a href='../../../../../SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> hibernateEvent)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#getEntity(org.hibernate.event.spi.SaveOrUpdateEvent)">getEntity</a></strong>(<a href='../../../../../org.hibernate.event.spi.SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> hibernateEvent)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPostDelete(PostDeleteEvent)">onPostDelete</a></strong>(<a href='../../../../../PostDeleteEvent.html'>PostDeleteEvent</a> hibernateEvent)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPostDelete(org.hibernate.event.spi.PostDeleteEvent)">onPostDelete</a></strong>(<a href='../../../../../org.hibernate.event.spi.PostDeleteEvent.html'>PostDeleteEvent</a> hibernateEvent)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPostInsert(PostInsertEvent)">onPostInsert</a></strong>(<a href='../../../../../PostInsertEvent.html'>PostInsertEvent</a> hibernateEvent)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPostInsert(org.hibernate.event.spi.PostInsertEvent)">onPostInsert</a></strong>(<a href='../../../../../org.hibernate.event.spi.PostInsertEvent.html'>PostInsertEvent</a> hibernateEvent)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPostLoad(PostLoadEvent)">onPostLoad</a></strong>(<a href='../../../../../PostLoadEvent.html'>PostLoadEvent</a> hibernateEvent)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPostLoad(org.hibernate.event.spi.PostLoadEvent)">onPostLoad</a></strong>(<a href='../../../../../org.hibernate.event.spi.PostLoadEvent.html'>PostLoadEvent</a> hibernateEvent)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPostUpdate(PostUpdateEvent)">onPostUpdate</a></strong>(<a href='../../../../../PostUpdateEvent.html'>PostUpdateEvent</a> hibernateEvent)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPostUpdate(org.hibernate.event.spi.PostUpdateEvent)">onPostUpdate</a></strong>(<a href='../../../../../org.hibernate.event.spi.PostUpdateEvent.html'>PostUpdateEvent</a> hibernateEvent)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;boolean</code></td>
-                            <td class="colLast"><code><strong><a href="#onPreDelete(PreDeleteEvent)">onPreDelete</a></strong>(<a href='../../../../../PreDeleteEvent.html'>PreDeleteEvent</a> hibernateEvent)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPreDelete(org.hibernate.event.spi.PreDeleteEvent)">onPreDelete</a></strong>(<a href='../../../../../org.hibernate.event.spi.PreDeleteEvent.html'>PreDeleteEvent</a> hibernateEvent)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;boolean</code></td>
-                            <td class="colLast"><code><strong><a href="#onPreInsert(PreInsertEvent)">onPreInsert</a></strong>(<a href='../../../../../PreInsertEvent.html'>PreInsertEvent</a> hibernateEvent)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPreInsert(org.hibernate.event.spi.PreInsertEvent)">onPreInsert</a></strong>(<a href='../../../../../org.hibernate.event.spi.PreInsertEvent.html'>PreInsertEvent</a> hibernateEvent)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onPreLoad(PreLoadEvent)">onPreLoad</a></strong>(<a href='../../../../../PreLoadEvent.html'>PreLoadEvent</a> hibernateEvent)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPreLoad(org.hibernate.event.spi.PreLoadEvent)">onPreLoad</a></strong>(<a href='../../../../../org.hibernate.event.spi.PreLoadEvent.html'>PreLoadEvent</a> hibernateEvent)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;boolean</code></td>
-                            <td class="colLast"><code><strong><a href="#onPreUpdate(PreUpdateEvent)">onPreUpdate</a></strong>(<a href='../../../../../PreUpdateEvent.html'>PreUpdateEvent</a> hibernateEvent)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onPreUpdate(org.hibernate.event.spi.PreUpdateEvent)">onPreUpdate</a></strong>(<a href='../../../../../org.hibernate.event.spi.PreUpdateEvent.html'>PreUpdateEvent</a> hibernateEvent)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#onSaveOrUpdate(SaveOrUpdateEvent)">onSaveOrUpdate</a></strong>(<a href='../../../../../SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> hibernateEvent)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#onSaveOrUpdate(org.hibernate.event.spi.SaveOrUpdateEvent)">onSaveOrUpdate</a></strong>(<a href='../../../../../org.hibernate.event.spi.SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> hibernateEvent)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -317,82 +317,82 @@ extends <a href='../../../../../org/grails/orm/hibernate/support/AbstractClosure
                 </a>
                     <h3>Method Detail</h3>
                     
-                        <a name="getEntity(SaveOrUpdateEvent)"><!-- --></a>
+                        <a name="getEntity(org.hibernate.event.spi.SaveOrUpdateEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;java.lang.Object <strong>getEntity</strong>(<a href='../../../../../SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> hibernateEvent)</h4>
+                                <h4>protected&nbsp;java.lang.Object <strong>getEntity</strong>(<a href='../../../../../org.hibernate.event.spi.SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> hibernateEvent)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPostDelete(PostDeleteEvent)"><!-- --></a>
+                        <a name="onPostDelete(org.hibernate.event.spi.PostDeleteEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPostDelete</strong>(<a href='../../../../../PostDeleteEvent.html'>PostDeleteEvent</a> hibernateEvent)</h4>
+                                <h4>public&nbsp;void <strong>onPostDelete</strong>(<a href='../../../../../org.hibernate.event.spi.PostDeleteEvent.html'>PostDeleteEvent</a> hibernateEvent)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPostInsert(PostInsertEvent)"><!-- --></a>
+                        <a name="onPostInsert(org.hibernate.event.spi.PostInsertEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPostInsert</strong>(<a href='../../../../../PostInsertEvent.html'>PostInsertEvent</a> hibernateEvent)</h4>
+                                <h4>public&nbsp;void <strong>onPostInsert</strong>(<a href='../../../../../org.hibernate.event.spi.PostInsertEvent.html'>PostInsertEvent</a> hibernateEvent)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPostLoad(PostLoadEvent)"><!-- --></a>
+                        <a name="onPostLoad(org.hibernate.event.spi.PostLoadEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPostLoad</strong>(<a href='../../../../../PostLoadEvent.html'>PostLoadEvent</a> hibernateEvent)</h4>
+                                <h4>public&nbsp;void <strong>onPostLoad</strong>(<a href='../../../../../org.hibernate.event.spi.PostLoadEvent.html'>PostLoadEvent</a> hibernateEvent)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPostUpdate(PostUpdateEvent)"><!-- --></a>
+                        <a name="onPostUpdate(org.hibernate.event.spi.PostUpdateEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPostUpdate</strong>(<a href='../../../../../PostUpdateEvent.html'>PostUpdateEvent</a> hibernateEvent)</h4>
+                                <h4>public&nbsp;void <strong>onPostUpdate</strong>(<a href='../../../../../org.hibernate.event.spi.PostUpdateEvent.html'>PostUpdateEvent</a> hibernateEvent)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPreDelete(PreDeleteEvent)"><!-- --></a>
+                        <a name="onPreDelete(org.hibernate.event.spi.PreDeleteEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;boolean <strong>onPreDelete</strong>(<a href='../../../../../PreDeleteEvent.html'>PreDeleteEvent</a> hibernateEvent)</h4>
+                                <h4>public&nbsp;boolean <strong>onPreDelete</strong>(<a href='../../../../../org.hibernate.event.spi.PreDeleteEvent.html'>PreDeleteEvent</a> hibernateEvent)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPreInsert(PreInsertEvent)"><!-- --></a>
+                        <a name="onPreInsert(org.hibernate.event.spi.PreInsertEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;boolean <strong>onPreInsert</strong>(<a href='../../../../../PreInsertEvent.html'>PreInsertEvent</a> hibernateEvent)</h4>
+                                <h4>public&nbsp;boolean <strong>onPreInsert</strong>(<a href='../../../../../org.hibernate.event.spi.PreInsertEvent.html'>PreInsertEvent</a> hibernateEvent)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPreLoad(PreLoadEvent)"><!-- --></a>
+                        <a name="onPreLoad(org.hibernate.event.spi.PreLoadEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>onPreLoad</strong>(<a href='../../../../../PreLoadEvent.html'>PreLoadEvent</a> hibernateEvent)</h4>
+                                <h4>public&nbsp;void <strong>onPreLoad</strong>(<a href='../../../../../org.hibernate.event.spi.PreLoadEvent.html'>PreLoadEvent</a> hibernateEvent)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onPreUpdate(PreUpdateEvent)"><!-- --></a>
+                        <a name="onPreUpdate(org.hibernate.event.spi.PreUpdateEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;boolean <strong>onPreUpdate</strong>(<a href='../../../../../PreUpdateEvent.html'>PreUpdateEvent</a> hibernateEvent)</h4>
+                                <h4>public&nbsp;boolean <strong>onPreUpdate</strong>(<a href='../../../../../org.hibernate.event.spi.PreUpdateEvent.html'>PreUpdateEvent</a> hibernateEvent)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="onSaveOrUpdate(SaveOrUpdateEvent)"><!-- --></a>
+                        <a name="onSaveOrUpdate(org.hibernate.event.spi.SaveOrUpdateEvent)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>onSaveOrUpdate</strong>(<a href='../../../../../SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> hibernateEvent)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>onSaveOrUpdate</strong>(<a href='../../../../../org.hibernate.event.spi.SaveOrUpdateEvent.html'>SaveOrUpdateEvent</a> hibernateEvent)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.html b/snapshot/api/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.html
index 97c7ca248c..ef93479520 100644
--- a/snapshot/api/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.html
+++ b/snapshot/api/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.html
@@ -159,7 +159,7 @@ implements <a href='../../../../../org.springframework.beans.factory.FactoryBean
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../DialectFactory.html'>DialectFactory</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org.hibernate.engine.jdbc.dialect.spi.DialectFactory.html'>DialectFactory</a></code></td>
                             <td class="colLast"><code><strong><a href="#createDialectFactory()">createDialectFactory</a></strong>()</code><br></td>
                         </tr>
                         
@@ -177,7 +177,7 @@ implements <a href='../../../../../org.springframework.beans.factory.FactoryBean
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../DialectResolutionInfo.html'>DialectResolutionInfo</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo.html'>DialectResolutionInfo</a></code></td>
                             <td class="colLast"><code><strong><a href="#getDialectResolutionInfo()">getDialectResolutionInfo</a></strong>()</code><br></td>
                         </tr>
                         
@@ -302,7 +302,7 @@ implements <a href='../../../../../org.springframework.beans.factory.FactoryBean
                         <a name="createDialectFactory()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../DialectFactory.html'>DialectFactory</a> <strong>createDialectFactory</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.hibernate.engine.jdbc.dialect.spi.DialectFactory.html'>DialectFactory</a> <strong>createDialectFactory</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -326,7 +326,7 @@ implements <a href='../../../../../org.springframework.beans.factory.FactoryBean
                         <a name="getDialectResolutionInfo()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../DialectResolutionInfo.html'>DialectResolutionInfo</a> <strong>getDialectResolutionInfo</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo.html'>DialectResolutionInfo</a> <strong>getDialectResolutionInfo</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index 5b83ca2873..8c4cbac002 100644
--- a/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
+++ b/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
@@ -155,7 +155,7 @@ extends java.lang.Object</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../FlushMode.html'>FlushMode</a></code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#getFlushMode(org.hibernate.Session)">getFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session)</code><br>Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
@@ -168,7 +168,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, FlushMode)">setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../FlushMode.html'>FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
+                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
                     </table>
@@ -233,7 +233,7 @@ extends java.lang.Object</pre>
                         <a name="getFlushMode(org.hibernate.Session)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../FlushMode.html'>FlushMode</a> <strong>getFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>getFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session)</h4>
                                 <p> Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Returns:</B></DT><DD>the FlushMode (never <CODE>null</CODE>)</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
@@ -248,10 +248,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="setFlushMode(org.hibernate.Session, FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../FlushMode.html'>FlushMode</a> flushMode)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode)</h4>
                                 <p> Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
diff --git a/snapshot/api/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.html b/snapshot/api/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.html
index 162f156a5b..c9ccfbbfa0 100644
--- a/snapshot/api/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.html
+++ b/snapshot/api/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.html
@@ -112,13 +112,13 @@ implements <a href='../../../../../jakarta.transaction.TransactionManager.html'>
 
     <p> Adapter for adding transaction controlling hooks for supporting
  Hibernate's org.hibernate.engine.transaction.Isolater class's interaction with transactions
- 
+
  This is required when there is no real JTA transaction manager in use and Spring's
- TransactionAwareDataSourceProxy is used.
- 
+ org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy is used.
+
  Without this solution, using Hibernate's TableGenerator identity strategies will fail to support transactions.
  The id generator will commit the current transaction and break transactional behaviour.
- 
+
  The javadoc of Hibernate's <CODE>TableHiLoGenerator</CODE> states this. However this isn't mentioned in the javadocs of other TableGenerators.
   <DL><DT><B>Authors:</B></DT><DD>Lari Hotari</DD></DL></p>
 
diff --git a/snapshot/api/org/grails/plugin/cache/GrailsCacheManager.html b/snapshot/api/org/grails/plugin/cache/GrailsCacheManager.html
index 61fe8403b2..07c1b93ebb 100644
--- a/snapshot/api/org/grails/plugin/cache/GrailsCacheManager.html
+++ b/snapshot/api/org/grails/plugin/cache/GrailsCacheManager.html
@@ -197,7 +197,7 @@ extends <a href='../../../../org.springframework.cache.CacheManager.html'>CacheM
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>cacheExists</strong>(java.lang.String name)</h4>
                                 <p> Whether the cache for the given name exits
-	  <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  The name of the cache</DD></DL><DL><DT><B>Returns:</B></DT><DD>True if it does</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  The name of the cache</DD></DL><DL><DT><B>Returns:</B></DT><DD>True if it does</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -206,7 +206,7 @@ extends <a href='../../../../org.springframework.cache.CacheManager.html'>CacheM
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>destroyCache</strong>(java.lang.String name)</h4>
                                 <p> Destroys the given named cache
-	  <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  The name of the cache</DD></DL><DL><DT><B>Returns:</B></DT><DD>True if it was destroyed</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  The name of the cache</DD></DL><DL><DT><B>Returns:</B></DT><DD>True if it was destroyed</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html b/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
index c11f31a69a..47a077763a 100644
--- a/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
+++ b/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
@@ -135,7 +135,7 @@ extends <a href='../../../../../org.springframework.orm.hibernate5.support.OpenS
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#hibernateFlushMode">hibernateFlushMode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -220,7 +220,7 @@ extends <a href='../../../../../org.springframework.orm.hibernate5.support.OpenS
                         <a name="hibernateFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../FlushMode.html'>FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/plugins/databasemigration/liquibase/GormDatabase.html b/snapshot/api/org/grails/plugins/databasemigration/liquibase/GormDatabase.html
index 0152c36cbd..25ed969e1d 100644
--- a/snapshot/api/org/grails/plugins/databasemigration/liquibase/GormDatabase.html
+++ b/snapshot/api/org/grails/plugins/databasemigration/liquibase/GormDatabase.html
@@ -200,7 +200,7 @@ extends <a href='../../../../../liquibase.ext.hibernate.database.HibernateDataba
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GormDatabase(Dialect, org.grails.datastore.mapping.services.ServiceRegistry, org.grails.orm.hibernate.HibernateDatastore)">GormDatabase</a></strong>(<a href='../../../../../Dialect.html'>Dialect</a> dialect, <a href='../../../../../org/grails/datastore/mapping/services/ServiceRegistry.html'>ServiceRegistry</a> serviceRegistry, <a href='../../../../../org/grails/orm/hibernate/HibernateDatastore.html'>HibernateDatastore</a> hibernateD [...]
+                                <code><strong><a href="#GormDatabase(org.hibernate.dialect.Dialect, org.grails.datastore.mapping.services.ServiceRegistry, org.grails.orm.hibernate.HibernateDatastore)">GormDatabase</a></strong>(<a href='../../../../../org.hibernate.dialect.Dialect.html'>Dialect</a> dialect, <a href='../../../../../org/grails/datastore/mapping/services/ServiceRegistry.html'>ServiceRegistry</a> serviceRegistry, <a href='../../../../../org/grails/orm/hibernate/HibernateDatas [...]
                         </tr>
                         
                     </table>
@@ -232,7 +232,7 @@ extends <a href='../../../../../liquibase.ext.hibernate.database.HibernateDataba
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code><a href='../../../../../Dialect.html'>Dialect</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../org.hibernate.dialect.Dialect.html'>Dialect</a></code></td>
                             <td class="colLast"><code><strong><a href="#getDialect()">getDialect</a></strong>()</code><br></td>
                         </tr>
                         
@@ -319,10 +319,10 @@ extends <a href='../../../../../liquibase.ext.hibernate.database.HibernateDataba
                             </li>
                         </ul>
                     
-                        <a name="GormDatabase(Dialect, org.grails.datastore.mapping.services.ServiceRegistry, org.grails.orm.hibernate.HibernateDatastore)"><!-- --></a>
+                        <a name="GormDatabase(org.hibernate.dialect.Dialect, org.grails.datastore.mapping.services.ServiceRegistry, org.grails.orm.hibernate.HibernateDatastore)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GormDatabase</strong>(<a href='../../../../../Dialect.html'>Dialect</a> dialect, <a href='../../../../../org/grails/datastore/mapping/services/ServiceRegistry.html'>ServiceRegistry</a> serviceRegistry, <a href='../../../../../org/grails/orm/hibernate/HibernateDatastore.html'>HibernateDatastore</a> hibernateDatastore)</h4>
+                                <h4><strong>GormDatabase</strong>(<a href='../../../../../org.hibernate.dialect.Dialect.html'>Dialect</a> dialect, <a href='../../../../../org/grails/datastore/mapping/services/ServiceRegistry.html'>ServiceRegistry</a> serviceRegistry, <a href='../../../../../org/grails/orm/hibernate/HibernateDatastore.html'>HibernateDatastore</a> hibernateDatastore)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -351,7 +351,7 @@ extends <a href='../../../../../liquibase.ext.hibernate.database.HibernateDataba
                         <a name="getDialect()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br><a href='../../../../../Dialect.html'>Dialect</a> <strong>getDialect</strong>()</h4>
+                                <h4>@java.lang.Override<br><a href='../../../../../org.hibernate.dialect.Dialect.html'>Dialect</a> <strong>getDialect</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/plugins/web/controllers/metaclass/RenderDynamicMethod.html b/snapshot/api/org/grails/plugins/web/controllers/metaclass/RenderDynamicMethod.html
index 70c4d5c203..468dac3781 100644
--- a/snapshot/api/org/grails/plugins/web/controllers/metaclass/RenderDynamicMethod.html
+++ b/snapshot/api/org/grails/plugins/web/controllers/metaclass/RenderDynamicMethod.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 public class RenderDynamicMethod
 extends java.lang.Object</pre>
 
diff --git a/snapshot/api/org/grails/plugins/web/mapping/factory/UrlMappingFactoryBean.html b/snapshot/api/org/grails/plugins/web/mapping/factory/UrlMappingFactoryBean.html
index fff4f80bea..a03ea4b12c 100644
--- a/snapshot/api/org/grails/plugins/web/mapping/factory/UrlMappingFactoryBean.html
+++ b/snapshot/api/org/grails/plugins/web/mapping/factory/UrlMappingFactoryBean.html
@@ -106,7 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 public class UrlMappingFactoryBean
 extends <a href='../../../../../../org.springframework.beans.factory.config.AbstractFactoryBean.html'>AbstractFactoryBean</a>
 implements <a href='../../../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a></pre>
diff --git a/snapshot/api/org/grails/plugins/web/servlet/context/BootStrapClassRunner.html b/snapshot/api/org/grails/plugins/web/servlet/context/BootStrapClassRunner.html
index c609461dd2..94166323d2 100644
--- a/snapshot/api/org/grails/plugins/web/servlet/context/BootStrapClassRunner.html
+++ b/snapshot/api/org/grails/plugins/web/servlet/context/BootStrapClassRunner.html
@@ -107,7 +107,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>@groovy.transform.CompileStatic
-@groovy.util.logging.Commons
+@groovy.util.logging.Slf4j
 class BootStrapClassRunner
 extends <a href='../../../../../../grails/core/GrailsApplicationLifeCycleAdapter.html'>GrailsApplicationLifeCycleAdapter</a>
 implements <a href='../../../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../../../grails/core/support/GrailsApplicationAware.html'>GrailsApplicationAware</a>, <a href='../../../../../../grails/plugins/PluginManagerAware.html'>PluginManagerAware</a>, <a href='../../../../../../org.springframework.web.context.ServletContextAware.html'>ServletContextAware</a></pre>
diff --git a/snapshot/api/org/grails/plugins/web/taglib/FormTagLib.html b/snapshot/api/org/grails/plugins/web/taglib/FormTagLib.html
index d7abd27e4f..477b4b8cab 100644
--- a/snapshot/api/org/grails/plugins/web/taglib/FormTagLib.html
+++ b/snapshot/api/org/grails/plugins/web/taglib/FormTagLib.html
@@ -107,7 +107,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>@<a href='../../../../../grails/gsp/TagLib.html' title='TagLib'>TagLib</a>
-@groovy.util.logging.Commons
+@groovy.util.logging.Slf4j
 class FormTagLib
 extends java.lang.Object
 implements <a href='../../../../../org.springframework.context.ApplicationContextAware.html'>ApplicationContextAware</a>, <a href='../../../../../grails/core/support/GrailsConfigurationAware.html'>GrailsConfigurationAware</a>, <a href='../../../../../org.springframework.beans.factory.InitializingBean.html'>InitializingBean</a>, <a href='../../../../../grails/artefact/TagLibrary.html'>TagLibrary</a></pre>
diff --git a/snapshot/api/org/grails/spring/GrailsApplicationContext.html b/snapshot/api/org/grails/spring/GrailsApplicationContext.html
index 96729895f6..307c6bb057 100644
--- a/snapshot/api/org/grails/spring/GrailsApplicationContext.html
+++ b/snapshot/api/org/grails/spring/GrailsApplicationContext.html
@@ -269,7 +269,7 @@ implements groovy.lang.GroovyObject</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#registerPrototype(java.lang.String, Class, MutablePropertyValues)">registerPrototype</a></strong>(java.lang.String name, java.lang.Class&lt;?&gt; clazz, <a href='../../../MutablePropertyValues.html'>MutablePropertyValues</a> pvs)</code><br>Register a prototype bean with the underlying bean factory.</td>
+                            <td class="colLast"><code><strong><a href="#registerPrototype(java.lang.String, Class, org.springframework.beans.MutablePropertyValues)">registerPrototype</a></strong>(java.lang.String name, java.lang.Class&lt;?&gt; clazz, <a href='../../../org.springframework.beans.MutablePropertyValues.html'>MutablePropertyValues</a> pvs)</code><br>Register a prototype bean with the underlying bean factory.</td>
                         </tr>
                         
                         <tr class="altColor">
@@ -281,7 +281,7 @@ implements groovy.lang.GroovyObject</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#registerSingleton(java.lang.String, Class, MutablePropertyValues)">registerSingleton</a></strong>(java.lang.String name, java.lang.Class&lt;?&gt; clazz, <a href='../../../MutablePropertyValues.html'>MutablePropertyValues</a> pvs)</code><br>Register a singleton bean with the underlying bean factory.</td>
+                            <td class="colLast"><code><strong><a href="#registerSingleton(java.lang.String, Class, org.springframework.beans.MutablePropertyValues)">registerSingleton</a></strong>(java.lang.String name, java.lang.Class&lt;?&gt; clazz, <a href='../../../org.springframework.beans.MutablePropertyValues.html'>MutablePropertyValues</a> pvs)</code><br>Register a singleton bean with the underlying bean factory.</td>
                         </tr>
                         
                         <tr class="altColor">
@@ -463,10 +463,10 @@ implements groovy.lang.GroovyObject</pre>
                             </li>
                         </ul>
                     
-                        <a name="registerPrototype(java.lang.String, Class, MutablePropertyValues)"><!-- --></a>
+                        <a name="registerPrototype(java.lang.String, Class, org.springframework.beans.MutablePropertyValues)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>registerPrototype</strong>(java.lang.String name, java.lang.Class&lt;?&gt; clazz, <a href='../../../MutablePropertyValues.html'>MutablePropertyValues</a> pvs)</h4>
+                                <h4>public&nbsp;void <strong>registerPrototype</strong>(java.lang.String name, java.lang.Class&lt;?&gt; clazz, <a href='../../../org.springframework.beans.MutablePropertyValues.html'>MutablePropertyValues</a> pvs)</h4>
                                 <p> Register a prototype bean with the underlying bean factory.
  <p>For more advanced needs, register with the underlying BeanFactory directly.
       <DL><DT><B>See Also:</B></DT><DD><a href='#getDefaultListableBeanFactory'>getDefaultListableBeanFactory</a></DD></DL></p>
@@ -483,10 +483,10 @@ implements groovy.lang.GroovyObject</pre>
                             </li>
                         </ul>
                     
-                        <a name="registerSingleton(java.lang.String, Class, MutablePropertyValues)"><!-- --></a>
+                        <a name="registerSingleton(java.lang.String, Class, org.springframework.beans.MutablePropertyValues)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>registerSingleton</strong>(java.lang.String name, java.lang.Class&lt;?&gt; clazz, <a href='../../../MutablePropertyValues.html'>MutablePropertyValues</a> pvs)</h4>
+                                <h4>public&nbsp;void <strong>registerSingleton</strong>(java.lang.String name, java.lang.Class&lt;?&gt; clazz, <a href='../../../org.springframework.beans.MutablePropertyValues.html'>MutablePropertyValues</a> pvs)</h4>
                                 <p> Register a singleton bean with the underlying bean factory.
  <p>For more advanced needs, register with the underlying BeanFactory directly.
       <DL><DT><B>See Also:</B></DT><DD><a href='#getDefaultListableBeanFactory'>getDefaultListableBeanFactory</a></DD></DL></p>
diff --git a/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html b/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html
index f1ba5d5b1d..7b3bfccd71 100644
--- a/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html
+++ b/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html
@@ -108,7 +108,7 @@ extends java.lang.Object</pre>
  Stores the last-modified timestamp of the source file for efficient
  change detection, and the timestamp of the last refresh attempt
  (updated every time the cache entry gets re-validated).
-	 </p>
+     </p>
 
           </li>
     </ul>
diff --git a/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html b/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html
index 4cf281948c..0ca9e4b3ba 100644
--- a/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html
+++ b/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html
@@ -114,14 +114,14 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
  that accesses resource bundles using specified basenames, participating in the
  Spring org.springframework.context.ApplicationContext's resource loading.
 
- <p>In contrast to the JDK-based ResourceBundleMessageSource, this class uses
+ <p>In contrast to the JDK-based org.springframework.context.support.ResourceBundleMessageSource, this class uses
  java.util.Properties instances as its custom data structure for messages,
  loading them via a org.springframework.util.PropertiesPersister strategy
- from Spring Resource handles. This strategy is not only capable of
+ from Spring org.springframework.core.io.Resource handles. This strategy is not only capable of
  reloading files based on timestamp changes, but also of loading properties files
  with a specific character encoding. It will detect XML property files as well.
 
- <p>In contrast to ResourceBundleMessageSource, this class supports
+ <p>In contrast to org.springframework.context.support.ResourceBundleMessageSource, this class supports
  reloading of properties files through the <a href='#setCacheSeconds'>"cacheSeconds"</a>
  setting, and also through programmatically clearing the properties cache.
  Since application servers typically cache all files loaded from the classpath,
@@ -131,14 +131,14 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
 
  <p>Note that the base names set as <a href='#setBasenames'>"basenames"</a> property
  are treated in a slightly different fashion than the "basenames" property of
- ResourceBundleMessageSource. It follows the basic ResourceBundle rule of not
+ org.springframework.context.support.ResourceBundleMessageSource. It follows the basic ResourceBundle rule of not
  specifying file extension or language codes, but can refer to any Spring resource
  location (instead of being restricted to classpath resources). With a "classpath:"
  prefix, resources can still be loaded from the classpath, but "cacheSeconds" values
  other than "-1" (caching forever) will not work in this case.
 
  <p>This MessageSource implementation is usually slightly faster than
- ResourceBundleMessageSource, which builds on java.util.ResourceBundle
+ org.springframework.context.support.ResourceBundleMessageSource, which builds on java.util.ResourceBundle
  - in the default mode, i.e. when caching forever. With "cacheSeconds" set to 1,
  message lookup takes about twice as long - with the benefit that changes in
  individual properties files are detected with a maximum delay of 1 second.
@@ -152,7 +152,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
 
  <p>Thanks to Thomas Achleitner for providing the initial implementation of
  this message source!
-  <DL><DT><B>Authors:</B></DT><DD>Juergen Hoeller</DD><DD>Lari Hotari</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setCacheSeconds'>setCacheSeconds</a></DD><DD><a href='#setBasenames'>setBasenames</a></DD><DD><a href='#setDefaultEncoding'>setDefaultEncoding</a></DD><DD><a href='#setFileEncodings'>setFileEncodings</a></DD><DD><a href='#setPropertiesPersister'>setPropertiesPersister</a></DD><DD><a href='#setResourceLoader'>setResourceLoader</a></DD><DD>org.springframework.util.Defau [...]
+  <DL><DT><B>Authors:</B></DT><DD>Juergen Hoeller</DD><DD>Lari Hotari</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setCacheSeconds'>setCacheSeconds</a></DD><DD><a href='#setBasenames'>setBasenames</a></DD><DD><a href='#setDefaultEncoding'>setDefaultEncoding</a></DD><DD><a href='#setFileEncodings'>setFileEncodings</a></DD><DD><a href='#setPropertiesPersister'>setPropertiesPersister</a></DD><DD><a href='#setResourceLoader'>setResourceLoader</a></DD><DD>org.springframework.util.Defau [...]
 
           </li>
     </ul>
@@ -374,7 +374,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                             <td class="colLast"><code>public&nbsp;void</code></td>
                             <td class="colLast"><code><strong><a href="#setBasename(java.lang.String)">setBasename</a></strong>(java.lang.String basename)</code><br>Set a single basename, following the basic ResourceBundle convention of
  not specifying file extension or language codes, but in contrast to
- ResourceBundleMessageSource referring to a Spring resource location:
+ org.springframework.context.support.ResourceBundleMessageSource referring to a Spring resource location:
  e.g. </td>
                         </tr>
                         
@@ -383,7 +383,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                             <td class="colLast"><code>public&nbsp;void</code></td>
                             <td class="colLast"><code><strong><a href="#setBasenames(java.lang.String)">setBasenames</a></strong>(java.lang.String basenames)</code><br>Set an array of basenames, each following the basic ResourceBundle convention
  of not specifying file extension or language codes, but in contrast to
- ResourceBundleMessageSource referring to a Spring resource location:
+ org.springframework.context.support.ResourceBundleMessageSource referring to a Spring resource location:
  e.g. </td>
                         </tr>
                         
@@ -504,7 +504,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                                 <p> Calculate all filenames for the given bundle basename and Locale.
  Will calculate filenames for the given Locale, the system Locale
  (if applicable), and the default file.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>basename</code> -  the basename of the bundle</DD><DD><code>locale</code> -  the locale</DD></DL><DL><DT><B>Returns:</B></DT><DD>the List of filenames to check</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFallbackToSystemLocale'>setFallbackToSystemLocale</a></DD><DD><a href='#calculateFilenamesForLocale'>calculateFilenamesForLocale</a></DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>basename</code> -  the basename of the bundle</DD><DD><code>locale</code> -  the locale</DD></DL><DL><DT><B>Returns:</B></DT><DD>the List of filenames to check</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFallbackToSystemLocale'>setFallbackToSystemLocale</a></DD><DD><a href='#calculateFilenamesForLocale'>calculateFilenamesForLocale</a></DD></DL></p>
                             </li>
                         </ul>
                     
@@ -517,7 +517,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
  E.g.: basename "messages", Locale "de_AT_oo" -> "messages_de_AT_OO",
  "messages_de_AT", "messages_de".
  <p>Follows the rules defined by java.util.Locale#toString().
-	  <DL><DT><B>Parameters:</B></DT><DD><code>basename</code> -  the basename of the bundle</DD><DD><code>locale</code> -  the locale</DD></DL><DL><DT><B>Returns:</B></DT><DD>the List of filenames to check</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>basename</code> -  the basename of the bundle</DD><DD><code>locale</code> -  the locale</DD></DL><DL><DT><B>Returns:</B></DT><DD>the List of filenames to check</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -567,7 +567,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                                 <h4>public&nbsp;void <strong>clearCache</strong>()</h4>
                                 <p> Clear the resource bundle cache.
  Subsequent resolve calls will lead to reloading of the properties files.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
@@ -576,7 +576,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                             <li class="blockList">
                                 <h4>public&nbsp;void <strong>clearCacheIncludingAncestors</strong>()</h4>
                                 <p> Clear the resource bundle caches of this MessageSource and all its ancestors.
-	  <DL><DT><B>See Also:</B></DT><DD><a href='#clearCache'>clearCache</a></DD></DL></p>
+      <DL><DT><B>See Also:</B></DT><DD><a href='#clearCache'>clearCache</a></DD></DL></p>
                             </li>
                         </ul>
                     
@@ -585,7 +585,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                             <li class="blockList">
                                 <h4>public&nbsp;java.util.Set&lt;java.lang.String&gt; <strong>getBundleCodes</strong>(java.util.Locale locale, java.lang.String basenames)</h4>
                                 <p> Retrieves all codes from one or multiple basenames
-	  <DL><DT><B>Parameters:</B></DT><DD><code>locale</code> -  the locale</DD><DD><code>basenames</code> -  the basenames of the bundle</DD></DL><DL><DT><B>Returns:</B></DT><DD>a list with all codes from valid registered bundles</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>locale</code> -  the locale</DD><DD><code>basenames</code> -  the basenames of the bundle</DD></DL><DL><DT><B>Returns:</B></DT><DD>a list with all codes from valid registered bundles</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -599,7 +599,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
  <p>Only used when caching resource bundle contents forever, i.e.
  with <CODE>cacheSeconds &lt; 0</CODE>. Therefore, merged properties are always
  cached forever.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
@@ -609,7 +609,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                                 <h4>@java.lang.SuppressWarnings("rawtypes")<br>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>getProperties</strong>(java.lang.String filename, <a href='../../../../../org.springframework.core.io.Resource.html'>Resource</a> resource)</h4>
                                 <p> Get a PropertiesHolder for the given filename, either from the
  cache or freshly loaded.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>filename</code> -  the bundle filename (basename + Locale)</DD></DL><DL><DT><B>Returns:</B></DT><DD>the current PropertiesHolder for the bundle</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>filename</code> -  the bundle filename (basename + Locale)</DD></DL><DL><DT><B>Returns:</B></DT><DD>the current PropertiesHolder for the bundle</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -626,7 +626,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                             <li class="blockList">
                                 <h4>protected&nbsp;java.util.Properties <strong>loadProperties</strong>(<a href='../../../../../org.springframework.core.io.Resource.html'>Resource</a> resource, java.lang.String filename)</h4>
                                 <p> Load the properties from the given resource.<DL><DT><B>throws:</B></DT><DD>IOException if properties loading failed</DD></DL>
-	  <DL><DT><B>Parameters:</B></DT><DD><code>resource</code> -  the resource to load from</DD><DD><code>filename</code> -  the original bundle filename (basename + Locale)</DD></DL><DL><DT><B>Returns:</B></DT><DD>the populated Properties instance</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>resource</code> -  the resource to load from</DD><DD><code>filename</code> -  the original bundle filename (basename + Locale)</DD></DL><DL><DT><B>Returns:</B></DT><DD>the populated Properties instance</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -652,7 +652,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                                 <h4>@java.lang.Override<br>protected&nbsp;java.text.MessageFormat <strong>resolveCode</strong>(java.lang.String code, java.util.Locale locale)</h4>
                                 <p> Resolves the given message code as key in the retrieved bundle files,
  using a cached MessageFormat instance per message code.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
@@ -662,7 +662,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                                 <h4>@java.lang.Override<br>protected&nbsp;java.lang.String <strong>resolveCodeWithoutArguments</strong>(java.lang.String code, java.util.Locale locale)</h4>
                                 <p> Resolves the given message code as key in the retrieved bundle files,
  returning the value found in the bundle as-is (without MessageFormat parsing).
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
@@ -672,12 +672,12 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                                 <h4>public&nbsp;void <strong>setBasename</strong>(java.lang.String basename)</h4>
                                 <p> Set a single basename, following the basic ResourceBundle convention of
  not specifying file extension or language codes, but in contrast to
- ResourceBundleMessageSource referring to a Spring resource location:
+ org.springframework.context.support.ResourceBundleMessageSource referring to a Spring resource location:
  e.g. "WEB-INF/messages" for "WEB-INF/messages.properties",
  "WEB-INF/messages_en.properties", etc.
  <p>XML properties files are also supported: .g. "WEB-INF/messages" will find
  and load "WEB-INF/messages.xml", "WEB-INF/messages_en.xml", etc as well.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>basename</code> -  the single basename</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setBasenames'>setBasenames</a></DD><DD>org.springframework.core.io.ResourceEditor</DD><DD>java.util.ResourceBundle</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>basename</code> -  the single basename</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setBasenames'>setBasenames</a></DD><DD>org.springframework.core.io.ResourceEditor</DD><DD>java.util.ResourceBundle</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -687,7 +687,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                                 <h4>public&nbsp;void <strong>setBasenames</strong>(java.lang.String basenames)</h4>
                                 <p> Set an array of basenames, each following the basic ResourceBundle convention
  of not specifying file extension or language codes, but in contrast to
- ResourceBundleMessageSource referring to a Spring resource location:
+ org.springframework.context.support.ResourceBundleMessageSource referring to a Spring resource location:
  e.g. "WEB-INF/messages" for "WEB-INF/messages.properties",
  "WEB-INF/messages_en.properties", etc.
  <p>XML properties files are also supported: .g. "WEB-INF/messages" will find
@@ -695,7 +695,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
  <p>The associated resource bundles will be checked sequentially when resolving
  a message code. Note that message definitions in a <i>previous</i> resource
  bundle will override ones in a later bundle, due to the sequential lookup.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>basenames</code> -  an array of basenames</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setBasename'>setBasename</a></DD><DD>java.util.ResourceBundle</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>basenames</code> -  an array of basenames</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setBasename'>setBasename</a></DD><DD>java.util.ResourceBundle</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -712,7 +712,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
  <li>A value of "0" will attemp to list the matching properties files on
  every message access. <b>Do not use this in a production environment!</b>
  </ul>
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
@@ -725,7 +725,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
  <p>Default is none, using the <CODE>java.util.Properties</CODE>
  default encoding: ISO-8859-1.
  <p>Only applies to classic properties files, not to XML files.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>defaultEncoding</code> -  the default charset</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFileEncodings'>setFileEncodings</a></DD><DD>org.springframework.util.PropertiesPersister#load</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>defaultEncoding</code> -  the default charset</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFileEncodings'>setFileEncodings</a></DD><DD>org.springframework.util.PropertiesPersister#load</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -741,7 +741,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
  <CODE>java.util.ResourceBundle</CODE>. However, this is often not desirable
  in an application server environment, where the system Locale is not relevant
  to the application at all: Set this flag to "false" in such a scenario.
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
@@ -760,7 +760,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
  <li>A value of "0" will check the last-modified timestamp of the file on
  every message access. <b>Do not use this in a production environment!</b>
  </ul>
-	 </p>
+     </p>
                             </li>
                         </ul>
                     
@@ -770,7 +770,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                                 <h4>public&nbsp;void <strong>setFileEncodings</strong>(java.util.Properties fileEncodings)</h4>
                                 <p> Set per-file charsets to use for parsing properties files.
  <p>Only applies to classic properties files, not to XML files.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>fileEncodings</code> -  Properties with filenames as keys and charset
+      <DL><DT><B>Parameters:</B></DT><DD><code>fileEncodings</code> -  Properties with filenames as keys and charset
  names as values. Filenames have to match the basename syntax,
  with optional locale-specific appendices: e.g. "WEB-INF/messages"
  or "WEB-INF/messages_en".</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setBasenames'>setBasenames</a></DD><DD>org.springframework.util.PropertiesPersister#load</DD></DL></p>
@@ -783,7 +783,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                                 <h4>public&nbsp;void <strong>setPropertiesPersister</strong>(<a href='../../../../../org.springframework.util.PropertiesPersister.html'>PropertiesPersister</a> propertiesPersister)</h4>
                                 <p> Set the PropertiesPersister to use for parsing properties files.
  <p>The default is a DefaultPropertiesPersister.
-	  <DL><DT><B>See Also:</B></DT><DD>org.springframework.util.DefaultPropertiesPersister</DD></DL></p>
+      <DL><DT><B>See Also:</B></DT><DD>org.springframework.util.DefaultPropertiesPersister</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -796,7 +796,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
  ApplicationContext if running in a context, as it implements the
  ResourceLoaderAware interface. Can be manually overridden when
  running outside of an ApplicationContext.
-	  <DL><DT><B>See Also:</B></DT><DD>org.springframework.core.io.DefaultResourceLoader</DD><DD>org.springframework.context.ResourceLoaderAware</DD></DL></p>
+      <DL><DT><B>See Also:</B></DT><DD>org.springframework.core.io.DefaultResourceLoader</DD><DD>org.springframework.context.ResourceLoaderAware</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/taglib/encoder/WithCodecHelper.html b/snapshot/api/org/grails/taglib/encoder/WithCodecHelper.html
index f7021437bf..ad6f3bd92e 100644
--- a/snapshot/api/org/grails/taglib/encoder/WithCodecHelper.html
+++ b/snapshot/api/org/grails/taglib/encoder/WithCodecHelper.html
@@ -102,7 +102,6 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>@groovy.transform.CompileStatic
-@groovy.util.logging.Commons
 class WithCodecHelper
 extends java.lang.Object</pre>
 
@@ -376,7 +375,7 @@ extends java.lang.Object</pre>
  In addition there is
  <ul>
  <li>inherit (boolean) - defaults to true. Controls whether codecs should be inherited to deeper level (taglib calls)</li>
- <li>replaceonly (boolean) - defaults to false. Codecs will be only replaced if the previous inherited codec is safe.</li> 
+ <li>replaceonly (boolean) - defaults to false. Codecs will be only replaced if the previous inherited codec is safe.</li>
  </ul> <DL><DT><B>Parameters:</B></DT><DD><code>grailsApplication</code> -  the grailsApplication instance</DD><DD><code>codecInfo</code> -  this parameter is explained above</DD><DD><code>closure</code> -  the closure to execute</DD></DL><DL><DT><B>Returns:</B></DT><DD>the return value of the closure</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/testing/spock/AutowiredInterceptor.html b/snapshot/api/org/grails/testing/spock/AutowiredInterceptor.html
index 80242e1f05..ab67b75911 100644
--- a/snapshot/api/org/grails/testing/spock/AutowiredInterceptor.html
+++ b/snapshot/api/org/grails/testing/spock/AutowiredInterceptor.html
@@ -106,8 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@groovy.util.logging.Slf4j
-@groovy.transform.CompileStatic
+<pre>@groovy.transform.CompileStatic
 class AutowiredInterceptor
 extends java.lang.Object
 implements <a href='../../../../org.spockframework.runtime.extension.IMethodInterceptor.html'>IMethodInterceptor</a></pre>
diff --git a/snapshot/api/org/grails/transaction/ChainedTransactionManager.html b/snapshot/api/org/grails/transaction/ChainedTransactionManager.html
index 3a2ddea51d..9757378485 100644
--- a/snapshot/api/org/grails/transaction/ChainedTransactionManager.html
+++ b/snapshot/api/org/grails/transaction/ChainedTransactionManager.html
@@ -118,7 +118,7 @@ implements <a href='../../../org.springframework.transaction.PlatformTransaction
  which means the PlatformTransactionManager most likely to break the transaction should be the <em>last</em>
  in the list configured. A PlatformTransactionManager throwing an exception during commit will automatically
  cause the remaining transaction managers to roll back instead of committing.
- 
+
  original source: https://github.com/spring-projects/spring-data-commons/blob/master/src/main/java/org/springframework/data/transaction/ChainedTransactionManager.java
   <DL><DT><B>Authors:</B></DT><DD>Michael Hunger</DD><DD>Oliver Gierke</DD><DD>Lari Hotari</DD><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>2.3.6</DD></DL></p>
 
@@ -263,7 +263,7 @@ implements <a href='../../../org.springframework.transaction.PlatformTransaction
                             <li class="blockList">
                                 <h4>public&nbsp;<strong>ChainedTransactionManager</strong>(<a href='../../../org.springframework.transaction.PlatformTransactionManager.html'>PlatformTransactionManager</a> transactionManagers)</h4>
                                 <p> Creates a new <a href='../../../org/grails/transaction/ChainedTransactionManager.html' title='ChainedTransactionManager'>ChainedTransactionManager</a> delegating to the given PlatformTransactionManagers.
-	  <DL><DT><B>Parameters:</B></DT><DD><code>transactionManagers</code> -  must not be null or empty.</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>transactionManagers</code> -  must not be null or empty.</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/transaction/ChainedTransactionManagerPostProcessor.html b/snapshot/api/org/grails/transaction/ChainedTransactionManagerPostProcessor.html
index 4c92d296c5..c3f44e5f42 100644
--- a/snapshot/api/org/grails/transaction/ChainedTransactionManagerPostProcessor.html
+++ b/snapshot/api/org/grails/transaction/ChainedTransactionManagerPostProcessor.html
@@ -111,15 +111,15 @@ extends java.lang.Object
 implements <a href='../../../org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor.html'>BeanDefinitionRegistryPostProcessor</a>, <a href='../../../org.springframework.core.Ordered.html'>Ordered</a></pre>
 
     <p>  A BeanDefinitionRegistryPostProcessor for using the "Best Effort 1 Phase Commit" (BE1PC) in Grails
-  applications when there are multiple data sources.  
-  
+  applications when there are multiple data sources.
+
   When the context contains multiple transactionManager beans, the bean with the name "transactionManager"
   will be renamed to "$primaryTransactionManager" and a new ChainedTransactionManager bean will be added with the name
   "transactionManager". All transactionManager beans will be registered in the ChainedTransactionManager bean.
 
-  The post processor checks if the previous transactionManager bean is an instance of JtaTransactionManager. 
+  The post processor checks if the previous transactionManager bean is an instance of JtaTransactionManager.
   In that case it will not do anything since it's assumed that JTA/XA is handling transactions spanning multiple datasources.
-  
+
   For performance reasons an additional dataSource can be marked as non-transactional by adding a property 'transactional = false' in
   it's dataSource configuration. This will leave the dataSource out of the transactions initiated by Grails transactions.
   This is the default behaviour in Grails versions before Grails 2.3.6 .
diff --git a/snapshot/api/org/grails/web/converters/configuration/ConvertersConfigurationHolder.html b/snapshot/api/org/grails/web/converters/configuration/ConvertersConfigurationHolder.html
index 36632b6bdc..d1e95e55b6 100644
--- a/snapshot/api/org/grails/web/converters/configuration/ConvertersConfigurationHolder.html
+++ b/snapshot/api/org/grails/web/converters/configuration/ConvertersConfigurationHolder.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 public class ConvertersConfigurationHolder
 extends java.lang.Object</pre>
 
diff --git a/snapshot/api/org/grails/web/databinding/DataBindingEventMulticastListener.html b/snapshot/api/org/grails/web/databinding/DataBindingEventMulticastListener.html
index 405752d6d2..fc43822c99 100644
--- a/snapshot/api/org/grails/web/databinding/DataBindingEventMulticastListener.html
+++ b/snapshot/api/org/grails/web/databinding/DataBindingEventMulticastListener.html
@@ -107,7 +107,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>@groovy.transform.CompileStatic
-@groovy.util.logging.Commons
+@groovy.util.logging.Slf4j
 class DataBindingEventMulticastListener
 extends java.lang.Object
 implements <a href='../../../../grails/databinding/events/DataBindingListener.html'>DataBindingListener</a></pre>
diff --git a/snapshot/api/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.html b/snapshot/api/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.html
index 007aa8cdd7..a95ff3c994 100644
--- a/snapshot/api/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.html
+++ b/snapshot/api/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.html
@@ -326,7 +326,7 @@ implements TypedStructuredBindingEditor&lt;T&gt;</pre>
  in the resulting Map with a key that matches the original key with the propertyName
  plus prefix removed.  For example, if propertyPrefix is &quot;address&quot; and
  bindingSource contains the key &quot;address_city&quot; with a value of &quot;St. Louis&quot;
- then the resulting Map will contain an entry such that the key is &quot;city&quot; 
+ then the resulting Map will contain an entry such that the key is &quot;city&quot;
  with a value of &quot;St. Louis&quot; <DL><DT><B>Parameters:</B></DT><DD><code>propertyPrefix</code> -  The property name to extract structured values for</DD><DD><code>bindingSource</code> -  the DataBindingSource to extract structured values from</DD></DL><DL><DT><B>Returns:</B></DT><DD>A Map containing keys and values as described above.</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/org/grails/web/json/parser/ParseException.html b/snapshot/api/org/grails/web/json/parser/ParseException.html
index f64ad10ed5..0a7f9642de 100644
--- a/snapshot/api/org/grails/web/json/parser/ParseException.html
+++ b/snapshot/api/org/grails/web/json/parser/ParseException.html
@@ -297,7 +297,7 @@ extends java.lang.Exception</pre>
                                 <p> This is the last token that has been consumed successfully.  If
  this object has been created due to a parse error, the token
  followng this token will (therefore) be the first error token.
-   </p>
+    </p>
                             </li>
                         </ul>
                     
@@ -306,7 +306,7 @@ extends java.lang.Exception</pre>
                             <li class="blockList">
                                 <h4>protected&nbsp;java.lang.String <strong>eol</strong></h4>
                                 <p> The end of line string for this machine.
-   </p>
+    </p>
                             </li>
                         </ul>
                     
@@ -317,7 +317,7 @@ extends java.lang.Exception</pre>
                                 <p> Each entry in this array is an array of integers.  Each array
  of integers represents a sequence of tokens (by their ordinal
  values) that is expected at this point of the parse.
-   </p>
+    </p>
                             </li>
                         </ul>
                     
@@ -328,7 +328,7 @@ extends java.lang.Exception</pre>
                                 <p> This variable determines which constructor was used to create
  this object and thereby affects the semantics of the
  "getMessage" method (see below).
-   </p>
+    </p>
                             </li>
                         </ul>
                     
@@ -339,7 +339,7 @@ extends java.lang.Exception</pre>
                                 <p> This is a reference to the "tokenImage" array of the generated
  parser within which the parse error occurred.  This array is
  defined in the generated ...Constants interface.
-   </p>
+    </p>
                             </li>
                         </ul>
                     
@@ -373,7 +373,7 @@ extends java.lang.Exception</pre>
  to force the "toString" method of parent class "Throwable" to
  print the error message in the form:
      ParseException: "result of getMessage"
-   </p>
+    </p>
                             </li>
                         </ul>
                     
@@ -413,7 +413,7 @@ extends java.lang.Exception</pre>
                                 <p> Used to convert raw characters to their escaped version
  when these raw version cannot be used as part of an ASCII
  string literal.
-   </p>
+    </p>
                             </li>
                         </ul>
                     
@@ -429,7 +429,7 @@ extends java.lang.Exception</pre>
  from the parser), then this method is called during the printing
  of the final stack trace, and hence the correct error message
  gets displayed.
-   </p>
+    </p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/web/mapping/DefaultUrlMappingsHolder.html b/snapshot/api/org/grails/web/mapping/DefaultUrlMappingsHolder.html
index 93d9d58bea..f4ead0bbbc 100644
--- a/snapshot/api/org/grails/web/mapping/DefaultUrlMappingsHolder.html
+++ b/snapshot/api/org/grails/web/mapping/DefaultUrlMappingsHolder.html
@@ -253,7 +253,7 @@ implements <a href='../../../../grails/web/mapping/UrlMappings.html'>UrlMappings
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;<a href='../../../../grails/web/mapping/UrlCreator.html'>UrlCreator</a></code></td>
-                            <td class="colLast"><code><strong><a href="#getReverseMapping(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.util.Map)">getReverseMapping</a></strong>(java.lang.String controller, java.lang.String action, java.lang.String namespace, java.lang.String pluginName, java.util.Map params)</code><br> <DL><DT><B>See Also:</B></DT><DD>UrlMappingsHolder#getReverseMapping(String, String, java.util.Map)</DD></DL></td>
+                            <td class="colLast"><code><strong><a href="#getReverseMapping(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.util.Map)">getReverseMapping</a></strong>(java.lang.String controller, java.lang.String action, java.lang.String namespace, java.lang.String pluginName, java.util.Map params)</code><br> <DL><DT><B>See Also:</B></DT><DD><a href='../../../../grails/web/mapping/UrlMappingsHolder.html#getReverseMapping(String, String, java.util [...]
                         </tr>
                         
                         <tr class="altColor">
@@ -522,7 +522,7 @@ implements <a href='../../../../grails/web/mapping/UrlMappings.html'>UrlMappings
                             <li class="blockList">
                                 <h4>public&nbsp;<a href='../../../../grails/web/mapping/UrlCreator.html'>UrlCreator</a> <strong>getReverseMapping</strong>(java.lang.String controller, java.lang.String action, java.lang.String namespace, java.lang.String pluginName, java.util.Map params)</h4>
                                 <p>
-      <DL><DT><B>See Also:</B></DT><DD>UrlMappingsHolder#getReverseMapping(String, String, java.util.Map)</DD></DL></p>
+      <DL><DT><B>See Also:</B></DT><DD><a href='../../../../grails/web/mapping/UrlMappingsHolder.html#getReverseMapping(String, String, java.util.Map)' title='UrlMappingsHolder.getReverseMapping'>UrlMappingsHolder.getReverseMapping</a></DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/api/org/grails/web/mapping/ResponseCodeUrlMappingVisitor.html b/snapshot/api/org/grails/web/mapping/ResponseCodeUrlMappingVisitor.html
index 7f5afc82a6..6ee33a3265 100644
--- a/snapshot/api/org/grails/web/mapping/ResponseCodeUrlMappingVisitor.html
+++ b/snapshot/api/org/grails/web/mapping/ResponseCodeUrlMappingVisitor.html
@@ -197,18 +197,12 @@ extends org.codehaus.groovy.ast.ClassCodeVisitorSupport</pre>
                         </tr>
                         
                         <tr class="rowColor">
-                            <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>void</code></td>
-                            <td class="colLast"><code><strong><a href="#visitExpressionStatement(org.codehaus.groovy.ast.stmt.ExpressionStatement)">visitExpressionStatement</a></strong>(org.codehaus.groovy.ast.stmt.ExpressionStatement statement)</code><br></td>
-                        </tr>
-                        
-                        <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>void</code></td>
                             <td class="colLast"><code><strong><a href="#visitMethodCallExpression(org.codehaus.groovy.ast.expr.MethodCallExpression)">visitMethodCallExpression</a></strong>(org.codehaus.groovy.ast.expr.MethodCallExpression call)</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
+                        <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>void</code></td>
                             <td class="colLast"><code><strong><a href="#visitProperty(org.codehaus.groovy.ast.PropertyNode)">visitProperty</a></strong>(org.codehaus.groovy.ast.PropertyNode node)</code><br></td>
@@ -316,14 +310,6 @@ extends org.codehaus.groovy.ast.ClassCodeVisitorSupport</pre>
                             </li>
                         </ul>
                     
-                        <a name="visitExpressionStatement(org.codehaus.groovy.ast.stmt.ExpressionStatement)"><!-- --></a>
-                        <ul class="blockListLast">
-                            <li class="blockList">
-                                <h4>void <strong>visitExpressionStatement</strong>(org.codehaus.groovy.ast.stmt.ExpressionStatement statement)</h4>
-                                <p></p>
-                            </li>
-                        </ul>
-                    
                         <a name="visitMethodCallExpression(org.codehaus.groovy.ast.expr.MethodCallExpression)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
diff --git a/snapshot/api/org/grails/web/mapping/reporting/UrlMappingsReportCommand.html b/snapshot/api/org/grails/web/mapping/reporting/UrlMappingsReportCommand.html
index b33198d801..9d83c55b6a 100644
--- a/snapshot/api/org/grails/web/mapping/reporting/UrlMappingsReportCommand.html
+++ b/snapshot/api/org/grails/web/mapping/reporting/UrlMappingsReportCommand.html
@@ -108,7 +108,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
 <pre>@groovy.transform.CompileStatic
 @groovy.transform.EqualsAndHashCode
-@groovy.util.logging.Commons
+@groovy.util.logging.Slf4j
 class UrlMappingsReportCommand
 extends java.lang.Object
 implements <a href='../../../../../grails/dev/commands/ApplicationCommand.html'>ApplicationCommand</a></pre>
diff --git a/snapshot/api/org/grails/web/servlet/GrailsFlashScope.html b/snapshot/api/org/grails/web/servlet/GrailsFlashScope.html
index f01098ccfe..c469baf7f9 100644
--- a/snapshot/api/org/grails/web/servlet/GrailsFlashScope.html
+++ b/snapshot/api/org/grails/web/servlet/GrailsFlashScope.html
@@ -106,7 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 public class GrailsFlashScope
 extends java.lang.Object
 implements <a href='../../../../grails/web/mvc/FlashScope.html'>FlashScope</a></pre>
diff --git a/snapshot/api/org/grails/web/servlet/view/GroovyPageViewResolver.html b/snapshot/api/org/grails/web/servlet/view/GroovyPageViewResolver.html
index 095e4c7cb5..6b2dcf5455 100644
--- a/snapshot/api/org/grails/web/servlet/view/GroovyPageViewResolver.html
+++ b/snapshot/api/org/grails/web/servlet/view/GroovyPageViewResolver.html
@@ -512,7 +512,7 @@ implements <a href='../../../../../org/grails/web/servlet/view/GrailsViewResolve
                         <a name="setTemplateEngine(org.grails.gsp.GroovyPagesTemplateEngine)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@org.springframework.beans.factory.annotation.Autowired(required=true)<br>@org.springframework.beans.factory.annotation.Qualifier(GroovyPagesTemplateEngine.BEAN_ID)<br>public&nbsp;void <strong>setTemplateEngine</strong>(<a href='../../../../../org/grails/gsp/GroovyPagesTemplateEngine.html'>GroovyPagesTemplateEngine</a> templateEngine)</h4>
+                                <h4>@org.springframework.beans.factory.annotation.Autowired(required = true)<br>@org.springframework.beans.factory.annotation.Qualifier(GroovyPagesTemplateEngine.BEAN_ID)<br>public&nbsp;void <strong>setTemplateEngine</strong>(<a href='../../../../../org/grails/gsp/GroovyPagesTemplateEngine.html'>GroovyPagesTemplateEngine</a> templateEngine)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/api/reactor/bus/EventBus.html b/snapshot/api/reactor/bus/EventBus.html
index 02fb861812..ff67b57807 100644
--- a/snapshot/api/reactor/bus/EventBus.html
+++ b/snapshot/api/reactor/bus/EventBus.html
@@ -107,7 +107,6 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>@java.lang.Deprecated
-@groovy.util.logging.Slf4j
 class EventBus
 extends java.lang.Object
 implements <a href='../../reactor/bus/Bus.html'>Bus</a></pre>
diff --git a/snapshot/grails-data/api/grails/gorm/transactions/GrailsTransactionTemplate.html b/snapshot/grails-data/api/grails/gorm/transactions/GrailsTransactionTemplate.html
index 522f151e8d..13b3d88532 100644
--- a/snapshot/grails-data/api/grails/gorm/transactions/GrailsTransactionTemplate.html
+++ b/snapshot/grails-data/api/grails/gorm/transactions/GrailsTransactionTemplate.html
@@ -358,7 +358,7 @@ extends java.lang.Object</pre>
                         <a name="execute(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; T <strong>execute</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; action)</h4>
+                                <h4>&lt;T&gt; T <strong>execute</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; action)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -366,7 +366,7 @@ extends java.lang.Object</pre>
                         <a name="executeAndRollback(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; T <strong>executeAndRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; action)</h4>
+                                <h4>&lt;T&gt; T <strong>executeAndRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; action)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/api/grails/gorm/transactions/TransactionService.html b/snapshot/grails-data/api/grails/gorm/transactions/TransactionService.html
index 7885879582..5d51979d6b 100644
--- a/snapshot/grails-data/api/grails/gorm/transactions/TransactionService.html
+++ b/snapshot/grails-data/api/grails/gorm/transactions/TransactionService.html
@@ -219,7 +219,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withNewTransaction(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withNewTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withNewTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a new transaction with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -227,7 +227,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withNewTransaction(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withNewTransaction</strong>(<a href='../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withNewTransaction</strong>(<a href='../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a new transaction with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>definition</code> -  The transaction definition</DD><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -235,7 +235,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withRollback(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction that is automatically rolled back with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -243,7 +243,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withRollback(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withRollback</strong>(<a href='../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withRollback</strong>(<a href='../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction that is automatically rolled back with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>definition</code> -  The transaction definition</DD><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -251,7 +251,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withTransaction(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -259,7 +259,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withTransaction(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(<a href='../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(<a href='../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction with the given definition <DL><DT><B>Parameters:</B></DT><DD><code>definition</code> -  The transaction definition</DD><DD><code>callable</code> -  The callable The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result of the callable</DD></DL></p>
                             </li>
                         </ul>
@@ -267,7 +267,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withTransaction(java.util.Map, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(java.util.Map definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(java.util.Map definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction with the given definition <DL><DT><B>Parameters:</B></DT><DD><code>definition</code> -  The transaction definition as a map</DD><DD><code>callable</code> -  The callable The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result of the callable</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/api/index-all.html b/snapshot/grails-data/api/index-all.html
index fd8a950132..469ab7980f 100644
--- a/snapshot/grails-data/api/index-all.html
+++ b/snapshot/grails-data/api/index-all.html
@@ -1917,7 +1917,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSource.html#DataSourceConnectionSource(java.lang.String, javax.sql.DataSource, org.grails.datastore.gorm.jdbc.connections.DataSourceSettings)" title="Constructor in DataSourceConnectionSource">DataSourceConnectionSource(java.lang.String, javax.sql.DataSource, org.grails.datastore.gorm.jdbc.connections.DataSourceSettings)</a></span> - Constructor in <a href="org/grails/datastore/gorm/jdbc/conn [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.html" title="Class in org.grails.datastore.gorm.jdbc.connections">DataSourceConnectionSourceFactory</a></span> - Class in <a href="./org/grails/datastore/gorm/jdbc/connections/package-summary.html">org.grails.datastore.gorm.jdbc.connections</a>
-</dt><dd><div class="block">A ConnectionSourceFactory for creating JDBC javax.sql.DataSource connections</div></dd>
+</dt><dd><div class="block">A <a href='../../../../../../org/grails/datastore/mapping/core/connections/ConnectionSourceFactory.html' title='ConnectionSourceFactory'>ConnectionSourceFactory</a> for creating JDBC javax.sql.DataSource connections</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/config/Entity.html#datasources" title="Property in Entity">datasources</a></span> - Property in <a href="org/grails/datastore/mapping/config/Entity.html">Entity</a>
 </dt><dd> <div class="block">Get the datasource names that this domain class works with.</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.html" title="Class in org.grails.datastore.gorm.jdbc.connections">DataSourceSettings</a></span> - Class in <a href="./org/grails/datastore/gorm/jdbc/connections/package-summary.html">org.grails.datastore.gorm.jdbc.connections</a>
@@ -8673,9 +8673,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Sets the root alias to be used for the query</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/validation/constraints/builder/ConstrainedPropertyBuilder.html#setAllowDynamic(boolean)" title="Method in ConstrainedPropertyBuilder">setAllowDynamic(boolean)</a></span> - Method in <a href="org/grails/datastore/gorm/validation/constraints/builder/ConstrainedPropertyBuilder.html">ConstrainedPropertyBuilder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/core/AbstractDatastore.html#setApplicationContext(ApplicationContext)" title="Method in AbstractDatastore">setApplicationContext(ApplicationContext)</a></span> - Method in <a href="org/grails/datastore/mapping/core/AbstractDatastore.html">AbstractDatastore</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/core/AbstractDatastore.html#setApplicationContext(org.springframework.context.ApplicationContext)" title="Method in AbstractDatastore">setApplicationContext(org.springframework.context.ApplicationContext)</a></span> - Method in <a href="org/grails/datastore/mapping/core/AbstractDatastore.html">AbstractDatastore</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.html#setApplicationContext(ApplicationContext)" title="Method in SpringDataSourceConnectionSourceFactory">setApplicationContext(ApplicationContext)</a></span> - Method in <a href="org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.html">SpringDataSourceConnectionSourceFactory</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.html#setApplicationContext(org.springframework.context.ApplicationContext)" title="Method in SpringDataSourceConnectionSourceFactory">setApplicationContext(org.springframework.context.ApplicationContext)</a></span> - Method in <a href="org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.html">SpringDataSourceConnectionSourceFactory</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/finders/DynamicFinder.html#setArguments(java.lang.Object)" title="Method in DynamicFinder">setArguments(java.lang.Object)</a></span> - Method in <a href="org/grails/datastore/gorm/finders/DynamicFinder.html">DynamicFinder</a>
 </dt><dd> <div class="block"></div></dd>
@@ -9941,14 +9941,10 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/transform/AbstractMethodDecoratingTransformation.html#weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)" title="Method in AbstractMethodDecoratingTransformation">weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)</a></span> - Method in <a href="org/grails/datastore/gorm/tr [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html#weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)" title="Method in TransactionalTransform">weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)</a></span> - Method in <a href="org/grails/datastore/gorm/transactions/transfor [...]
-</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/compiler/gorm/DirtyCheckingTransformer.html#weaveIntoExistingSetter(java.lang.String, org.grails.compiler.gorm.DirtyCheckingTransformer.GetterAndSetter, org.codehaus.groovy.ast.MethodNode)" title="Method in DirtyCheckingTransformer">weaveIntoExistingSetter(java.lang.String, org.grails.compiler.gorm.DirtyCheckingTransformer.GetterAndSetter, org.codehaus.groovy.ast.MethodNode)</a></span> - Method in <a href="org/grails/compiler/gorm/DirtyCheckin [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/transform/AbstractMethodDecoratingTransformation.html#weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, Map<String, ClassNode>)" title="Method in AbstractMethodDecoratingTransformation">weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode,  [...]
 </dt><dd> <div class="block">Weaves a new method</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html#weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, Map<String, ClassNode>)" title="Method in TransactionalTransform">weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy [...]
-</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/validation/jakarta/services/implementers/MethodValidationImplementer.html#weaveParameterNameData(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, org.codehaus.groovy.ast.MethodNode)" title="Method in MethodValidationImplementer">weaveParameterNameData(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, org.codehaus.groovy.ast.MethodNode)</a></span> - Method in <a href="org/grails/datastor [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/transform/AbstractDatastoreMethodDecoratingTransformation.html#weaveSetTargetDatastoreBody(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.expr.Expression, org.codehaus.groovy.ast.stmt.BlockStatement)" title="Method in AbstractDatastoreMethodDecoratingTransformation">weaveSetTargetDatastoreBody(org.codehaus.groovy.control.SourceUnit, org.c [...]
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.html b/snapshot/grails-data/api/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.html
index 5ea77462cc..5303d2006a 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../ResourceLoaderAware.html'>ResourceLoaderAware</a></dd>
+                <dd><a href='../../../../../org.springframework.context.ResourceLoaderAware.html'>ResourceLoaderAware</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 abstract class AbstractDatastoreInitializer
 extends java.lang.Object
-implements <a href='../../../../../ResourceLoaderAware.html'>ResourceLoaderAware</a></pre>
+implements <a href='../../../../../org.springframework.context.ResourceLoaderAware.html'>ResourceLoaderAware</a></pre>
 
     <p> Abstract class for datastore initializers to implement <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>3.0.3</DD></DL></p>
 
@@ -349,7 +349,7 @@ implements <a href='../../../../../ResourceLoaderAware.html'>ResourceLoaderAware
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code><a href='../../../../../ApplicationContext.html'>ApplicationContext</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../org.springframework.context.ApplicationContext.html'>ApplicationContext</a></code></td>
                             <td class="colLast"><code><strong><a href="#configure()">configure</a></strong>()</code><br>Configures for an existing Mongo instance</td>
                         </tr>
                         
@@ -708,7 +708,7 @@ implements <a href='../../../../../ResourceLoaderAware.html'>ResourceLoaderAware
                         <a name="configure()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@groovy.transform.CompileStatic<br><a href='../../../../../ApplicationContext.html'>ApplicationContext</a> <strong>configure</strong>()</h4>
+                                <h4>@groovy.transform.CompileStatic<br><a href='../../../../../org.springframework.context.ApplicationContext.html'>ApplicationContext</a> <strong>configure</strong>()</h4>
                                 <p> Configures for an existing Mongo instance <DL><DT><B>Parameters:</B></DT><DD><code>mongo</code> -  The instance of Mongo</DD></DL><DL><DT><B>Returns:</B></DT><DD>The configured ApplicationContext</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.html b/snapshot/grails-data/api/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.html
index d76ed82d22..f3ace9c7bc 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>public class DataSourceConnectionSourceFactory
 extends <a href='../../../../../../org/grails/datastore/mapping/core/connections/AbstractConnectionSourceFactory.html'>AbstractConnectionSourceFactory</a></pre>
 
-    <p> A ConnectionSourceFactory for creating JDBC javax.sql.DataSource connections
+    <p> A <a href='../../../../../../org/grails/datastore/mapping/core/connections/ConnectionSourceFactory.html' title='ConnectionSourceFactory'>ConnectionSourceFactory</a> for creating JDBC javax.sql.DataSource connections
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>6.0</DD></DL></p>
 
           </li>
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.html b/snapshot/grails-data/api/org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.html
index a739ac7c7a..2f39ec34a8 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.html
@@ -160,7 +160,7 @@ implements <a href='../../../../../../org.springframework.context.ApplicationCon
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setApplicationContext(ApplicationContext)">setApplicationContext</a></strong>(<a href='../../../../../../ApplicationContext.html'>ApplicationContext</a> applicationContext)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#setApplicationContext(org.springframework.context.ApplicationContext)">setApplicationContext</a></strong>(<a href='../../../../../../org.springframework.context.ApplicationContext.html'>ApplicationContext</a> applicationContext)</code><br></td>
                         </tr>
                         
                     </table>
@@ -225,10 +225,10 @@ implements <a href='../../../../../../org.springframework.context.ApplicationCon
                             </li>
                         </ul>
                     
-                        <a name="setApplicationContext(ApplicationContext)"><!-- --></a>
+                        <a name="setApplicationContext(org.springframework.context.ApplicationContext)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>setApplicationContext</strong>(<a href='../../../../../../ApplicationContext.html'>ApplicationContext</a> applicationContext)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>setApplicationContext</strong>(<a href='../../../../../../org.springframework.context.ApplicationContext.html'>ApplicationContext</a> applicationContext)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/jdbc/connections/package-summary.html b/snapshot/grails-data/api/org/grails/datastore/gorm/jdbc/connections/package-summary.html
index 977dca8bb9..d32f186dc2 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/jdbc/connections/package-summary.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/jdbc/connections/package-summary.html
@@ -110,7 +110,7 @@ function windowTitle()
                                     DataSourceConnectionSourceFactory
                                 </a></strong>
                             </td>
-                            <td>A ConnectionSourceFactory for creating JDBC javax.sql.DataSource connections</td>
+                            <td>A <a href='../../../../../../org/grails/datastore/mapping/core/connections/ConnectionSourceFactory.html' title='ConnectionSourceFactory'>ConnectionSourceFactory</a> for creating JDBC javax.sql.DataSource connections</td>
                         </tr>
 <tr class="altColor">
                             <td class="colOne">
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.html b/snapshot/grails-data/api/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.html
index ab04484b49..c829ab3189 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.html
@@ -114,7 +114,7 @@ implements <a href='../../../../../../org.springframework.beans.factory.support.
     <p> BeanDefinitionRegistryPostProcessor that replaces multiple discovered PersistenceContextInterceptor beans with
  a single aggregating instance. The previous multiple PersistenceContextInterceptor beans will be removed from
  the context and re-added as inner beans of the new AggregatePersistenceContextInterceptor bean.
- 
+
  PersistenceContextInterceptor beans are discovered by the bean name. The default pattern used for matching
  the beans is ^.*[pP]ersistenceInterceptor$ <DL><DT><B>Authors:</B></DT><DD>Burt Beckwith</DD><DD>Lari Hotari</DD></DL></p>
 
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.html b/snapshot/grails-data/api/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.html
index 9d7043388a..b24c1dae5b 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.html
@@ -106,7 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase= CompilePhase.CANONICALIZATION)
+<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase = CompilePhase.CANONICALIZATION)
 public class DetachedCriteriaASTTransformation
 extends java.lang.Object
 implements org.codehaus.groovy.transform.ASTTransformation, org.codehaus.groovy.transform.TransformWithPriority</pre>
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.html b/snapshot/grails-data/api/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.html
index db608fbe6f..0e192c914a 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.html
@@ -106,7 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase= CompilePhase.CANONICALIZATION)
+<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase = CompilePhase.CANONICALIZATION)
 public class GlobalDetachedCriteriaASTTransformation
 extends java.lang.Object
 implements org.codehaus.groovy.transform.ASTTransformation, org.codehaus.groovy.transform.TransformWithPriority</pre>
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/services/DefaultTransactionService.html b/snapshot/grails-data/api/org/grails/datastore/gorm/services/DefaultTransactionService.html
index b83719910f..01337d40de 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/services/DefaultTransactionService.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/services/DefaultTransactionService.html
@@ -299,7 +299,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withNewTransaction(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withNewTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withNewTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -307,7 +307,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withNewTransaction(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withNewTransaction</strong>(<a href='../../../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withNewTransaction</strong>(<a href='../../../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -315,7 +315,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withRollback(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -323,7 +323,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withRollback(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withRollback</strong>(<a href='../../../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withRollback</strong>(<a href='../../../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -331,7 +331,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withTransaction(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -339,7 +339,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withTransaction(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(<a href='../../../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(<a href='../../../../../org.springframework.transaction.TransactionDefinition.html'>TransactionDefinition</a> definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -347,7 +347,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withTransaction(java.util.Map, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(java.util.Map definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(java.util.Map definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.html b/snapshot/grails-data/api/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.html
index 9c51f26258..bde1b4bf51 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.html
@@ -111,9 +111,9 @@ extends java.lang.Object
 implements <a href='../../../../../org/grails/datastore/gorm/timestamp/TimestampProvider.html'>TimestampProvider</a></pre>
 
     <p> Default implementation of TimestampProvider
- 
+
  supports creating timestamps for any class that supports a constructor that accepts a Long or long value.
- 
+
  "currentTimeMillis" can be overrided in subclasses (useful for testing purposes)
 
  </p>
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/transactions/transform/RollbackTransform.html b/snapshot/grails-data/api/org/grails/datastore/gorm/transactions/transform/RollbackTransform.html
index 60e9f46a93..59cf2b46ac 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/transactions/transform/RollbackTransform.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/transactions/transform/RollbackTransform.html
@@ -262,7 +262,7 @@ extends <a href='../../../../../../org/grails/datastore/gorm/transactions/transf
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html'>TransactionalTransform</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html#applyTransactionalAttributeSettings(org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.expr.VariableExpression, org.codehaus.groovy.ast.stmt.BlockStatement, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode)'>applyTransactionalAttributeSettings</a>, <a href='../../../../../../org/grails/datastore/gor [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html#applyTransactionalAttributeSettings(org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.expr.VariableExpression, org.codehaus.groovy.ast.stmt.BlockStatement, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode)'>applyTransactionalAttributeSettings</a>, <a href='../../../../../../org/grails/datastore/gor [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/gorm/transform/AbstractDatastoreMethodDecoratingTransformation.html'>AbstractDatastoreMethodDecoratingTransformation</a></code></td>
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html b/snapshot/grails-data/api/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html
index 4c1e80b764..41b1a7d0b7 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html
@@ -367,18 +367,6 @@ extends <a href='../../../../../../org/grails/datastore/gorm/transform/AbstractD
                             <td class="colLast"><code><strong><a href="#priority()">priority</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
-                            <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)">weaveClassNode</a></strong>(org.codehaus.groovy.control.SourceUnit source, org.codehaus.groovy.ast.AnnotationNode annotationNode, org.codehaus.groovy.ast.ClassNode classNode)</code><br></td>
-                        </tr>
-                        
-                        <tr class="altColor">
-                            <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.codehaus.groovy.ast.MethodNode</code></td>
-                            <td class="colLast"><code><strong><a href="#weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, Map)">weaveNewMethod</a></strong>(org.codehaus.groovy.control.SourceUnit sourceUnit, org.codehaus.groovy.ast.AnnotationNode annotationNode, org.codehaus.groovy.ast.ClassNode classNode, org.codehaus.groovy.ast.MethodNode methodNode, java.util.Map&lt;java. [...]
-                        </tr>
-                        
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
@@ -620,22 +608,6 @@ extends <a href='../../../../../../org/grails/datastore/gorm/transform/AbstractD
                             </li>
                         </ul>
                     
-                        <a name="weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)"><!-- --></a>
-                        <ul class="blockListLast">
-                            <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;void <strong>weaveClassNode</strong>(org.codehaus.groovy.control.SourceUnit source, org.codehaus.groovy.ast.AnnotationNode annotationNode, org.codehaus.groovy.ast.ClassNode classNode)</h4>
-                                <p></p>
-                            </li>
-                        </ul>
-                    
-                        <a name="weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, Map)"><!-- --></a>
-                        <ul class="blockListLast">
-                            <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;org.codehaus.groovy.ast.MethodNode <strong>weaveNewMethod</strong>(org.codehaus.groovy.control.SourceUnit sourceUnit, org.codehaus.groovy.ast.AnnotationNode annotationNode, org.codehaus.groovy.ast.ClassNode classNode, org.codehaus.groovy.ast.MethodNode methodNode, java.util.Map&lt;java.lang.String, org.codehaus.groovy.ast.ClassNode&gt; genericsSpec)</h4>
-                                <p></p>
-                            </li>
-                        </ul>
-                    
                         <a name="weaveSetTargetDatastoreBody(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.expr.Expression, org.codehaus.groovy.ast.stmt.BlockStatement)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/validation/constraints/MaxConstraint.html b/snapshot/grails-data/api/org/grails/datastore/gorm/validation/constraints/MaxConstraint.html
index 284f415351..db9b4bbcf9 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/validation/constraints/MaxConstraint.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/validation/constraints/MaxConstraint.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 public class MaxConstraint
 extends <a href='../../../../../../org/grails/datastore/gorm/validation/constraints/AbstractConstraint.html'>AbstractConstraint</a></pre>
 
diff --git a/snapshot/grails-data/api/org/grails/datastore/gorm/validation/constraints/RangeConstraint.html b/snapshot/grails-data/api/org/grails/datastore/gorm/validation/constraints/RangeConstraint.html
index 7bc8b9b2b6..aef14df47a 100644
--- a/snapshot/grails-data/api/org/grails/datastore/gorm/validation/constraints/RangeConstraint.html
+++ b/snapshot/grails-data/api/org/grails/datastore/gorm/validation/constraints/RangeConstraint.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 public class RangeConstraint
 extends <a href='../../../../../../org/grails/datastore/gorm/validation/constraints/AbstractConstraint.html'>AbstractConstraint</a></pre>
 
diff --git a/snapshot/grails-data/api/org/grails/datastore/mapping/core/AbstractDatastore.html b/snapshot/grails-data/api/org/grails/datastore/mapping/core/AbstractDatastore.html
index 1feae95f60..3d15835822 100644
--- a/snapshot/grails-data/api/org/grails/datastore/mapping/core/AbstractDatastore.html
+++ b/snapshot/grails-data/api/org/grails/datastore/mapping/core/AbstractDatastore.html
@@ -364,7 +364,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/core/Datastore.h
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setApplicationContext(ApplicationContext)">setApplicationContext</a></strong>(<a href='../../../../../ApplicationContext.html'>ApplicationContext</a> ctx)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#setApplicationContext(org.springframework.context.ApplicationContext)">setApplicationContext</a></strong>(<a href='../../../../../org.springframework.context.ApplicationContext.html'>ApplicationContext</a> ctx)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -688,10 +688,10 @@ implements <a href='../../../../../org/grails/datastore/mapping/core/Datastore.h
                             </li>
                         </ul>
                     
-                        <a name="setApplicationContext(ApplicationContext)"><!-- --></a>
+                        <a name="setApplicationContext(org.springframework.context.ApplicationContext)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>setApplicationContext</strong>(<a href='../../../../../ApplicationContext.html'>ApplicationContext</a> ctx)</h4>
+                                <h4>public&nbsp;void <strong>setApplicationContext</strong>(<a href='../../../../../org.springframework.context.ApplicationContext.html'>ApplicationContext</a> ctx)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/api/org/grails/datastore/mapping/engine/BeanEntityAccess.html b/snapshot/grails-data/api/org/grails/datastore/mapping/engine/BeanEntityAccess.html
index 682d2b0a1a..5804ce05ca 100644
--- a/snapshot/grails-data/api/org/grails/datastore/mapping/engine/BeanEntityAccess.html
+++ b/snapshot/grails-data/api/org/grails/datastore/mapping/engine/BeanEntityAccess.html
@@ -142,7 +142,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/engine/EntityAcc
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../BeanWrapper.html'>BeanWrapper</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org.springframework.beans.BeanWrapper.html'>BeanWrapper</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#beanWrapper">beanWrapper</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -338,7 +338,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/engine/EntityAcc
                         <a name="beanWrapper"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../BeanWrapper.html'>BeanWrapper</a> <strong>beanWrapper</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.springframework.beans.BeanWrapper.html'>BeanWrapper</a> <strong>beanWrapper</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/api/org/grails/datastore/mapping/engine/EntityPersister.html b/snapshot/grails-data/api/org/grails/datastore/mapping/engine/EntityPersister.html
index f44a05ab1e..e237ae7311 100644
--- a/snapshot/grails-data/api/org/grails/datastore/mapping/engine/EntityPersister.html
+++ b/snapshot/grails-data/api/org/grails/datastore/mapping/engine/EntityPersister.html
@@ -590,7 +590,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/engine/Persister
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>cancelInsert</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> persistentEntity, <a href='../../../../../org/grails/datastore/mapping/engine/EntityAccess.html'>EntityAccess</a> entityAccess)</h4>
                                 <p> Fire the beforeInsert even on an entityAccess object and return true if the operation should be cancelled
-     <DL><DT><B>Parameters:</B></DT><DD><code>persistentEntity</code> -  The entity</DD><DD><code>entityAccess</code> -  The entity access</DD></DL><DL><DT><B>Returns:</B></DT><DD>true if the operation should be cancelled</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>persistentEntity</code> -  The entity</DD><DD><code>entityAccess</code> -  The entity access</DD></DL><DL><DT><B>Returns:</B></DT><DD>true if the operation should be cancelled</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -608,7 +608,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/engine/Persister
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>cancelUpdate</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> persistentEntity, <a href='../../../../../org/grails/datastore/mapping/engine/EntityAccess.html'>EntityAccess</a> entityAccess)</h4>
                                 <p> Fire the beforeUpdate event on an entityAccess object and return true if the operation should be cancelled
-     <DL><DT><B>Parameters:</B></DT><DD><code>persistentEntity</code> -  The entity</DD><DD><code>entityAccess</code> -  The entity access</DD></DL><DL><DT><B>Returns:</B></DT><DD>true if the operation should be cancelled</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>persistentEntity</code> -  The entity</DD><DD><code>entityAccess</code> -  The entity access</DD></DL><DL><DT><B>Returns:</B></DT><DD>true if the operation should be cancelled</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/grails-data/api/org/grails/datastore/mapping/query/api/BuildableCriteria.html b/snapshot/grails-data/api/org/grails/datastore/mapping/query/api/BuildableCriteria.html
index f145203b59..4c42facbd8 100644
--- a/snapshot/grails-data/api/org/grails/datastore/mapping/query/api/BuildableCriteria.html
+++ b/snapshot/grails-data/api/org/grails/datastore/mapping/query/api/BuildableCriteria.html
@@ -332,7 +332,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/query/api/Criter
                         <ul class="blockListLast">
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.Object <strong>listDistinct</strong>(@groovy.lang.DelegatesTo(Criteria.class)<br>groovy.lang.Closure closure)</h4>
-                                <p> Defines and executes a list distinct query in a single call. Example: Foo.createCriteria().listDistinct { } 
+                                <p> Defines and executes a list distinct query in a single call. Example: Foo.createCriteria().listDistinct { }
       <DL><DT><B>Parameters:</B></DT><DD><code>closure</code> -  The closure to execute</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/api/org/grails/datastore/mapping/query/api/Criteria.html b/snapshot/grails-data/api/org/grails/datastore/mapping/query/api/Criteria.html
index bd7854a93d..ea544ebfd6 100644
--- a/snapshot/grails-data/api/org/grails/datastore/mapping/query/api/Criteria.html
+++ b/snapshot/grails-data/api/org/grails/datastore/mapping/query/api/Criteria.html
@@ -1148,7 +1148,7 @@ public interface Criteria</pre>
                                 <h4>public&nbsp;<a href='../../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>readOnly</strong>(boolean readOnly)</h4>
                                 <p> <p>Configures the hibernate readOnly property to avoid checking for changes on the objects if the passed argument is true
 
- <code> { readOnly true } </code>          
+ <code> { readOnly true } </code>
       <DL><DT><B>Parameters:</B></DT><DD><code>readOnly</code> -  True to disable dirty checking</DD></DL><DL><DT><B>Returns:</B></DT><DD>This Criteria instance</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/ClosureToMapPopulator.html b/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/ClosureToMapPopulator.html
index a5b888b999..f061910d4a 100644
--- a/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/ClosureToMapPopulator.html
+++ b/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/ClosureToMapPopulator.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 public class ClosureToMapPopulator
 extends groovy.lang.GroovyObjectSupport</pre>
 
diff --git a/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/ReflectionUtils.html b/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/ReflectionUtils.html
index f77a3ced9b..11e615fff5 100644
--- a/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/ReflectionUtils.html
+++ b/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/ReflectionUtils.html
@@ -352,7 +352,7 @@ extends java.lang.Object</pre>
  to avoid unnecessary conflicts with a JVM SecurityManager (if active).
 
  Based on the same method in Spring core.
-     <DL><DT><B>Parameters:</B></DT><DD><code>field</code> -  the field to make accessible</DD></DL><DL><DT><B>See Also:</B></DT><DD>java.lang.reflect.Field#setAccessible</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>field</code> -  the field to make accessible</DD></DL><DL><DT><B>See Also:</B></DT><DD>java.lang.reflect.Field#setAccessible</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/grails-data/developer-manual/gettingStarted.html b/snapshot/grails-data/developer-manual/gettingStarted.html
index 760c780754..81ab9210d9 100644
--- a/snapshot/grails-data/developer-manual/gettingStarted.html
+++ b/snapshot/grails-data/developer-manual/gettingStarted.html
@@ -523,7 +523,7 @@ cd grails-core</pre>
 <div id="footer">
 <div id="footer-text">
 Version 7.0.0-SNAPSHOT<br>
-Last updated 2025-08-22 13:53:34 UTC
+Last updated 2025-08-26 09:35:39 UTC
 </div>
 </div>
 </body>
diff --git a/snapshot/grails-data/developer-manual/introduction.html b/snapshot/grails-data/developer-manual/introduction.html
index 235044535a..6f775e4754 100644
--- a/snapshot/grails-data/developer-manual/introduction.html
+++ b/snapshot/grails-data/developer-manual/introduction.html
@@ -476,7 +476,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="footer">
 <div id="footer-text">
 Version 7.0.0-SNAPSHOT<br>
-Last updated 2025-08-22 13:53:34 UTC
+Last updated 2025-08-26 09:35:39 UTC
 </div>
 </div>
 </body>
diff --git a/snapshot/grails-data/developer-manual/stepByStep.html b/snapshot/grails-data/developer-manual/stepByStep.html
index aa2f04b117..a2b1264cb5 100644
--- a/snapshot/grails-data/developer-manual/stepByStep.html
+++ b/snapshot/grails-data/developer-manual/stepByStep.html
@@ -621,7 +621,7 @@ class XyzTestSuite {
 <div id="footer">
 <div id="footer-text">
 Version 7.0.0-SNAPSHOT<br>
-Last updated 2025-08-22 13:53:34 UTC
+Last updated 2025-08-26 09:35:39 UTC
 </div>
 </div>
 </body>
diff --git a/snapshot/grails-data/developer-manual/testing.html b/snapshot/grails-data/developer-manual/testing.html
index a7840025b2..4592ac8471 100644
--- a/snapshot/grails-data/developer-manual/testing.html
+++ b/snapshot/grails-data/developer-manual/testing.html
@@ -511,7 +511,7 @@ class PagedResultSpec extends GormDatastoreSpec{
 <div id="footer">
 <div id="footer-text">
 Version 7.0.0-SNAPSHOT<br>
-Last updated 2025-08-22 13:53:34 UTC
+Last updated 2025-08-26 09:35:39 UTC
 </div>
 </div>
 </body>
diff --git a/snapshot/grails-data/developer-manual/understandingApi.html b/snapshot/grails-data/developer-manual/understandingApi.html
index 645fab9fd1..bbeebd254e 100644
--- a/snapshot/grails-data/developer-manual/understandingApi.html
+++ b/snapshot/grails-data/developer-manual/understandingApi.html
@@ -454,7 +454,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="footer">
 <div id="footer-text">
 Version 7.0.0-SNAPSHOT<br>
-Last updated 2025-08-22 13:53:34 UTC
+Last updated 2025-08-26 09:35:39 UTC
 </div>
 </div>
 </body>
diff --git a/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html b/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html
index bd517b2ea5..37b1a07399 100644
--- a/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html
+++ b/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html
@@ -561,7 +561,7 @@ protected Session createSession(PropertyResolver connDetails) {
 <div id="footer">
 <div id="footer-text">
 Version 7.0.0-SNAPSHOT<br>
-Last updated 2025-08-22 13:53:34 UTC
+Last updated 2025-08-26 09:35:39 UTC
 </div>
 </div>
 </body>
diff --git a/snapshot/grails-data/developer-manual/understandingApi/gormApis.html b/snapshot/grails-data/developer-manual/understandingApi/gormApis.html
index 263cb0a6b4..bbb36fb3d6 100644
--- a/snapshot/grails-data/developer-manual/understandingApi/gormApis.html
+++ b/snapshot/grails-data/developer-manual/understandingApi/gormApis.html
@@ -496,7 +496,7 @@ class Neo4jEntityTraitProvider implements GormEntityTraitProvider {
 <div id="footer">
 <div id="footer-text">
 Version 7.0.0-SNAPSHOT<br>
-Last updated 2025-08-22 13:53:34 UTC
+Last updated 2025-08-26 09:35:39 UTC
 </div>
 </div>
 </body>
diff --git a/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html b/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html
index b33a961f29..a1b9946048 100644
--- a/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html
+++ b/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html
@@ -488,7 +488,7 @@ enhancer.enhance()</code></pre>
 <div id="footer">
 <div id="footer-text">
 Version 7.0.0-SNAPSHOT<br>
-Last updated 2025-08-22 13:53:34 UTC
+Last updated 2025-08-26 09:35:39 UTC
 </div>
 </div>
 </body>
diff --git a/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html b/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html
index 6caff9d721..887b45cf34 100644
--- a/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html
+++ b/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html
@@ -673,7 +673,7 @@ protected void deleteEntry(String family, final Object key, final Object entry)
 <div id="footer">
 <div id="footer-text">
 Version 7.0.0-SNAPSHOT<br>
-Last updated 2025-08-22 13:53:34 UTC
+Last updated 2025-08-26 09:35:39 UTC
 </div>
 </div>
 </body>
diff --git a/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html b/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html
index 8f0d374ebb..d67638b567 100644
--- a/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html
+++ b/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html
@@ -588,7 +588,7 @@ If, for instance, the underlying datastore does not support the calculation of a
 <div id="footer">
 <div id="footer-text">
 Version 7.0.0-SNAPSHOT<br>
-Last updated 2025-08-22 13:53:34 UTC
+Last updated 2025-08-26 09:35:39 UTC
 </div>
 </div>
 </body>
diff --git a/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html b/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html
index fda0708497..c02d742433 100644
--- a/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html
+++ b/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html
@@ -526,7 +526,7 @@ If the underlying datastore supports secondary indexes then it is ok to just ret
 <div id="footer">
 <div id="footer-text">
 Version 7.0.0-SNAPSHOT<br>
-Last updated 2025-08-22 13:53:34 UTC
+Last updated 2025-08-26 09:35:39 UTC
 </div>
 </div>
 </body>
diff --git a/snapshot/grails-data/hibernate5/api/grails/gorm/transactions/GrailsTransactionTemplate.html b/snapshot/grails-data/hibernate5/api/grails/gorm/transactions/GrailsTransactionTemplate.html
index 0620c61f53..530f9cb6bf 100644
--- a/snapshot/grails-data/hibernate5/api/grails/gorm/transactions/GrailsTransactionTemplate.html
+++ b/snapshot/grails-data/hibernate5/api/grails/gorm/transactions/GrailsTransactionTemplate.html
@@ -358,7 +358,7 @@ extends java.lang.Object</pre>
                         <a name="execute(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; T <strong>execute</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; action)</h4>
+                                <h4>&lt;T&gt; T <strong>execute</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; action)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -366,7 +366,7 @@ extends java.lang.Object</pre>
                         <a name="executeAndRollback(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; T <strong>executeAndRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; action)</h4>
+                                <h4>&lt;T&gt; T <strong>executeAndRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; action)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/grails/gorm/transactions/TransactionService.html b/snapshot/grails-data/hibernate5/api/grails/gorm/transactions/TransactionService.html
index 36461cbf15..f80a86fd6e 100644
--- a/snapshot/grails-data/hibernate5/api/grails/gorm/transactions/TransactionService.html
+++ b/snapshot/grails-data/hibernate5/api/grails/gorm/transactions/TransactionService.html
@@ -219,7 +219,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withNewTransaction(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withNewTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withNewTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a new transaction with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -227,7 +227,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withNewTransaction(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withNewTransaction</strong>(org.springframework.transaction.TransactionDefinition definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withNewTransaction</strong>(org.springframework.transaction.TransactionDefinition definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a new transaction with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>definition</code> -  The transaction definition</DD><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -235,7 +235,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withRollback(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction that is automatically rolled back with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -243,7 +243,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withRollback(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withRollback</strong>(org.springframework.transaction.TransactionDefinition definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withRollback</strong>(org.springframework.transaction.TransactionDefinition definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction that is automatically rolled back with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>definition</code> -  The transaction definition</DD><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -251,7 +251,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withTransaction(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction with the default attributes <DL><DT><B>Parameters:</B></DT><DD><code>callable</code> -  The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
@@ -259,7 +259,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withTransaction(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(org.springframework.transaction.TransactionDefinition definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(org.springframework.transaction.TransactionDefinition definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction with the given definition <DL><DT><B>Parameters:</B></DT><DD><code>definition</code> -  The transaction definition</DD><DD><code>callable</code> -  The callable The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result of the callable</DD></DL></p>
                             </li>
                         </ul>
@@ -267,7 +267,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="withTransaction(java.util.Map, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(java.util.Map definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; abstract&nbsp;T <strong>withTransaction</strong>(java.util.Map definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p> Executes the given callable within the context of a transaction with the given definition <DL><DT><B>Parameters:</B></DT><DD><code>definition</code> -  The transaction definition as a map</DD><DD><code>callable</code> -  The callable The callable</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result of the callable</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/grails/orm/HibernateCriteriaBuilder.html b/snapshot/grails-data/hibernate5/api/grails/orm/HibernateCriteriaBuilder.html
index 7341f43156..00d7187554 100644
--- a/snapshot/grails-data/hibernate5/api/grails/orm/HibernateCriteriaBuilder.html
+++ b/snapshot/grails-data/hibernate5/api/grails/orm/HibernateCriteriaBuilder.html
@@ -932,7 +932,7 @@ extends <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaB
                                 <p> Join an association using the specified join-type, assigning an alias
  to the joined association.
  The joinType is expected to be one of CriteriaSpecification.INNER_JOIN (the default),
- CriteriaSpecificationFULL_JOIN, or CriteriaSpecificationLEFT_JOIN.<DL><DT><B>throws:</B></DT><DD>HibernateException Indicates a problem creating the sub criteria</DD></DL>
+ CriteriaSpecificationFULL_JOIN, or CriteriaSpecificationLEFT_JOIN.<DL><DT><B>throws:</B></DT><DD>org.hibernate.HibernateException Indicates a problem creating the sub criteria</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>associationPath</code> -  A dot-seperated property path</DD><DD><code>alias</code> -            The alias to assign to the joined association (for later reference).</DD><DD><code>joinType</code> -         The type of join to use.</DD></DL><DL><DT><B>Returns:</B></DT><DD>this (for method chaining)</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#createAlias(java.lang.String, java.lang.String)'>createAlias(String, String)</a></DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/grails/orm/PagedResultList.html b/snapshot/grails-data/hibernate5/api/grails/orm/PagedResultList.html
index 866e3dfe1c..254e0e15fb 100644
--- a/snapshot/grails-data/hibernate5/api/grails/orm/PagedResultList.html
+++ b/snapshot/grails-data/hibernate5/api/grails/orm/PagedResultList.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 @java.lang.Deprecated
 public class PagedResultList
 extends <a href='../../grails.gormPagedResultList.html'>grails.gormPagedResultList</a></pre>
diff --git a/snapshot/grails-data/hibernate5/api/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.html b/snapshot/grails-data/hibernate5/api/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.html
index 20f8c78761..48c0916464 100644
--- a/snapshot/grails-data/hibernate5/api/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.html
+++ b/snapshot/grails-data/hibernate5/api/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.html
@@ -101,8 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@groovy.util.logging.Slf4j
-class HibernateDatastoreSpringInitializer
+<pre>class HibernateDatastoreSpringInitializer
 extends <a href='../../../org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.html'>AbstractDatastoreInitializer</a></pre>
 
     <p> Class that handles the details of initializing GORM for Hibernate <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>3.0</DD></DL></p>
diff --git a/snapshot/grails-data/hibernate5/api/index-all.html b/snapshot/grails-data/hibernate5/api/index-all.html
index 285f9741a3..3970f0bf6e 100644
--- a/snapshot/grails-data/hibernate5/api/index-all.html
+++ b/snapshot/grails-data/hibernate5/api/index-all.html
@@ -987,7 +987,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/reflect/AstUtils.html#AstUtils()" title="Constructor in AstUtils">AstUtils()</a></span> - Constructor in <a href="org/grails/datastore/mapping/reflect/AstUtils.html">AstUtils</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#asType(FindIterable, Class<T>)" title="Method in MongoExtensions">asType(FindIterable, Class&lt;T&gt;)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#asType(com.mongodb.client.FindIterable, Class<T>)" title="Method in MongoExtensions">asType(com.mongodb.client.FindIterable, Class&lt;T&gt;)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.html#attach(D)" title="Method in AbstractHibernateGormInstanceApi">attach(D)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.html">AbstractHibernateGormInstanceApi</a>
 </dt><dd> <div class="block"></div></dd>
@@ -1253,11 +1253,11 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Binds a joined sub-class mapping using table-per-subclass</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map<?,?>, org.hibernate.mapping.List, java.lang.String)" title="Method in GrailsDomainBinder">bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map&lt;?,?&gt;, org.hibernate.mapping.List, java.lang.String)</a></span> -  [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.la [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a h [...]
 </dt><dd> <div class="block">Binds a many-to-many relationship. </div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, java.lang.String, org.hibernate.boot.spi. [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.S [...]
 </dt><dd> <div class="block">Binds a many-to-one relationship to the</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne)" title="Method in GrailsDomainBinder">bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne)" title="Method in GrailsDomainBinder">bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map<?,?>, org.hibernate.mapping.Map, java.lang.String)" title="Method in GrailsDomainBinder">bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map&lt;?,?&gt;, org.hibernate.mapping.Map, java.lang.String)</a></span> - Meth [...]
 </dt><dd> <div class="block"></div></dd>
@@ -1269,11 +1269,11 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindNumericColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty, org.grails.orm.hibernate.cfg.ColumnConfig)" title="Method in GrailsDomainBinder">bindNumericColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty, org.grails.orm.hibernate.cfg.ColumnConfig)</a></span> - Method in <a href="org/grails/orm/hibern [...]
 </dt><dd> <div class="block">Interrogates the specified constraints looking for any constraints that would limit the
  precision and/or scale of the property's value.  </div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href= [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.mapping.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.mapping.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDo [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/Grai [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html" [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/services/implementers/AbstractSaveImplementer.html#bindParametersAndSave(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, org.codehaus.groovy.ast.Parameter, org.codehaus.groovy.ast.stmt.BlockStatement, org.codehaus.groovy.ast.expr.VariableExpression)" title="Method in AbstractSaveImplementer">bindParametersAndSave(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, org.codehaus.groovy.ast [...]
 </dt><dd> <div class="block"></div></dd>
@@ -1299,7 +1299,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Binds the sub classes of a root class using table-per-heirarchy inheritance mapping</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection)" title="Method in GrailsDomainBinder">bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/Gr [...]
 </dt><dd> <div class="block">Binds a unidirectional one-to-many creating a psuedo back reference property in the process.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.grails.datastore.mapping.model.types.ManyToOne)" title="Method in GrailsDomainBinder">bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.grails.datastore.mapping.model.types.ManyToOne)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.htm [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.ManyToOne)" title="Method in GrailsDomainBinder">bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.ManyToOne)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"> <DL><DT><B>Parameters:</B></DT><DD><code>property</code> -  The property to bind</DD></DL></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnionSubclass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.UnionSubclass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindUnionSubclass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.UnionSubclass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span [...]
 </dt><dd> <div class="block"></div></dd>
@@ -2417,9 +2417,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractPersistentProperty.html#context" title="Field in AbstractPersistentProperty">context</a></span> - Field in <a href="org/grails/datastore/mapping/model/AbstractPersistentProperty.html">AbstractPersistentProperty</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(AbstractBsonReader.Context, BsonContextType)" title="Constructor in JsonReader.Context">Context(AbstractBsonReader.Context, BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)" title="Constructor in JsonReader.Context">Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
 </dt><dd> <div class="block">Creates a new context.</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#contexts" title="Property in DatabaseMigrationCommand">contexts</a></span> - Property in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
@@ -4275,7 +4275,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.html#doWriteDateTime(long)" title="Method in JsonWriter">doWriteDateTime(long)</a></span> - Method in <a href="org/grails/datastore/bson/json/JsonWriter.html">JsonWriter</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.html#doWriteDBPointer(BsonDbPointer)" title="Method in JsonWriter">doWriteDBPointer(BsonDbPointer)</a></span> - Method in <a href="org/grails/datastore/bson/json/JsonWriter.html">JsonWriter</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.html#doWriteDBPointer(org.bson.BsonDbPointer)" title="Method in JsonWriter">doWriteDBPointer(org.bson.BsonDbPointer)</a></span> - Method in <a href="org/grails/datastore/bson/json/JsonWriter.html">JsonWriter</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.html#doWriteDecimal128(org.bson.types.Decimal128)" title="Method in JsonWriter">doWriteDecimal128(org.bson.types.Decimal128)</a></span> - Method in <a href="org/grails/datastore/bson/json/JsonWriter.html">JsonWriter</a>
 </dt><dd> <div class="block"></div></dd>
@@ -4319,7 +4319,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.html#driverClassName" title="Property in DataSourceSettings">driverClassName</a></span> - Property in <a href="org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.html">DataSourceSettings</a>
 </dt><dd> <div class="block">The driver class name</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#dropIndex(MongoCollection<Document>, Map<String, Object>, DropIndexOptions)" title="Method in MongoExtensions">dropIndex(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, DropIndexOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#dropIndex(MongoCollection<Document>, Map<String, Object>, com.mongodb.client.model.DropIndexOptions)" title="Method in MongoExtensions">dropIndex(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, com.mongodb.client.model.DropIndexOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/schemaless/DynamicAttributeHelper.html" title="Class in org.grails.datastore.gorm.schemaless">DynamicAttributeHelper</a></span> - Class in <a href="./org/grails/datastore/gorm/schemaless/package-summary.html">org.grails.datastore.gorm.schemaless</a>
 </dt><dd><div class="block">Helper class for use in other traits</div></dd>
@@ -8890,7 +8890,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Forces an insert of an object to the datastore</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/GormStaticApi.html#insert(D, java.util.Map)" title="Method in GormStaticApi">insert(D, java.util.Map)</a></span> - Method in <a href="org/grails/datastore/gorm/GormStaticApi.html">GormStaticApi</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#insert(MongoCollection<Document>, List<? extends Map>, InsertManyOptions)" title="Method in MongoExtensions">insert(MongoCollection&lt;Document&gt;, List&lt;? extends Map&gt;, InsertManyOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#insert(MongoCollection<Document>, List<? extends Map>, com.mongodb.client.model.InsertManyOptions)" title="Method in MongoExtensions">insert(MongoCollection&lt;Document&gt;, List&lt;? extends Map&gt;, com.mongodb.client.model.InsertManyOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/engine/Persister.html#insert(java.lang.Object)" title="Method in Persister">insert(java.lang.Object)</a></span> - Method in <a href="org/grails/datastore/mapping/engine/Persister.html">Persister</a>
 </dt><dd> <div class="block">Forces an insert of an object rather than trying to guess if it is an insert or an update</div></dd>
@@ -14869,7 +14869,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.html#toHibernateProperties()" title="Method in DataSourceSettings">toHibernateProperties()</a></span> - Method in <a href="org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.html">DataSourceSettings</a>
 </dt><dd> <div class="block">Convert to Hibernate properties</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#toList(FindIterable, Class<T>)" title="Method in MongoExtensions">toList(FindIterable, Class&lt;T&gt;)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#toList(com.mongodb.client.FindIterable, Class<T>)" title="Method in MongoExtensions">toList(com.mongodb.client.FindIterable, Class&lt;T&gt;)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/model/types/ToMany.html" title="Class in org.grails.datastore.mapping.model.types">ToMany</a></span> - Class in <a href="./org/grails/datastore/mapping/model/types/package-summary.html">org.grails.datastore.mapping.model.types</a>
 </dt><dd><div class="block">Shared super class inherited by both <a href='../../../../../../org/grails/datastore/mapping/model/types/OneToMany.html' title='OneToMany'>OneToMany</a> and <a href='../../../../../../org/grails/datastore/mapping/model/types/ManyToMany.html' title='ManyToMany'>ManyToMany</a></div></dd>
@@ -15113,7 +15113,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Whether or not this column is updatable by hibernate</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/query/jpa/JpaQueryBuilder.html#UPDATE_CLAUSE" title="Field in JpaQueryBuilder">UPDATE_CLAUSE</a></span> - Field in <a href="org/grails/datastore/mapping/query/jpa/JpaQueryBuilder.html">JpaQueryBuilder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#update(MongoCollection<Document>, Map<String, Object>, Map<String, Object>, UpdateOptions)" title="Method in MongoExtensions">update(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, Map&lt;String, Object&gt;, UpdateOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#update(MongoCollection<Document>, Map<String, Object>, Map<String, Object>, com.mongodb.client.model.UpdateOptions)" title="Method in MongoExtensions">update(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, Map&lt;String, Object&gt;, com.mongodb.client.model.UpdateOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/core/AbstractSession.html#updateAll(org.grails.datastore.mapping.query.api.QueryableCriteria, Map<String,Object>)" title="Method in AbstractSession">updateAll(org.grails.datastore.mapping.query.api.QueryableCriteria, Map&lt;String,Object&gt;)</a></span> - Method in <a href="org/grails/datastore/mapping/core/AbstractSession.html">AbstractSession</a>
 </dt><dd> <div class="block">This default implementation of updateAll is unlikely to be optimal as it iterates and updates each object one by one.</div></dd>
@@ -15135,9 +15135,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/engine/NativeEntryEntityPersister.html#updateEntry(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.engine.EntityAccess, K, T)" title="Method in NativeEntryEntityPersister">updateEntry(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.engine.EntityAccess, K, T)</a></span> - Method in <a href="org/grails/datastore/mapping/engine/NativeEntryEntityPersister.html">N [...]
 </dt><dd> <div class="block">Updates an existing entry to the actual datastore</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#updateMany(MongoCollection<Document>, Map<String, Object>, List<? extends Map<String, Object>>, UpdateOptions)" title="Method in MongoExtensions">updateMany(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, List&lt;? extends Map&lt;String, Object&gt;&gt;, UpdateOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#updateMany(MongoCollection<Document>, Map<String, Object>, List<? extends Map<String, Object>>, com.mongodb.client.model.UpdateOptions)" title="Method in MongoExtensions">updateMany(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, List&lt;? extends Map&lt;String, Object&gt;&gt;, com.mongodb.client.model.UpdateOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#updateOne(MongoCollection<Document>, Map<String, Object>, List<? extends Map<String, Object>>, UpdateOptions)" title="Method in MongoExtensions">updateOne(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, List&lt;? extends Map&lt;String, Object&gt;&gt;, UpdateOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html">MongoExtensions</a>
+<dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html#updateOne(MongoCollection<Document>, Map<String, Object>, List<? extends Map<String, Object>>, com.mongodb.client.model.UpdateOptions)" title="Method in MongoExtensions">updateOne(MongoCollection&lt;Document&gt;, Map&lt;String, Object&gt;, List&lt;? extends Map&lt;String, Object&gt;&gt;, com.mongodb.client.model.UpdateOptions)</a></span> - Method in <a href="org/grails/datastore/gorm/mongo/e [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/services/implementers/UpdateOneImplementer.html" title="Class in org.grails.datastore.gorm.services.implementers">UpdateOneImplementer</a></span> - Class in <a href="./org/grails/datastore/gorm/services/implementers/package-summary.html">org.grails.datastore.gorm.services.implementers</a>
 </dt><dd><div class="block">Implements an update operation that returns the updated domain class</div></dd>
@@ -15444,14 +15444,10 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/transform/AbstractMethodDecoratingTransformation.html#weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)" title="Method in AbstractMethodDecoratingTransformation">weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)</a></span> - Method in <a href="org/grails/datastore/gorm/tr [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html#weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)" title="Method in TransactionalTransform">weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)</a></span> - Method in <a href="org/grails/datastore/gorm/transactions/transfor [...]
-</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/compiler/gorm/DirtyCheckingTransformer.html#weaveIntoExistingSetter(java.lang.String, org.grails.compiler.gorm.DirtyCheckingTransformer.GetterAndSetter, org.codehaus.groovy.ast.MethodNode)" title="Method in DirtyCheckingTransformer">weaveIntoExistingSetter(java.lang.String, org.grails.compiler.gorm.DirtyCheckingTransformer.GetterAndSetter, org.codehaus.groovy.ast.MethodNode)</a></span> - Method in <a href="org/grails/compiler/gorm/DirtyCheckin [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/transform/AbstractMethodDecoratingTransformation.html#weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, Map<String, ClassNode>)" title="Method in AbstractMethodDecoratingTransformation">weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode,  [...]
 </dt><dd> <div class="block">Weaves a new method</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html#weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, Map<String, ClassNode>)" title="Method in TransactionalTransform">weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy [...]
-</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/validation/jakarta/services/implementers/MethodValidationImplementer.html#weaveParameterNameData(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, org.codehaus.groovy.ast.MethodNode)" title="Method in MethodValidationImplementer">weaveParameterNameData(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, org.codehaus.groovy.ast.MethodNode)</a></span> - Method in <a href="org/grails/datastor [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/transform/AbstractDatastoreMethodDecoratingTransformation.html#weaveSetTargetDatastoreBody(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.expr.Expression, org.codehaus.groovy.ast.stmt.BlockStatement)" title="Method in AbstractDatastoreMethodDecoratingTransformation">weaveSetTargetDatastoreBody(org.codehaus.groovy.control.SourceUnit, org.c [...]
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html
index 6fb3119b5b..6ac91decca 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code>protected&nbsp;<strong><a href="#Context(AbstractBsonReader.Context, BsonContextType)">Context</a></strong>(<a href='../../../../../AbstractBsonReader.Context.html'>Context</a> parentContext, <a href='../../../../../BsonContextType.html'>BsonContextType</a> contextType)</code><br></td>
+                                <code>protected&nbsp;<strong><a href="#Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)">Context</a></strong>(<a href='../../../../../org.bson.AbstractBsonReader.Context.html'>Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType)</code><br></td>
                         </tr>
                         
                     </table>
@@ -165,7 +165,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../BsonContextType.html'>BsonContextType</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContextType()">getContextType</a></strong>()</code><br></td>
                         </tr>
                         
@@ -204,10 +204,10 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(AbstractBsonReader.Context, BsonContextType)"><!-- --></a>
+                        <a name="Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<strong>Context</strong>(<a href='../../../../../AbstractBsonReader.Context.html'>Context</a> parentContext, <a href='../../../../../BsonContextType.html'>BsonContextType</a> contextType)</h4>
+                                <h4>protected&nbsp;<strong>Context</strong>(<a href='../../../../../org.bson.AbstractBsonReader.Context.html'>Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -228,7 +228,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         <a name="getContextType()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../BsonContextType.html'>BsonContextType</a> <strong>getContextType</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> <strong>getContextType</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html
index 2fb9b13f81..97db4c3110 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public class JsonReader
-extends <a href='../../../../../AbstractBsonReader.html'>AbstractBsonReader</a></pre>
+extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonReader</a></pre>
 
     <p> A simplified fork of org.bson.json.JsonReader that works with readers and removes processing related to MongoDB
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>6.0</DD></DL></p>
@@ -226,7 +226,7 @@ extends <a href='../../../../../AbstractBsonReader.html'>AbstractBsonReader</a><
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../BsonDbPointer.html'>BsonDbPointer</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org.bson.BsonDbPointer.html'>BsonDbPointer</a></code></td>
                             <td class="colLast"><code><strong><a href="#doReadDBPointer()">doReadDBPointer</a></strong>()</code><br></td>
                         </tr>
                         
@@ -370,7 +370,7 @@ extends <a href='../../../../../AbstractBsonReader.html'>AbstractBsonReader</a><
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../BsonReaderMark.html'>BsonReaderMark</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org.bson.BsonReaderMark.html'>BsonReaderMark</a></code></td>
                             <td class="colLast"><code><strong><a href="#getMark()">getMark</a></strong>()</code><br></td>
                         </tr>
                         
@@ -475,7 +475,7 @@ extends <a href='../../../../../AbstractBsonReader.html'>AbstractBsonReader</a><
                         <a name="doReadDBPointer()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../BsonDbPointer.html'>BsonDbPointer</a> <strong>doReadDBPointer</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org.bson.BsonDbPointer.html'>BsonDbPointer</a> <strong>doReadDBPointer</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -667,7 +667,7 @@ extends <a href='../../../../../AbstractBsonReader.html'>AbstractBsonReader</a><
                         <a name="getMark()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../BsonReaderMark.html'>BsonReaderMark</a> <strong>getMark</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org.bson.BsonReaderMark.html'>BsonReaderMark</a> <strong>getMark</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html
index a2b09c3ee4..bcac712e36 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
+                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
                         </tr>
                         
                     </table>
@@ -198,10 +198,10 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
+                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
                                 <p> Creates a new context.
           <DL><DT><B>Parameters:</B></DT><DD><code>parentContext</code> -  the parent context that can be used for going back up to the parent level</DD><DD><code>contextType</code> -    the type of this context</DD><DD><code>indentChars</code> -    the String to use for indentation at this level.</DD></DL></p>
                             </li>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html
index 7b5e95a109..dee3d892a8 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public class JsonWriter
-extends <a href='../../../../../AbstractBsonWriter.html'>AbstractBsonWriter</a></pre>
+extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWriter</a></pre>
 
     <p> Simplified fork of org.bson.json.JsonWriter that ignores behaviour specific to MongoDB and produces more compat output
   <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>6.0</DD></DL></p>
@@ -251,7 +251,7 @@ extends <a href='../../../../../AbstractBsonWriter.html'>AbstractBsonWriter</a><
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#doWriteDBPointer(BsonDbPointer)">doWriteDBPointer</a></strong>(<a href='../../../../../BsonDbPointer.html'>BsonDbPointer</a> value)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#doWriteDBPointer(org.bson.BsonDbPointer)">doWriteDBPointer</a></strong>(<a href='../../../../../org.bson.BsonDbPointer.html'>BsonDbPointer</a> value)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -508,10 +508,10 @@ extends <a href='../../../../../AbstractBsonWriter.html'>AbstractBsonWriter</a><
                             </li>
                         </ul>
                     
-                        <a name="doWriteDBPointer(BsonDbPointer)"><!-- --></a>
+                        <a name="doWriteDBPointer(org.bson.BsonDbPointer)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;void <strong>doWriteDBPointer</strong>(<a href='../../../../../BsonDbPointer.html'>BsonDbPointer</a> value)</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;void <strong>doWriteDBPointer</strong>(<a href='../../../../../org.bson.BsonDbPointer.html'>BsonDbPointer</a> value)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html
index 1102eeddbe..942e86bdcb 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/mongo/extensions/MongoExtensions.html
@@ -189,7 +189,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code>&lt;T&gt;</code></td>
                             <td class="colLast"><code>static&nbsp;T</code></td>
-                            <td class="colLast"><code><strong><a href="#asType(FindIterable, Class)">asType</a></strong>(<a href='../../../../../../FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#asType(com.mongodb.client.FindIterable, Class)">asType</a></strong>(<a href='../../../../../../com.mongodb.client.FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -243,7 +243,7 @@ extends java.lang.Object</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#createIndex(MongoCollection, Map, IndexOptions)">createIndex</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; keys, <a href='../../../../../../IndexOptions.html'>IndexOptions</a> options)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#createIndex(MongoCollection, Map, com.mongodb.client.model.IndexOptions)">createIndex</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; keys, <a href='../../../../../../com.mongodb.client.model.IndexOptions.html'>IndexOptions</a> options)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -333,7 +333,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#dropIndex(MongoCollection, Map, DropIndexOptions)">dropIndex</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; index, <a href='../../../../../../DropIndexOptions.html'>DropIndexOptions</a> dropIndexOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#dropIndex(MongoCollection, Map, com.mongodb.client.model.DropIndexOptions)">dropIndex</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; index, <a href='../../../../../../com.mongodb.client.model.DropIndexOptions.html'>DropIndexOptions</a> dropIndexOptions)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -543,13 +543,13 @@ extends java.lang.Object</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;MongoCollection&lt;Document&gt;</code></td>
-                            <td class="colLast"><code><strong><a href="#insert(MongoCollection, List, com.mongodb.WriteConcern, InsertManyOptions)">insert</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; documents, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern, <a href='../../../../../../InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</cod [...]
+                            <td class="colLast"><code><strong><a href="#insert(MongoCollection, List, com.mongodb.WriteConcern, com.mongodb.client.model.InsertManyOptions)">insert</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; documents, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern, <a href='../../../../../../com.mongodb.client.model.InsertManyOptio [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;MongoCollection&lt;Document&gt;</code></td>
-                            <td class="colLast"><code><strong><a href="#insert(MongoCollection, List, InsertManyOptions)">insert</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&gt; documents, <a href='../../../../../../InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#insert(MongoCollection, List, com.mongodb.client.model.InsertManyOptions)">insert</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&gt; documents, <a href='../../../../../../com.mongodb.client.model.InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -608,13 +608,13 @@ extends java.lang.Object</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>static&nbsp;<a href='../../../../../../MongoCollection.html'>MongoCollection</a></code></td>
+                            <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.MongoCollection.html'>MongoCollection</a></code></td>
                             <td class="colLast"><code><strong><a href="#save(MongoCollection, Map)">save</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; document)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>static&nbsp;<a href='../../../../../../MongoCollection.html'>MongoCollection</a></code></td>
+                            <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.MongoCollection.html'>MongoCollection</a></code></td>
                             <td class="colLast"><code><strong><a href="#save(MongoCollection, Map, com.mongodb.WriteConcern)">save</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; document, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern)</code><br></td>
                         </tr>
                         
@@ -633,7 +633,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code>&lt;T&gt;</code></td>
                             <td class="colLast"><code>static&nbsp;java.util.List&lt;T&gt;</code></td>
-                            <td class="colLast"><code><strong><a href="#toList(FindIterable, Class)">toList</a></strong>(<a href='../../../../../../FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#toList(com.mongodb.client.FindIterable, Class)">toList</a></strong>(<a href='../../../../../../com.mongodb.client.FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -651,7 +651,7 @@ extends java.lang.Object</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a></code></td>
-                            <td class="colLast"><code><strong><a href="#update(MongoCollection, Map, Map, UpdateOptions)">update</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#update(MongoCollection, Map, Map, com.mongodb.client.model.UpdateOptions)">update</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -669,7 +669,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a></code></td>
-                            <td class="colLast"><code><strong><a href="#updateMany(MongoCollection, Map, Map, UpdateOptions)">updateMany</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#updateMany(MongoCollection, Map, Map, com.mongodb.client.model.UpdateOptions)">updateMany</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -687,7 +687,7 @@ extends java.lang.Object</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a></code></td>
-                            <td class="colLast"><code><strong><a href="#updateMany(MongoCollection, Map, List, UpdateOptions)">updateMany</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#updateMany(MongoCollection, Map, List, com.mongodb.client.model.UpdateOptions)">updateMany</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</code>< [...]
                         </tr>
                         
                         <tr class="rowColor">
@@ -705,7 +705,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a></code></td>
-                            <td class="colLast"><code><strong><a href="#updateOne(MongoCollection, Map, Map, UpdateOptions)">updateOne</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#updateOne(MongoCollection, Map, Map, com.mongodb.client.model.UpdateOptions)">updateOne</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -723,7 +723,7 @@ extends java.lang.Object</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a></code></td>
-                            <td class="colLast"><code><strong><a href="#updateOne(MongoCollection, Map, List, UpdateOptions)">updateOne</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#updateOne(MongoCollection, Map, List, com.mongodb.client.model.UpdateOptions)">updateOne</a></strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -830,10 +830,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="asType(FindIterable, Class)"><!-- --></a>
+                        <a name="asType(com.mongodb.client.FindIterable, Class)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; static&nbsp;T <strong>asType</strong>(<a href='../../../../../../FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</h4>
+                                <h4>&lt;T&gt; static&nbsp;T <strong>asType</strong>(<a href='../../../../../../com.mongodb.client.FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -902,10 +902,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="createIndex(MongoCollection, Map, IndexOptions)"><!-- --></a>
+                        <a name="createIndex(MongoCollection, Map, com.mongodb.client.model.IndexOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;void <strong>createIndex</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; keys, <a href='../../../../../../IndexOptions.html'>IndexOptions</a> options)</h4>
+                                <h4>static&nbsp;void <strong>createIndex</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; keys, <a href='../../../../../../com.mongodb.client.model.IndexOptions.html'>IndexOptions</a> options)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1022,10 +1022,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="dropIndex(MongoCollection, Map, DropIndexOptions)"><!-- --></a>
+                        <a name="dropIndex(MongoCollection, Map, com.mongodb.client.model.DropIndexOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;void <strong>dropIndex</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; index, <a href='../../../../../../DropIndexOptions.html'>DropIndexOptions</a> dropIndexOptions)</h4>
+                                <h4>static&nbsp;void <strong>dropIndex</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; index, <a href='../../../../../../com.mongodb.client.model.DropIndexOptions.html'>DropIndexOptions</a> dropIndexOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1302,18 +1302,18 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="insert(MongoCollection, List, com.mongodb.WriteConcern, InsertManyOptions)"><!-- --></a>
+                        <a name="insert(MongoCollection, List, com.mongodb.WriteConcern, com.mongodb.client.model.InsertManyOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;MongoCollection&lt;Document&gt; <strong>insert</strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; documents, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern, <a href='../../../../../../InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</h4>
+                                <h4>static&nbsp;MongoCollection&lt;Document&gt; <strong>insert</strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; documents, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern, <a href='../../../../../../com.mongodb.client.model.InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="insert(MongoCollection, List, InsertManyOptions)"><!-- --></a>
+                        <a name="insert(MongoCollection, List, com.mongodb.client.model.InsertManyOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;MongoCollection&lt;Document&gt; <strong>insert</strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&gt; documents, <a href='../../../../../../InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</h4>
+                                <h4>static&nbsp;MongoCollection&lt;Document&gt; <strong>insert</strong>(MongoCollection&lt;Document&gt; collection, java.util.List&lt;? extends java.util.Map&gt; documents, <a href='../../../../../../com.mongodb.client.model.InsertManyOptions.html'>InsertManyOptions</a> insertOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1393,7 +1393,7 @@ extends java.lang.Object</pre>
                         <a name="save(MongoCollection, Map)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../MongoCollection.html'>MongoCollection</a> <strong>save</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; document)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.MongoCollection.html'>MongoCollection</a> <strong>save</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; document)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1401,7 +1401,7 @@ extends java.lang.Object</pre>
                         <a name="save(MongoCollection, Map, com.mongodb.WriteConcern)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../MongoCollection.html'>MongoCollection</a> <strong>save</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; document, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.MongoCollection.html'>MongoCollection</a> <strong>save</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; document, <a href='../../../../../../com.mongodb.WriteConcern.html'>WriteConcern</a> writeConcern)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1422,10 +1422,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="toList(FindIterable, Class)"><!-- --></a>
+                        <a name="toList(com.mongodb.client.FindIterable, Class)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; static&nbsp;java.util.List&lt;T&gt; <strong>toList</strong>(<a href='../../../../../../FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</h4>
+                                <h4>&lt;T&gt; static&nbsp;java.util.List&lt;T&gt; <strong>toList</strong>(<a href='../../../../../../com.mongodb.client.FindIterable.html'>FindIterable</a> iterable, java.lang.Class&lt;T&gt; cls)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1446,10 +1446,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="update(MongoCollection, Map, Map, UpdateOptions)"><!-- --></a>
+                        <a name="update(MongoCollection, Map, Map, com.mongodb.client.model.UpdateOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>update</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>update</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1470,10 +1470,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="updateMany(MongoCollection, Map, Map, UpdateOptions)"><!-- --></a>
+                        <a name="updateMany(MongoCollection, Map, Map, com.mongodb.client.model.UpdateOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateMany</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateMany</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1494,10 +1494,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="updateMany(MongoCollection, Map, List, UpdateOptions)"><!-- --></a>
+                        <a name="updateMany(MongoCollection, Map, List, com.mongodb.client.model.UpdateOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateMany</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateMany</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1518,10 +1518,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="updateOne(MongoCollection, Map, Map, UpdateOptions)"><!-- --></a>
+                        <a name="updateOne(MongoCollection, Map, Map, com.mongodb.client.model.UpdateOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateOne</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateOne</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.Map&lt;java.lang.String, java.lang.Object&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1542,10 +1542,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="updateOne(MongoCollection, Map, List, UpdateOptions)"><!-- --></a>
+                        <a name="updateOne(MongoCollection, Map, List, com.mongodb.client.model.UpdateOptions)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateOne</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
+                                <h4>static&nbsp;<a href='../../../../../../com.mongodb.client.result.UpdateResult.html'>UpdateResult</a> <strong>updateOne</strong>(MongoCollection&lt;Document&gt; collection, java.util.Map&lt;java.lang.String, java.lang.Object&gt; filter, java.util.List&lt;? extends java.util.Map&lt;java.lang.String, java.lang.Object&gt;&gt; update, <a href='../../../../../../com.mongodb.client.model.UpdateOptions.html'>UpdateOptions</a> updateOptions)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/mongo/simple/EnumType.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/mongo/simple/EnumType.html
index 283526d365..d1441259f0 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/mongo/simple/EnumType.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/mongo/simple/EnumType.html
@@ -107,7 +107,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/engine/types/Abs
 
     <p> A custom type for persisting Enum which have an id field in domain classes.
  For example: To save identity instead of string in database for field <b>type</b>.
- 
+
  <pre>
       class User {
           UserType type
@@ -116,7 +116,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/engine/types/Abs
 
       enum UserType {
           A(1), B(2)
-          
+
           final int id
           UserType(int id) {
               this.id = id
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.html
index 66d65e029f..94b9aec45d 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.html
@@ -114,7 +114,7 @@ implements org.springframework.beans.factory.support.BeanDefinitionRegistryPostP
     <p> BeanDefinitionRegistryPostProcessor that replaces multiple discovered PersistenceContextInterceptor beans with
  a single aggregating instance. The previous multiple PersistenceContextInterceptor beans will be removed from
  the context and re-added as inner beans of the new AggregatePersistenceContextInterceptor bean.
- 
+
  PersistenceContextInterceptor beans are discovered by the bean name. The default pattern used for matching
  the beans is ^.*[pP]ersistenceInterceptor$ <DL><DT><B>Authors:</B></DT><DD>Burt Beckwith</DD><DD>Lari Hotari</DD></DL></p>
 
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.html
index 35aadc0916..8995959025 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.html
@@ -106,7 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase= CompilePhase.CANONICALIZATION)
+<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase = CompilePhase.CANONICALIZATION)
 public class DetachedCriteriaASTTransformation
 extends java.lang.Object
 implements org.codehaus.groovy.transform.ASTTransformation, org.codehaus.groovy.transform.TransformWithPriority</pre>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.html
index 63896bba1a..6b9c1f4d77 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.html
@@ -106,7 +106,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase= CompilePhase.CANONICALIZATION)
+<pre>@org.codehaus.groovy.transform.GroovyASTTransformation(phase = CompilePhase.CANONICALIZATION)
 public class GlobalDetachedCriteriaASTTransformation
 extends java.lang.Object
 implements org.codehaus.groovy.transform.ASTTransformation, org.codehaus.groovy.transform.TransformWithPriority</pre>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/services/DefaultTransactionService.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/services/DefaultTransactionService.html
index 07700475cc..e60f98b0a6 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/services/DefaultTransactionService.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/services/DefaultTransactionService.html
@@ -299,7 +299,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withNewTransaction(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withNewTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withNewTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -307,7 +307,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withNewTransaction(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withNewTransaction</strong>(org.springframework.transaction.TransactionDefinition definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withNewTransaction</strong>(org.springframework.transaction.TransactionDefinition definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -315,7 +315,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withRollback(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withRollback</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -323,7 +323,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withRollback(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withRollback</strong>(org.springframework.transaction.TransactionDefinition definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withRollback</strong>(org.springframework.transaction.TransactionDefinition definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -331,7 +331,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withTransaction(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(@groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -339,7 +339,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withTransaction(org.springframework.transaction.TransactionDefinition, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(org.springframework.transaction.TransactionDefinition definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(org.springframework.transaction.TransactionDefinition definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -347,7 +347,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/services/Service
                         <a name="withTransaction(java.util.Map, Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(java.util.Map definition, @groovy.transform.stc.ClosureParams(value: SimpleType.class, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
+                                <h4>&lt;T&gt; @java.lang.Override<br>T <strong>withTransaction</strong>(java.util.Map definition, @groovy.transform.stc.ClosureParams(value: SimpleType, options: org.springframework.transaction.TransactionStatus)<br>groovy.lang.Closure&lt;T&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.html
index 2e4e1ad004..6071a21881 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.html
@@ -111,9 +111,9 @@ extends java.lang.Object
 implements <a href='../../../../../org/grails/datastore/gorm/timestamp/TimestampProvider.html'>TimestampProvider</a></pre>
 
     <p> Default implementation of TimestampProvider
- 
+
  supports creating timestamps for any class that supports a constructor that accepts a Long or long value.
- 
+
  "currentTimeMillis" can be overrided in subclasses (useful for testing purposes)
 
  </p>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/transactions/transform/RollbackTransform.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/transactions/transform/RollbackTransform.html
index ba9d5ddaba..0397bc7ce2 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/transactions/transform/RollbackTransform.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/transactions/transform/RollbackTransform.html
@@ -262,7 +262,7 @@ extends <a href='../../../../../../org/grails/datastore/gorm/transactions/transf
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html'>TransactionalTransform</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html#applyTransactionalAttributeSettings(org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.expr.VariableExpression, org.codehaus.groovy.ast.stmt.BlockStatement, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode)'>applyTransactionalAttributeSettings</a>, <a href='../../../../../../org/grails/datastore/gor [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html#applyTransactionalAttributeSettings(org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.expr.VariableExpression, org.codehaus.groovy.ast.stmt.BlockStatement, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode)'>applyTransactionalAttributeSettings</a>, <a href='../../../../../../org/grails/datastore/gor [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/gorm/transform/AbstractDatastoreMethodDecoratingTransformation.html'>AbstractDatastoreMethodDecoratingTransformation</a></code></td>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html
index 268bc33604..b7dc027fe1 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.html
@@ -367,18 +367,6 @@ extends <a href='../../../../../../org/grails/datastore/gorm/transform/AbstractD
                             <td class="colLast"><code><strong><a href="#priority()">priority</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
-                            <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)">weaveClassNode</a></strong>(org.codehaus.groovy.control.SourceUnit source, org.codehaus.groovy.ast.AnnotationNode annotationNode, org.codehaus.groovy.ast.ClassNode classNode)</code><br></td>
-                        </tr>
-                        
-                        <tr class="altColor">
-                            <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.codehaus.groovy.ast.MethodNode</code></td>
-                            <td class="colLast"><code><strong><a href="#weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, Map)">weaveNewMethod</a></strong>(org.codehaus.groovy.control.SourceUnit sourceUnit, org.codehaus.groovy.ast.AnnotationNode annotationNode, org.codehaus.groovy.ast.ClassNode classNode, org.codehaus.groovy.ast.MethodNode methodNode, java.util.Map&lt;java. [...]
-                        </tr>
-                        
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
@@ -620,22 +608,6 @@ extends <a href='../../../../../../org/grails/datastore/gorm/transform/AbstractD
                             </li>
                         </ul>
                     
-                        <a name="weaveClassNode(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode)"><!-- --></a>
-                        <ul class="blockListLast">
-                            <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;void <strong>weaveClassNode</strong>(org.codehaus.groovy.control.SourceUnit source, org.codehaus.groovy.ast.AnnotationNode annotationNode, org.codehaus.groovy.ast.ClassNode classNode)</h4>
-                                <p></p>
-                            </li>
-                        </ul>
-                    
-                        <a name="weaveNewMethod(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.MethodNode, Map)"><!-- --></a>
-                        <ul class="blockListLast">
-                            <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;org.codehaus.groovy.ast.MethodNode <strong>weaveNewMethod</strong>(org.codehaus.groovy.control.SourceUnit sourceUnit, org.codehaus.groovy.ast.AnnotationNode annotationNode, org.codehaus.groovy.ast.ClassNode classNode, org.codehaus.groovy.ast.MethodNode methodNode, java.util.Map&lt;java.lang.String, org.codehaus.groovy.ast.ClassNode&gt; genericsSpec)</h4>
-                                <p></p>
-                            </li>
-                        </ul>
-                    
                         <a name="weaveSetTargetDatastoreBody(org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.ast.AnnotationNode, org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.ast.expr.Expression, org.codehaus.groovy.ast.stmt.BlockStatement)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/engine/EntityPersister.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/engine/EntityPersister.html
index 65742a91dc..a556120eac 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/engine/EntityPersister.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/engine/EntityPersister.html
@@ -590,7 +590,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/engine/Persister
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>cancelInsert</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> persistentEntity, <a href='../../../../../org/grails/datastore/mapping/engine/EntityAccess.html'>EntityAccess</a> entityAccess)</h4>
                                 <p> Fire the beforeInsert even on an entityAccess object and return true if the operation should be cancelled
-     <DL><DT><B>Parameters:</B></DT><DD><code>persistentEntity</code> -  The entity</DD><DD><code>entityAccess</code> -  The entity access</DD></DL><DL><DT><B>Returns:</B></DT><DD>true if the operation should be cancelled</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>persistentEntity</code> -  The entity</DD><DD><code>entityAccess</code> -  The entity access</DD></DL><DL><DT><B>Returns:</B></DT><DD>true if the operation should be cancelled</DD></DL></p>
                             </li>
                         </ul>
                     
@@ -608,7 +608,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/engine/Persister
                             <li class="blockList">
                                 <h4>public&nbsp;boolean <strong>cancelUpdate</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> persistentEntity, <a href='../../../../../org/grails/datastore/mapping/engine/EntityAccess.html'>EntityAccess</a> entityAccess)</h4>
                                 <p> Fire the beforeUpdate event on an entityAccess object and return true if the operation should be cancelled
-     <DL><DT><B>Parameters:</B></DT><DD><code>persistentEntity</code> -  The entity</DD><DD><code>entityAccess</code> -  The entity access</DD></DL><DL><DT><B>Returns:</B></DT><DD>true if the operation should be cancelled</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>persistentEntity</code> -  The entity</DD><DD><code>entityAccess</code> -  The entity access</DD></DL><DL><DT><B>Returns:</B></DT><DD>true if the operation should be cancelled</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoCollection.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoCollection.html
index 8ed0fe3ea3..4a4dd853f7 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoCollection.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoCollection.html
@@ -456,7 +456,7 @@ extends java.util.Collection</pre>
                         <a name="id(groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/config/Entity.html' title='Entity'>Entity</a>&lt;<a href='../../../../../../org/grails/datastore/mapping/document/config/Attribute.html' title='Attribute'>Attribute</a>&gt; <strong>id</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute.class)<br>groovy.lang.Closure identityConfig)</h4>
+                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/config/Entity.html' title='Entity'>Entity</a>&lt;<a href='../../../../../../org/grails/datastore/mapping/document/config/Attribute.html' title='Attribute'>Attribute</a>&gt; <strong>id</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute)<br>groovy.lang.Closure identityConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -488,7 +488,7 @@ extends java.util.Collection</pre>
                         <a name="property(java.lang.String, groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/config/Entity.html'>Entity</a> <strong>property</strong>(java.lang.String name, @groovy.lang.DelegatesTo(value: MongoAttribute.class)<br>groovy.lang.Closure propertyConfig)</h4>
+                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/config/Entity.html'>Entity</a> <strong>property</strong>(java.lang.String name, @groovy.lang.DelegatesTo(value: MongoAttribute)<br>groovy.lang.Closure propertyConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -496,7 +496,7 @@ extends java.util.Collection</pre>
                         <a name="property(groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/mongo/config/MongoAttribute.html'>MongoAttribute</a> <strong>property</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute.class)<br>groovy.lang.Closure propertyConfig)</h4>
+                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/mongo/config/MongoAttribute.html'>MongoAttribute</a> <strong>property</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute)<br>groovy.lang.Closure propertyConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -544,7 +544,7 @@ extends java.util.Collection</pre>
                         <a name="version(groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/config/Entity.html'>Entity</a> <strong>version</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute.class)<br>groovy.lang.Closure versionConfig)</h4>
+                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/config/Entity.html'>Entity</a> <strong>version</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute)<br>groovy.lang.Closure versionConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
index 615d680c04..9ddd1c53a4 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
@@ -225,14 +225,14 @@ extends <a href='../../../../../../org/grails/datastore/mapping/document/config/
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../../Binary.html'>Binary</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../../org.bson.types.Binary.html'>Binary</a></code></td>
                             <td class="colLast"><code><strong><a href="#convert(byte[])">convert</a></strong>(byte[] source)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;byte[]</code></td>
-                            <td class="colLast"><code><strong><a href="#convert(Binary)">convert</a></strong>(<a href='../../../../../../Binary.html'>Binary</a> source)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#convert(org.bson.types.Binary)">convert</a></strong>(<a href='../../../../../../org.bson.types.Binary.html'>Binary</a> source)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -428,15 +428,15 @@ extends <a href='../../../../../../org/grails/datastore/mapping/document/config/
                         <a name="convert(byte[])"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../../Binary.html'>Binary</a> <strong>convert</strong>(byte[] source)</h4>
+                                <h4>public&nbsp;<a href='../../../../../../org.bson.types.Binary.html'>Binary</a> <strong>convert</strong>(byte[] source)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="convert(Binary)"><!-- --></a>
+                        <a name="convert(org.bson.types.Binary)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;byte[] <strong>convert</strong>(<a href='../../../../../../Binary.html'>Binary</a> source)</h4>
+                                <h4>public&nbsp;byte[] <strong>convert</strong>(<a href='../../../../../../org.bson.types.Binary.html'>Binary</a> source)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/engine/MongoCodecEntityPersister.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/engine/MongoCodecEntityPersister.html
index 74dff0f413..286d0d380e 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/engine/MongoCodecEntityPersister.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/engine/MongoCodecEntityPersister.html
@@ -341,7 +341,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/engine/ThirdPart
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../../MongoCollection.html'>MongoCollection</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../../com.mongodb.client.MongoCollection.html'>MongoCollection</a></code></td>
                             <td class="colLast"><code><strong><a href="#getMongoCollection(org.grails.datastore.mapping.model.PersistentEntity)">getMongoCollection</a></strong>(<a href='../../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> pe)</code><br></td>
                         </tr>
                         
@@ -658,7 +658,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/engine/ThirdPart
                         <a name="getMongoCollection(org.grails.datastore.mapping.model.PersistentEntity)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../../MongoCollection.html'>MongoCollection</a> <strong>getMongoCollection</strong>(<a href='../../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> pe)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../../com.mongodb.client.MongoCollection.html'>MongoCollection</a> <strong>getMongoCollection</strong>(<a href='../../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> pe)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/query/api/BuildableCriteria.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/query/api/BuildableCriteria.html
index 06f71fa4bd..21ceec20b0 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/query/api/BuildableCriteria.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/query/api/BuildableCriteria.html
@@ -348,7 +348,7 @@ extends org.hibernate.Criteria</pre>
                         <ul class="blockListLast">
                             <li class="blockList">
                                 <h4>public&nbsp;java.lang.Object <strong>listDistinct</strong>(@groovy.lang.DelegatesTo(Criteria.class)<br>groovy.lang.Closure closure)</h4>
-                                <p> Defines and executes a list distinct query in a single call. Example: Foo.createCriteria().listDistinct { } 
+                                <p> Defines and executes a list distinct query in a single call. Example: Foo.createCriteria().listDistinct { }
       <DL><DT><B>Parameters:</B></DT><DD><code>closure</code> -  The closure to execute</DD></DL><DL><DT><B>Returns:</B></DT><DD>The result</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/query/api/Criteria.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/query/api/Criteria.html
index 70eab00e8c..213766f784 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/query/api/Criteria.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/query/api/Criteria.html
@@ -1148,7 +1148,7 @@ public interface Criteria</pre>
                                 <h4>public&nbsp;<a href='../../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>readOnly</strong>(boolean readOnly)</h4>
                                 <p> <p>Configures the hibernate readOnly property to avoid checking for changes on the objects if the passed argument is true
 
- <code> { readOnly true } </code>          
+ <code> { readOnly true } </code>
       <DL><DT><B>Parameters:</B></DT><DD><code>readOnly</code> -  True to disable dirty checking</DD></DL><DL><DT><B>Returns:</B></DT><DD>This Criteria instance</DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/ClosureToMapPopulator.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/ClosureToMapPopulator.html
index db71968456..974de0d7ca 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/ClosureToMapPopulator.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/ClosureToMapPopulator.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 public class ClosureToMapPopulator
 extends groovy.lang.GroovyObjectSupport</pre>
 
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/ReflectionUtils.html b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/ReflectionUtils.html
index bb3894779e..f179070ffd 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/ReflectionUtils.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/ReflectionUtils.html
@@ -352,7 +352,7 @@ extends java.lang.Object</pre>
  to avoid unnecessary conflicts with a JVM SecurityManager (if active).
 
  Based on the same method in Spring core.
-     <DL><DT><B>Parameters:</B></DT><DD><code>field</code> -  the field to make accessible</DD></DL><DL><DT><B>See Also:</B></DT><DD>java.lang.reflect.Field#setAccessible</DD></DL></p>
+      <DL><DT><B>Parameters:</B></DT><DD><code>field</code> -  the field to make accessible</DD></DL><DL><DT><B>See Also:</B></DT><DD>java.lang.reflect.Field#setAccessible</DD></DL></p>
                             </li>
                         </ul>
                     
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index 6152d85047..600db99f34 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
@@ -524,7 +524,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <tr class="altColor">
                             <td class="colFirst"><code>&lt;T&gt;</code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#prepareCriteria(Query)">prepareCriteria</a></strong>(org.hibernate.Query&lt;T&gt; jpaQuery)</code><br>Prepare the given Query object, applying cache settings and/or a
+                            <td class="colLast"><code><strong><a href="#prepareCriteria(Query)">prepareCriteria</a></strong>(org.hibernate.query.Query&lt;T&gt; jpaQuery)</code><br>Prepare the given Query object, applying cache settings and/or a
  transaction timeout.</td>
                         </tr>
                         
@@ -1117,7 +1117,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="prepareCriteria(Query)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>&lt;T&gt; protected&nbsp;void <strong>prepareCriteria</strong>(org.hibernate.Query&lt;T&gt; jpaQuery)</h4>
+                                <h4>&lt;T&gt; protected&nbsp;void <strong>prepareCriteria</strong>(org.hibernate.query.Query&lt;T&gt; jpaQuery)</h4>
                                 <p> Prepare the given Query object, applying cache settings and/or a
  transaction timeout.
       <DL><DT><B>Parameters:</B></DT><DD><code>jpaQuery</code> -  the Query object to prepare</DD></DL></p>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html b/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html
index fd5aec45c3..1d61e2d9a9 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html
@@ -220,7 +220,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         </tr>
                         
                         <tr class="rowColor">
-                            <td class="colFirst"><code><strong>static&nbsp;org.hibernate.mapping.Map&lt;java.lang.String, org.hibernate.cfg.NamingStrategy&gt;</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>static&nbsp;java.util.Map&lt;java.lang.String, org.hibernate.cfg.NamingStrategy&gt;</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#NAMING_STRATEGIES">NAMING_STRATEGIES</a></code></td>
                             <td class="colLast">Overrideable naming strategy. </td>
                         </tr>
@@ -370,7 +370,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, java.util.Collection, java.lang.String)">bindCollectionSecondPass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.boot.spi.InFlightMetadataCollector mappings, org.hibernate.mapping.Map&lt;?, ?&gt; persistentClasse [...]
+                            <td class="colLast"><code><strong><a href="#bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, java.util.Collection, java.lang.String)">bindCollectionSecondPass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.boot.spi.InFlightMetadataCollector mappings, java.util.Map&lt;?, ?&gt; persistentClasses, java.util [...]
                         </tr>
                         
                         <tr class="rowColor">
@@ -467,31 +467,31 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, org.hibernate.mapping.List, java.lang.String)">bindListSecondPass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.boot.spi.InFlightMetadataCollector mappings, org.hibernate.mapping.Map&lt;?, ?&gt; persistentClasses, org [...]
+                            <td class="colLast"><code><strong><a href="#bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, org.hibernate.mapping.List, java.lang.String)">bindListSecondPass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.boot.spi.InFlightMetadataCollector mappings, java.util.Map&lt;?, ?&gt; persistentClasses, org.hibernate.m [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindManyToMany</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a [...]
+                            <td class="colLast"><code><strong><a href="#bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindManyToMany</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, org.hibernate.mapping.ManyToOne element, org.hibernate.boot.spi.InFlightMetadataCollector mappings, java.lang.St [...]
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindManyToOne</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.ht [...]
+                            <td class="colLast"><code><strong><a href="#bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)">bindManyToOne</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, org.hibernate.mapping.ManyToOne manyToOne, java.lang.String path, org.hibernate.boot.spi.InFligh [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne)">bindManyToOneValues</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> manyToOne)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne)">bindManyToOneValues</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, org.hibernate.mapping.ManyToOne manyToOne)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, org.hibernate.mapping.Map, java.lang.String)">bindMapSecondPass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.boot.spi.InFlightMetadataCollector mappings, org.hibernate.mapping.Map&lt;?, ?&gt; persistentClasses, org.hi [...]
+                            <td class="colLast"><code><strong><a href="#bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, org.hibernate.mapping.Map, java.lang.String)">bindMapSecondPass</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.boot.spi.InFlightMetadataCollector mappings, java.util.Map&lt;?, ?&gt; persistentClasses, org.hibernate.mapp [...]
                         </tr>
                         
                         <tr class="rowColor">
@@ -516,19 +516,19 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)">bindOneToMany</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> currentGrailsProp, <a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> one, org.hibern [...]
+                            <td class="colLast"><code><strong><a href="#bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.mapping.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)">bindOneToMany</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> currentGrailsProp, org.hibernate.mapping.OneToMany one, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String, java.lang.String)">bindOneToOne</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> oneToOne, java.lang.String path, java.lang.Str [...]
+                            <td class="colLast"><code><strong><a href="#bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String, java.lang.String)">bindOneToOne</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, org.hibernate.mapping.OneToOne oneToOne, java.lang.String path, java.lang.String sessionFactoryBeanName)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String)">bindOneToOneInternal</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> oneToOne, java.lang.String path)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)">bindOneToOneInternal</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, org.hibernate.mapping.OneToOne oneToOne, java.lang.String path)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -614,7 +614,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.grails.datastore.mapping.model.types.ManyToOne)">bindUnidirectionalOneToManyInverseValues</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> manyToOne)</code><br> <DL><DT [...]
+                            <td class="colLast"><code><strong><a href="#bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.ManyToOne)">bindUnidirectionalOneToManyInverseValues</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.mapping.ManyToOne manyToOne)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>property</code> -  The property to bind</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -631,7 +631,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.hibernate.mapping.Set&lt;java.lang.String&gt;</code></td>
+                            <td class="colLast"><code>protected&nbsp;java.util.Set&lt;java.lang.String&gt;</code></td>
                             <td class="colLast"><code><strong><a href="#buildDiscriminatorSet(org.grails.orm.hibernate.cfg.HibernatePersistentEntity)">buildDiscriminatorSet</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass)</code><br></td>
                         </tr>
                         
@@ -712,13 +712,13 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#createKeyForProps(org.grails.datastore.mapping.model.PersistentProperty, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String, List, java.lang.String)">createKeyForProps</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, java.lang.String path, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> ta [...]
+                            <td class="colLast"><code><strong><a href="#createKeyForProps(org.grails.datastore.mapping.model.PersistentProperty, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String, List, java.lang.String)">createKeyForProps</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, java.lang.String path, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> ta [...]
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;org.hibernate.mapping.DependantValue</code></td>
-                            <td class="colLast"><code><strong><a href="#createPrimaryKeyValue(org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map)">createPrimaryKeyValue</a></strong>(org.hibernate.boot.spi.InFlightMetadataCollector mappings, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, java.util.Collection collection, org.hibernate.mapping [...]
+                            <td class="colLast"><code><strong><a href="#createPrimaryKeyValue(org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map)">createPrimaryKeyValue</a></strong>(org.hibernate.boot.spi.InFlightMetadataCollector mappings, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, java.util.Collection collection, java.util.Map&lt;?, ? [...]
                         </tr>
                         
                         <tr class="altColor">
@@ -730,7 +730,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#createUniqueKeyForColumns(org.grails.orm.hibernate.cfg.Table, java.lang.String, List)">createUniqueKeyForColumns</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, java.lang.String columnName, org.hibernate.mapping.List&lt;org.hibernate.mapping.Column&gt; columns)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#createUniqueKeyForColumns(org.grails.orm.hibernate.cfg.Table, java.lang.String, List)">createUniqueKeyForColumns</a></strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, java.lang.String columnName, java.util.List&lt;org.hibernate.mapping.Column&gt; columns)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -832,7 +832,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;int</code></td>
-                            <td class="colLast"><code><strong><a href="#getMaxSize(List)">getMaxSize</a></strong>(org.hibernate.mapping.List&lt;?&gt; inListValues)</code><br> <DL><DT><B>Returns:</B></DT><DD>the maximum length of the strings in the specified list</DD></DL></td>
+                            <td class="colLast"><code><strong><a href="#getMaxSize(List)">getMaxSize</a></strong>(java.util.List&lt;?&gt; inListValues)</code><br> <DL><DT><B>Returns:</B></DT><DD>the maximum length of the strings in the specified list</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1247,7 +1247,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="NAMING_STRATEGIES"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;static&nbsp;org.hibernate.mapping.Map&lt;java.lang.String, org.hibernate.cfg.NamingStrategy&gt; <strong>NAMING_STRATEGIES</strong></h4>
+                                <h4>public&nbsp;static&nbsp;java.util.Map&lt;java.lang.String, org.hibernate.cfg.NamingStrategy&gt; <strong>NAMING_STRATEGIES</strong></h4>
                                 <p> Overrideable naming strategy. Defaults to <code>ImprovedNamingStrategy</code> but can
  be configured in DataSource.groovy via <code>hibernate.naming_strategy = ...</code>.
      </p>
@@ -1419,7 +1419,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, java.util.Collection, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindCollectionSecondPass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.boot.spi.InFlightMetadataCollector mappings, org.hibernate.mapping.Map&lt;?, ?&gt; persistentClasses, java.util.Collection collection, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindCollectionSecondPass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.boot.spi.InFlightMetadataCollector mappings, java.util.Map&lt;?, ?&gt; persistentClasses, java.util.Collection collection, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1553,15 +1553,15 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, org.hibernate.mapping.List, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindListSecondPass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.boot.spi.InFlightMetadataCollector mappings, org.hibernate.mapping.Map&lt;?, ?&gt; persistentClasses, org.hibernate.mapping.List list, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindListSecondPass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.boot.spi.InFlightMetadataCollector mappings, java.util.Map&lt;?, ?&gt; persistentClasses, org.hibernate.mapping.List list, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindManyToMany</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> element, org.hibernate.boot.spi.InFlightMetadataCollector mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindManyToMany</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, org.hibernate.mapping.ManyToOne element, org.hibernate.boot.spi.InFlightMetadataCollector mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p> Binds a many-to-many relationship. A many-to-many consists of
  - a key (a DependentValue)
  - an element
@@ -1571,20 +1571,20 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                             </li>
                         </ul>
                     
-                        <a name="bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
+                        <a name="bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.SuppressWarnings("unchecked")<br>protected&nbsp;void <strong>bindManyToOne</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> manyToOne, java.lang.String path, org.hibernate.boot.spi.InFlightMetadataCollector mappings, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>@java.lang.SuppressWarnings("unchecked")<br>protected&nbsp;void <strong>bindManyToOne</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, org.hibernate.mapping.ManyToOne manyToOne, java.lang.String path, org.hibernate.boot.spi.InFlightMetadataCollector mappings, java.lang.String sessionFactoryBeanName)</h4>
                                 <p> Binds a many-to-one relationship to the
 
      </p>
                             </li>
                         </ul>
                     
-                        <a name="bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne)"><!-- --></a>
+                        <a name="bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindManyToOneValues</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> manyToOne)</h4>
+                                <h4>protected&nbsp;void <strong>bindManyToOneValues</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/Association.html'>Association</a> property, org.hibernate.mapping.ManyToOne manyToOne)</h4>
                                 <p>
      </p>
                             </li>
@@ -1593,7 +1593,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map, org.hibernate.mapping.Map, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindMapSecondPass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.boot.spi.InFlightMetadataCollector mappings, org.hibernate.mapping.Map&lt;?, ?&gt; persistentClasses, org.hibernate.mapping.Map map, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindMapSecondPass</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.boot.spi.InFlightMetadataCollector mappings, java.util.Map&lt;?, ?&gt; persistentClasses, org.hibernate.mapping.Map map, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1625,26 +1625,26 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                             </li>
                         </ul>
                     
-                        <a name="bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
+                        <a name="bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.mapping.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindOneToMany</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> currentGrailsProp, <a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> one, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</h4>
+                                <h4>protected&nbsp;void <strong>bindOneToMany</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToMany.html'>OneToMany</a> currentGrailsProp, org.hibernate.mapping.OneToMany one, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String, java.lang.String)"><!-- --></a>
+                        <a name="bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindOneToOne</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> oneToOne, java.lang.String path, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>bindOneToOne</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, org.hibernate.mapping.OneToOne oneToOne, java.lang.String path, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String)"><!-- --></a>
+                        <a name="bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindOneToOneInternal</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> oneToOne, java.lang.String path)</h4>
+                                <h4>protected&nbsp;void <strong>bindOneToOneInternal</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/OneToOne.html'>OneToOne</a> property, org.hibernate.mapping.OneToOne oneToOne, java.lang.String path)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1766,10 +1766,10 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                             </li>
                         </ul>
                     
-                        <a name="bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.grails.datastore.mapping.model.types.ManyToOne)"><!-- --></a>
+                        <a name="bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.ManyToOne)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindUnidirectionalOneToManyInverseValues</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, <a href='../../../../../org/grails/datastore/mapping/model/types/ManyToOne.html'>ManyToOne</a> manyToOne)</h4>
+                                <h4>protected&nbsp;void <strong>bindUnidirectionalOneToManyInverseValues</strong>(<a href='../../../../../org/grails/datastore/mapping/model/types/ToMany.html'>ToMany</a> property, org.hibernate.mapping.ManyToOne manyToOne)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>property</code> -  The property to bind</DD><DD><code>manyToOne</code> -  The inverse side</DD></DL></p>
                             </li>
@@ -1794,7 +1794,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="buildDiscriminatorSet(org.grails.orm.hibernate.cfg.HibernatePersistentEntity)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.hibernate.mapping.Set&lt;java.lang.String&gt; <strong>buildDiscriminatorSet</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass)</h4>
+                                <h4>protected&nbsp;java.util.Set&lt;java.lang.String&gt; <strong>buildDiscriminatorSet</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/HibernatePersistentEntity.html'>HibernatePersistentEntity</a> domainClass)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1907,7 +1907,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="createKeyForProps(org.grails.datastore.mapping.model.PersistentProperty, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String, List, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>createKeyForProps</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, java.lang.String path, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, java.lang.String columnName, org.hibernate.mapping.List&lt;?&gt; propertyNames, java.lang.String sessionFactoryBeanName)</h4>
+                                <h4>protected&nbsp;void <strong>createKeyForProps</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> grailsProp, java.lang.String path, <a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, java.lang.String columnName, java.util.List&lt;?&gt; propertyNames, java.lang.String sessionFactoryBeanName)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1915,7 +1915,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="createPrimaryKeyValue(org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.hibernate.mapping.DependantValue <strong>createPrimaryKeyValue</strong>(org.hibernate.boot.spi.InFlightMetadataCollector mappings, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, java.util.Collection collection, org.hibernate.mapping.Map&lt;?, ?&gt; persistentClasses)</h4>
+                                <h4>protected&nbsp;org.hibernate.mapping.DependantValue <strong>createPrimaryKeyValue</strong>(org.hibernate.boot.spi.InFlightMetadataCollector mappings, <a href='../../../../../org/grails/datastore/mapping/model/PersistentProperty.html'>PersistentProperty</a> property, java.util.Collection collection, java.util.Map&lt;?, ?&gt; persistentClasses)</h4>
                                 <p> Creates the DependentValue object that forms a primary key reference for the collection.
       <DL><DT><B>Parameters:</B></DT><DD>mappings</DD><DD><code>property</code> -           The grails property</DD><DD><code>collection</code> -         The collection object</DD><DD>persistentClasses</DD></DL><DL><DT><B>Returns:</B></DT><DD>The DependantValue (key)</DD></DL></p>
                             </li>
@@ -1932,7 +1932,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="createUniqueKeyForColumns(org.grails.orm.hibernate.cfg.Table, java.lang.String, List)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>createUniqueKeyForColumns</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, java.lang.String columnName, org.hibernate.mapping.List&lt;org.hibernate.mapping.Column&gt; columns)</h4>
+                                <h4>protected&nbsp;void <strong>createUniqueKeyForColumns</strong>(<a href='../../../../../org/grails/orm/hibernate/cfg/Table.html'>Table</a> table, java.lang.String columnName, java.util.List&lt;org.hibernate.mapping.Column&gt; columns)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2071,7 +2071,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="getMaxSize(List)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;int <strong>getMaxSize</strong>(org.hibernate.mapping.List&lt;?&gt; inListValues)</h4>
+                                <h4>protected&nbsp;int <strong>getMaxSize</strong>(java.util.List&lt;?&gt; inListValues)</h4>
                                 <p>
       <DL><DT><B>Returns:</B></DT><DD>the maximum length of the strings in the specified list</DD></DL></p>
                             </li>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html b/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
index 3ae25a408a..134fbf1b43 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
@@ -398,7 +398,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         </tr>
                         
                         <tr class="rowColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;java.util.List&lt;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html' title='Criteria'>Criteria</a>&gt;</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;java.util.List&lt;org.hibernate.Criteria&gt;</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#aliasInstanceStack">aliasInstanceStack</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -434,7 +434,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         </tr>
                         
                         <tr class="rowColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.Criteria</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#criteria">criteria</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -464,7 +464,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;java.util.List&lt;org.hibernate.criterion.LogicalExpression&gt;</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;java.util.List&lt;LogicalExpression&gt;</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#logicalExpressionStack">logicalExpressionStack</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -624,7 +624,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.Criteria</code></td>
                             <td class="colLast"><code><strong><a href="#buildCriteria(Closure)">buildCriteria</a></strong>(groovy.lang.Closure&lt;?&gt; criteriaClosure)</code><br></td>
                         </tr>
                         
@@ -708,13 +708,13 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.Criteria</code></td>
                             <td class="colLast"><code><strong><a href="#createAlias(java.lang.String, java.lang.String)">createAlias</a></strong>(java.lang.String associationPath, java.lang.String alias)</code><br>Join an association, assigning an alias to the joined association.</td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;abstract&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a></code></td>
+                            <td class="colLast"><code>public&nbsp;abstract&nbsp;org.hibernate.Criteria</code></td>
                             <td class="colLast"><code><strong><a href="#createAlias(java.lang.String, java.lang.String, int)">createAlias</a></strong>(java.lang.String associationPath, java.lang.String alias, int joinType)</code><br>Join an association using the specified join-type, assigning an alias
  to the joined association.
  </td>
@@ -880,7 +880,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.Criteria</code></td>
                             <td class="colLast"><code><strong><a href="#getInstance()">getInstance</a></strong>()</code><br>Returns the criteria instance</td>
                         </tr>
                         
@@ -1786,7 +1786,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="aliasInstanceStack"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;java.util.List&lt;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html' title='Criteria'>Criteria</a>&gt; <strong>aliasInstanceStack</strong></h4>
+                                <h4>protected&nbsp;java.util.List&lt;org.hibernate.Criteria&gt; <strong>aliasInstanceStack</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1834,7 +1834,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="criteria"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>criteria</strong></h4>
+                                <h4>protected&nbsp;org.hibernate.Criteria <strong>criteria</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1874,7 +1874,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="logicalExpressionStack"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;java.util.List&lt;org.hibernate.criterion.LogicalExpression&gt; <strong>logicalExpressionStack</strong></h4>
+                                <h4>protected&nbsp;java.util.List&lt;LogicalExpression&gt; <strong>logicalExpressionStack</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2062,7 +2062,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="buildCriteria(Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>buildCriteria</strong>(groovy.lang.Closure&lt;?&gt; criteriaClosure)</h4>
+                                <h4>public&nbsp;org.hibernate.Criteria <strong>buildCriteria</strong>(groovy.lang.Closure&lt;?&gt; criteriaClosure)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2182,11 +2182,11 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="createAlias(java.lang.String, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>createAlias</strong>(java.lang.String associationPath, java.lang.String alias)</h4>
+                                <h4>public&nbsp;org.hibernate.Criteria <strong>createAlias</strong>(java.lang.String associationPath, java.lang.String alias)</h4>
                                 <p> Join an association, assigning an alias to the joined association.
 
  Functionally equivalent to createAlias(String, String, int) using
- CriteriaSpecificationINNER_JOIN for the joinType.<DL><DT><B>throws:</B></DT><DD>HibernateException Indicates a problem creating the sub criteria</DD></DL>
+ CriteriaSpecificationINNER_JOIN for the joinType.<DL><DT><B>throws:</B></DT><DD>org.hibernate.HibernateException Indicates a problem creating the sub criteria</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>associationPath</code> -  A dot-seperated property path</DD><DD><code>alias</code> -  The alias to assign to the joined association (for later reference).</DD></DL><DL><DT><B>Returns:</B></DT><DD>this (for method chaining)
  #see <a href='#createAlias(java.lang.String, java.lang.String, int)'>createAlias(String, String, int)</a></DD></DL></p>
                             </li>
@@ -2195,7 +2195,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="createAlias(java.lang.String, java.lang.String, int)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;abstract&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>createAlias</strong>(java.lang.String associationPath, java.lang.String alias, int joinType)</h4>
+                                <h4>public&nbsp;abstract&nbsp;org.hibernate.Criteria <strong>createAlias</strong>(java.lang.String associationPath, java.lang.String alias, int joinType)</h4>
                                 <p> Join an association using the specified join-type, assigning an alias
  to the joined association.
  sub
@@ -2434,7 +2434,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="getInstance()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/api/Criteria.html'>Criteria</a> <strong>getInstance</strong>()</h4>
+                                <h4>public&nbsp;org.hibernate.Criteria <strong>getInstance</strong>()</h4>
                                 <p> Returns the criteria instance
       <DL><DT><B>Returns:</B></DT><DD>The criteria instance</DD></DL></p>
                             </li>
diff --git a/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.html b/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.html
index 4789aba20d..9fab9d4769 100644
--- a/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.html
+++ b/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.html
@@ -112,13 +112,13 @@ implements jakarta.transaction.TransactionManager</pre>
 
     <p> Adapter for adding transaction controlling hooks for supporting
  Hibernate's org.hibernate.engine.transaction.Isolater class's interaction with transactions
- 
+
  This is required when there is no real JTA transaction manager in use and Spring's
  org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy is used.
- 
+
  Without this solution, using Hibernate's TableGenerator identity strategies will fail to support transactions.
  The id generator will commit the current transaction and break transactional behaviour.
- 
+
  The javadoc of Hibernate's <CODE>TableHiLoGenerator</CODE> states this. However this isn't mentioned in the javadocs of other TableGenerators.
   <DL><DT><B>Authors:</B></DT><DD>Lari Hotari</DD></DL></p>
 
diff --git a/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html b/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html
index e87bfe87be..3a6b0a05af 100644
--- a/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html
+++ b/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html
@@ -534,7 +534,7 @@ extends <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaB
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html'>AbstractHibernateCriteriaBuilder</a></code></td>
-                            <td class="colLast"><code><a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addProjectionToList(Projection, java.lang.String)'>addProjectionToList</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#allEq(Map)'>allEq</a>, <a href='../../org [...]
+                            <td class="colLast"><code><a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addProjectionToList(Projection, java.lang.String)'>addProjectionToList</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#allEq(Map)'>allEq</a>, <a href='../../org [...]
                         </tr>
                     </table>
                    </ul>
@@ -932,7 +932,7 @@ extends <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaB
                                 <p> Join an association using the specified join-type, assigning an alias
  to the joined association.
  The joinType is expected to be one of CriteriaSpecification.INNER_JOIN (the default),
- CriteriaSpecificationFULL_JOIN, or CriteriaSpecificationLEFT_JOIN.<DL><DT><B>throws:</B></DT><DD>HibernateException Indicates a problem creating the sub criteria</DD></DL>
+ CriteriaSpecificationFULL_JOIN, or CriteriaSpecificationLEFT_JOIN.<DL><DT><B>throws:</B></DT><DD>org.hibernate.HibernateException Indicates a problem creating the sub criteria</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>associationPath</code> -  A dot-seperated property path</DD><DD><code>alias</code> -            The alias to assign to the joined association (for later reference).</DD><DD><code>joinType</code> -         The type of join to use.</DD></DL><DL><DT><B>Returns:</B></DT><DD>this (for method chaining)</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#createAlias(java.lang.String, java.lang.String)'>createAlias(String, String)</a></DD></DL></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/mongodb/api/grails/orm/PagedResultList.html b/snapshot/grails-data/mongodb/api/grails/orm/PagedResultList.html
index eeab98f92d..fd7bf73368 100644
--- a/snapshot/grails-data/mongodb/api/grails/orm/PagedResultList.html
+++ b/snapshot/grails-data/mongodb/api/grails/orm/PagedResultList.html
@@ -101,7 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@java.lang.SuppressWarnings({"unchecked","rawtypes"})
+<pre>@java.lang.SuppressWarnings({"unchecked", "rawtypes"})
 @java.lang.Deprecated
 public class PagedResultList
 extends <a href='../../grails.gormPagedResultList.html'>grails.gormPagedResultList</a></pre>
diff --git a/snapshot/grails-data/mongodb/api/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.html b/snapshot/grails-data/mongodb/api/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.html
index 6bb8096cb9..66dbb09043 100644
--- a/snapshot/grails-data/mongodb/api/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.html
+++ b/snapshot/grails-data/mongodb/api/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.html
@@ -101,8 +101,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>@groovy.util.logging.Slf4j
-class HibernateDatastoreSpringInitializer
+<pre>class HibernateDatastoreSpringInitializer
 extends org.grails.datastore.gorm.bootstrap.AbstractDatastoreInitializer</pre>
 
     <p> Class that handles the details of initializing GORM for Hibernate <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>3.0</DD></DL></p>
diff --git a/snapshot/grails-data/mongodb/api/index-all.html b/snapshot/grails-data/mongodb/api/index-all.html
index e5651ef1a8..a2f0eaa632 100644
--- a/snapshot/grails-data/mongodb/api/index-all.html
+++ b/snapshot/grails-data/mongodb/api/index-all.html
@@ -570,15 +570,15 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindClass(org.grails.datastore.mapping.model.PersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindClass(org.grails.datastore.mapping.model.PersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/Gr [...]
 </dt><dd> <div class="block">Binds the specified persistant class to the runtime model based on the
  properties defined in the domain class</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollection(org.grails.datastore.mapping.model.types.ToMany, java.util.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">bindCollection(org.grails.datastore.mapping.model.types.ToMany, java.util.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlight [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollection(org.grails.datastore.mapping.model.types.ToMany, org.grails.datastore.mapping.document.config.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">bindCollection(org.grails.datastore.mapping.model.types.ToMany, org.grails.datastore.mapping.document.config.Collection,  [...]
 </dt><dd> <div class="block">First pass to bind collection to Hibernate metamodel, sets up second pass</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionForPropertyConfig(java.util.Collection, org.grails.orm.hibernate.cfg.PropertyConfig)" title="Method in GrailsDomainBinder">bindCollectionForPropertyConfig(java.util.Collection, org.grails.orm.hibernate.cfg.PropertyConfig)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionForPropertyConfig(org.grails.datastore.mapping.document.config.Collection, org.grails.orm.hibernate.cfg.PropertyConfig)" title="Method in GrailsDomainBinder">bindCollectionForPropertyConfig(org.grails.datastore.mapping.document.config.Collection, org.grails.orm.hibernate.cfg.PropertyConfig)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainB [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map<?,?>, java.util.Collection, java.lang.String)" title="Method in GrailsDomainBinder">bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map&lt;?,?&gt;, java.util.Collection, java.lang.String)</a></span> -  [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map<?,?>, org.grails.datastore.mapping.document.config.Collection, java.lang.String)" title="Method in GrailsDomainBinder">bindCollectionSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map&lt;?,?&gt;, org.grails.datasto [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.Table, java.lang.String)" title="Method in GrailsDomainBinder">bindCollectionTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.Ta [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.document.config.Collection, org.grails.orm.hibernate.cfg.Table, java.lang.String)" title="Method in GrailsDomainBinder">bindCollectionTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datasto [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionWithJoinTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)" title="Method in GrailsDomainBinder">bindCollectionWithJoinTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection, org.gr [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindCollectionWithJoinTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.document.config.Collection, org.grails.orm.hibernate.cfg.PropertyConfig, java.lang.String)" title="Method in GrailsDomainBinder">bindCollectionWithJoinTable(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataColl [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindColumn(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.grails.orm.hibernate.cfg.ColumnConfig, java.lang.String, org.grails.orm.hibernate.cfg.Table, java.lang.String)" title="Method in GrailsDomainBinder">bindColumn(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.model. [...]
 </dt><dd> <div class="block">Binds a Column instance to the Hibernate meta model</div></dd>
@@ -607,11 +607,11 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Binds a joined sub-class mapping using table-per-subclass</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map<?,?>, org.hibernate.mapping.List, java.lang.String)" title="Method in GrailsDomainBinder">bindListSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map&lt;?,?&gt;, org.hibernate.mapping.List, java.lang.String)</a></span> -  [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.la [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindManyToMany(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a h [...]
 </dt><dd> <div class="block">Binds a many-to-many relationship. </div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne, java.lang.String, org.hibernate.boot.spi. [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindManyToOne(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne, java.lang.String, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.S [...]
 </dt><dd> <div class="block">Binds a many-to-one relationship to the</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne)" title="Method in GrailsDomainBinder">bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.grails.datastore.mapping.model.types.ManyToOne)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne)" title="Method in GrailsDomainBinder">bindManyToOneValues(org.grails.datastore.mapping.model.types.Association, org.hibernate.mapping.ManyToOne)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map<?,?>, org.hibernate.mapping.Map, java.lang.String)" title="Method in GrailsDomainBinder">bindMapSecondPass(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.boot.spi.InFlightMetadataCollector, Map&lt;?,?&gt;, org.hibernate.mapping.Map, java.lang.String)</a></span> - Meth [...]
 </dt><dd> <div class="block"></div></dd>
@@ -620,11 +620,11 @@ if (location.href.indexOf('is-external=true') == -1) {
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindNumericColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty, org.grails.orm.hibernate.cfg.ColumnConfig)" title="Method in GrailsDomainBinder">bindNumericColumnConstraints(org.hibernate.mapping.Column, org.grails.datastore.mapping.model.PersistentProperty, org.grails.orm.hibernate.cfg.ColumnConfig)</a></span> - Method in <a href="org/grails/orm/hibern [...]
 </dt><dd> <div class="block">Interrogates the specified constraints looking for any constraints that would limit the
  precision and/or scale of the property's value.  </div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href= [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.mapping.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.mapping.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDo [...]
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/Grai [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOne(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.grails.datastore.mapping.model.types.OneToOne, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html" [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/gra [...]
 </dt><dd> <div class="block">Binds a property to Hibernate runtime meta model. </div></dd>
@@ -644,9 +644,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Binds a sub-class using table-per-hierarchy inheritance mapping</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindSubClasses(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindSubClasses(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span>  [...]
 </dt><dd> <div class="block">Binds the sub classes of a root class using table-per-heirarchy inheritance mapping</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection)" title="Method in GrailsDomainBinder">bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector, java.util.Collection)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/Gr [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.document.config.Collection)" title="Method in GrailsDomainBinder">bindUnidirectionalOneToMany(org.grails.datastore.mapping.model.types.OneToMany, org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.document.config.Colle [...]
 </dt><dd> <div class="block">Binds a unidirectional one-to-many creating a psuedo back reference property in the process.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.grails.datastore.mapping.model.types.ManyToOne)" title="Method in GrailsDomainBinder">bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.grails.datastore.mapping.model.types.ManyToOne)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.htm [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.ManyToOne)" title="Method in GrailsDomainBinder">bindUnidirectionalOneToManyInverseValues(org.grails.datastore.mapping.model.types.ToMany, org.hibernate.mapping.ManyToOne)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"> <DL><DT><B>Parameters:</B></DT><DD><code>property</code> -  The property to bind</DD></DL></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindUnionSubclass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.UnionSubclass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindUnionSubclass(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.UnionSubclass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span [...]
 </dt><dd> <div class="block"></div></dd>
@@ -1535,7 +1535,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/mongo/MongoSession.html#createPersister(java.lang.Class, org.grails.datastore.mapping.model.MappingContext)" title="Method in MongoSession">createPersister(java.lang.Class, org.grails.datastore.mapping.model.MappingContext)</a></span> - Method in <a href="org/grails/datastore/mapping/mongo/MongoSession.html">MongoSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#createPrimaryKeyValue(org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map<?,?>)" title="Method in GrailsDomainBinder">createPrimaryKeyValue(org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, java.util.Collection, Map&lt;?,?&gt;)</a></span> - Method in <a href="org/grails/ [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#createPrimaryKeyValue(org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.document.config.Collection, Map<?,?>)" title="Method in GrailsDomainBinder">createPrimaryKeyValue(org.hibernate.boot.spi.InFlightMetadataCollector, org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.document.config.C [...]
 </dt><dd> <div class="block">Creates the DependentValue object that forms a primary key reference for the collection.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#createProperty(org.hibernate.mapping.Value, org.hibernate.mapping.PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">createProperty(org.hibernate.mapping.Value, org.hibernate.mapping.PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.boot.spi.InFlightMetadataCo [...]
 </dt><dd> <div class="block"></div></dd>
@@ -2465,7 +2465,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#executeLogicalExpression(groovy.lang.Closure, java.lang.String)" title="Method in AbstractHibernateCriteriaBuilder">executeLogicalExpression(groovy.lang.Closure, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html">AbstractHibernateCriteriaBuilder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html#executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)" title="Method in AbstractHibernateGormStaticApi">executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html">AbstractHibernateGormStaticApi</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html#executeQuery(java.lang.CharSequence, org.grails.datastore.mapping.document.config.Collection, java.util.Map)" title="Method in AbstractHibernateGormStaticApi">executeQuery(java.lang.CharSequence, org.grails.datastore.mapping.document.config.Collection, java.util.Map)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html">AbstractHibernateGormStaticApi</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)" title="Method in AbstractHibernateQuery">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html">AbstractHibernateQuery</a>
 </dt><dd> <div class="block"></div></dd>
@@ -2481,7 +2481,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html#executeUpdate(java.lang.CharSequence, java.util.Map)" title="Method in AbstractHibernateGormStaticApi">executeUpdate(java.lang.CharSequence, java.util.Map)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html">AbstractHibernateGormStaticApi</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateGormStaticApi.html#executeUpdate(java.lang.CharSequence, java.util.Collection, java.util.Map)" title="Method in HibernateGormStaticApi">executeUpdate(java.lang.CharSequence, java.util.Collection, java.util.Map)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateGormStaticApi.html">HibernateGormStaticApi</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateGormStaticApi.html#executeUpdate(java.lang.CharSequence, org.grails.datastore.mapping.document.config.Collection, java.util.Map)" title="Method in HibernateGormStaticApi">executeUpdate(java.lang.CharSequence, org.grails.datastore.mapping.document.config.Collection, java.util.Map)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateGormStaticApi.html">HibernateGormStaticApi</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html#executeWithExistingOrCreateNewSession(org.hibernate.SessionFactory, Closure<T1>)" title="Method in GrailsHibernateTemplate">executeWithExistingOrCreateNewSession(org.hibernate.SessionFactory, Closure&lt;T1&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html">GrailsHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -4454,7 +4454,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block">Adds support for the <a href='../../../../../../org/grails/datastore/gorm/mongo/geo/LineStringType.html' title='LineStringType'>LineStringType</a> type to GORM for MongoDB</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/mongo/geo/LineStringType.html#LineStringType()" title="Constructor in LineStringType">LineStringType()</a></span> - Constructor in <a href="org/grails/datastore/gorm/mongo/geo/LineStringType.html">LineStringType</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#linkBidirectionalOneToMany(java.util.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.mapping.DependantValue, org.grails.datastore.mapping.model.PersistentProperty)" title="Method in GrailsDomainBinder">linkBidirectionalOneToMany(java.util.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.mapping.DependantValue, org.grails.datastore.mapping.model.PersistentProperty)</a></ [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#linkBidirectionalOneToMany(org.grails.datastore.mapping.document.config.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.mapping.DependantValue, org.grails.datastore.mapping.model.PersistentProperty)" title="Method in GrailsDomainBinder">linkBidirectionalOneToMany(org.grails.datastore.mapping.document.config.Collection, org.hibernate.mapping.PersistentClass, org.hibernate.mapping.Depend [...]
 </dt><dd> <div class="block">Links a bidirectional one-to-many, configuring the inverse side and using a column copy to perform the link</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#linkValueUsingAColumnCopy(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.hibernate.mapping.DependantValue)" title="Method in GrailsDomainBinder">linkValueUsingAColumnCopy(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Column, org.hibernate.mapping.DependantValue)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDo [...]
 </dt><dd> <div class="block"></div></dd>
@@ -6072,7 +6072,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateEventListeners.html#setListenerMap(Map<String,Object>)" title="Method in HibernateEventListeners">setListenerMap(Map&lt;String,Object&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateEventListeners.html">HibernateEventListeners</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.html#setManyToMany(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, T, org.grails.datastore.mapping.model.types.ManyToMany, java.util.Collection, Map<Association,List<Serializable>>)" title="Method in AbstractMongoObectEntityPersister">setManyToMany(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, T, org.grails.datastore.mapping.model.t [...]
+<dt><span class="strong"><a href="org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.html#setManyToMany(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, T, org.grails.datastore.mapping.model.types.ManyToMany, org.grails.datastore.mapping.document.config.Collection, Map<Association,List<Serializable>>)" title="Method in AbstractMongoObectEntityPersister">setManyToMany(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, T, o [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.html#setMappingDirectoryLocations(org.springframework.core.io.Resource)" title="Method in HibernateMappingContextSessionFactoryBean">setMappingDirectoryLocations(org.springframework.core.io.Resource)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.html">HibernateMappingContextSessionFactoryBean</a>
 </dt><dd> <div class="block">Set locations of directories that contain Hibernate mapping resources,
diff --git a/snapshot/grails-data/mongodb/api/org/grails/datastore/gorm/mongo/simple/EnumType.html b/snapshot/grails-data/mongodb/api/org/grails/datastore/gorm/mongo/simple/EnumType.html
index 709410bf4a..fa99222464 100644
--- a/snapshot/grails-data/mongodb/api/org/grails/datastore/gorm/mongo/simple/EnumType.html
+++ b/snapshot/grails-data/mongodb/api/org/grails/datastore/gorm/mongo/simple/EnumType.html
@@ -107,7 +107,7 @@ extends org.grails.datastore.mapping.engine.types.AbstractMappingAwareCustomType
 
     <p> A custom type for persisting Enum which have an id field in domain classes.
  For example: To save identity instead of string in database for field <b>type</b>.
- 
+
  <pre>
       class User {
           UserType type
@@ -116,7 +116,7 @@ extends org.grails.datastore.mapping.engine.types.AbstractMappingAwareCustomType
 
       enum UserType {
           A(1), B(2)
-          
+
           final int id
           UserType(int id) {
               this.id = id
diff --git a/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/config/MongoCollection.html b/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/config/MongoCollection.html
index d54d3878fd..7d79ac722e 100644
--- a/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/config/MongoCollection.html
+++ b/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/config/MongoCollection.html
@@ -91,7 +91,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li>org.grails.datastore.mapping.mongo.config.MongoCollection
+<li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li>org.grails.datastore.mapping.mongo.config.MongoCollection
 </ul>
 <div class="description">
     <ul class="blockList">
@@ -105,7 +105,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 @groovy.transform.CompileStatic
 @groovy.transform.builder.Builder(builderStrategy: SimpleStrategy, prefix: )
 class MongoCollection
-extends java.util.Collection</pre>
+extends org.grails.datastore.mapping.document.config.Collection</pre>
 
     <p> Provides configuration options for mapping Mongo DBCollection instances <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL></p>
 
@@ -146,6 +146,26 @@ extends java.util.Collection</pre>
         
         <!-- =========== FIELD SUMMARY =========== -->
         
+            <ul class="blockList">
+                <li class="blockList"><a name="field_summary"><!--   --></a>
+                    <ul class="blockList">
+                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited fields summary table">
+                        <caption><span>Inherited fields</span><span class="tabEnd">&nbsp;</span></caption>
+                        <tr>
+                            <th class="colFirst" scope="col">Fields inherited from class</th>
+                            <th class="colLast" scope="col">Fields</th>
+                        </tr>
+                                                <tr class="altColor">
+                            <td class="colFirst"><strong><code>class org.grails.datastore.mapping.document.config.Collection</code></strong></td>
+                            <td class="colLast"><code>__$stMC, ALL_DATA_SOURCES, DEFAULT_DATA_SOURCE, __$stMC</code></td>
+                        </tr>
+
+                    </table>
+                    </ul>
+                </li>
+                
+            </ul>
+        
 
         <!-- =========== PROPERTY SUMMARY =========== -->
         
@@ -334,8 +354,8 @@ extends java.util.Collection</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code>interface java.util.Collection</code></td>
-                            <td class="colLast"><code>java.util.Collection#add(java.lang.Object), java.util.Collection#addAll(java.util.Collection), java.util.Collection#clear(), java.util.Collection#contains(java.lang.Object), java.util.Collection#containsAll(java.util.Collection), java.util.Collection#equals(java.lang.Object), java.util.Collection#forEach(java.util.function.Consumer), java.util.Collection#hashCode(), java.util.Collection#isEmpty(), java.util.Collection#iterator(), java [...]
+                            <td class="colFirst"><code>class org.grails.datastore.mapping.document.config.Collection</code></td>
+                            <td class="colLast"><code>org.grails.datastore.mapping.document.config.Collection#$getLookup(), org.grails.datastore.mapping.document.config.Collection#autoTimestamp(boolean), org.grails.datastore.mapping.document.config.Collection#autowire(boolean), org.grails.datastore.mapping.document.config.Collection#collection(java.lang.String), org.grails.datastore.mapping.document.config.Collection#configureExisting(org.grails.datastore.mapping.config.Entity, groovy.la [...]
                         </tr>
                     </table>
                    </ul>
@@ -456,7 +476,7 @@ extends java.util.Collection</pre>
                         <a name="id(groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>org.grails.datastore.mapping.config.Entity&lt;org.grails.datastore.mapping.document.config.Attribute&gt; <strong>id</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute.class)<br>groovy.lang.Closure identityConfig)</h4>
+                                <h4>@java.lang.Override<br>org.grails.datastore.mapping.config.Entity&lt;org.grails.datastore.mapping.document.config.Attribute&gt; <strong>id</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute)<br>groovy.lang.Closure identityConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -488,7 +508,7 @@ extends java.util.Collection</pre>
                         <a name="property(java.lang.String, groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>org.grails.datastore.mapping.config.Entity <strong>property</strong>(java.lang.String name, @groovy.lang.DelegatesTo(value: MongoAttribute.class)<br>groovy.lang.Closure propertyConfig)</h4>
+                                <h4>@java.lang.Override<br>org.grails.datastore.mapping.config.Entity <strong>property</strong>(java.lang.String name, @groovy.lang.DelegatesTo(value: MongoAttribute)<br>groovy.lang.Closure propertyConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -496,7 +516,7 @@ extends java.util.Collection</pre>
                         <a name="property(groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/mongo/config/MongoAttribute.html'>MongoAttribute</a> <strong>property</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute.class)<br>groovy.lang.Closure propertyConfig)</h4>
+                                <h4>@java.lang.Override<br><a href='../../../../../../org/grails/datastore/mapping/mongo/config/MongoAttribute.html'>MongoAttribute</a> <strong>property</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute)<br>groovy.lang.Closure propertyConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -544,7 +564,7 @@ extends java.util.Collection</pre>
                         <a name="version(groovy.lang.Closure)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>org.grails.datastore.mapping.config.Entity <strong>version</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute.class)<br>groovy.lang.Closure versionConfig)</h4>
+                                <h4>@java.lang.Override<br>org.grails.datastore.mapping.config.Entity <strong>version</strong>(@groovy.lang.DelegatesTo(value: MongoAttribute)<br>groovy.lang.Closure versionConfig)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext/DocumentEmbeddedPersistentEntity.DocumentCollectionMapping.html b/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext/DocumentEmbeddedPersistentEntity.DocumentCollectionMapping.html
index 012129567a..76a0593ee8 100644
--- a/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext/DocumentEmbeddedPersistentEntity.DocumentCollectionMapping.html
+++ b/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext/DocumentEmbeddedPersistentEntity.DocumentCollectionMapping.html
@@ -165,7 +165,7 @@ extends org.grails.datastore.mapping.model.AbstractClassMapping</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;java.util.Collection</code></td>
+                            <td class="colLast"><code>public&nbsp;org.grails.datastore.mapping.document.config.Collection</code></td>
                             <td class="colLast"><code><strong><a href="#getMappedForm()">getMappedForm</a></strong>()</code><br></td>
                         </tr>
                         
@@ -240,7 +240,7 @@ extends org.grails.datastore.mapping.model.AbstractClassMapping</pre>
                         <a name="getMappedForm()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;java.util.Collection <strong>getMappedForm</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.document.config.Collection <strong>getMappedForm</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.html b/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.html
index 98bd1f45b8..f5e5591604 100644
--- a/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.html
+++ b/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.html
@@ -336,7 +336,7 @@ extends org.grails.datastore.mapping.engine.NativeEntryEntityPersister</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;java.util.Collection</code></td>
+                            <td class="colLast"><code>protected&nbsp;org.grails.datastore.mapping.document.config.Collection</code></td>
                             <td class="colLast"><code><strong><a href="#getManyToManyKeys(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, java.io.Serializable, T, org.grails.datastore.mapping.model.types.ManyToMany)">getManyToManyKeys</a></strong>(org.grails.datastore.mapping.model.PersistentEntity persistentEntity, java.lang.Object object, java.io.Serializable nativeKey, T nativeEntry, org.grails.datastore.mapping.model.types.ManyToMany manyToMany)</code><br></td>
                         </tr>
                         
@@ -421,7 +421,7 @@ extends org.grails.datastore.mapping.engine.NativeEntryEntityPersister</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setManyToMany(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, T, org.grails.datastore.mapping.model.types.ManyToMany, java.util.Collection, Map)">setManyToMany</a></strong>(org.grails.datastore.mapping.model.PersistentEntity persistentEntity, java.lang.Object obj, T nativeEntry, org.grails.datastore.mapping.model.types.ManyToMany manyToMany, java.util.Collection associatedObjects, java.util.Map [...]
+                            <td class="colLast"><code><strong><a href="#setManyToMany(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, T, org.grails.datastore.mapping.model.types.ManyToMany, org.grails.datastore.mapping.document.config.Collection, Map)">setManyToMany</a></strong>(org.grails.datastore.mapping.model.PersistentEntity persistentEntity, java.lang.Object obj, T nativeEntry, org.grails.datastore.mapping.model.types.ManyToMany manyToMany, org.grails.datasto [...]
                         </tr>
                         
                     </table>
@@ -649,7 +649,7 @@ extends org.grails.datastore.mapping.engine.NativeEntryEntityPersister</pre>
                         <a name="getManyToManyKeys(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, java.io.Serializable, T, org.grails.datastore.mapping.model.types.ManyToMany)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;java.util.Collection <strong>getManyToManyKeys</strong>(org.grails.datastore.mapping.model.PersistentEntity persistentEntity, java.lang.Object object, java.io.Serializable nativeKey, T nativeEntry, org.grails.datastore.mapping.model.types.ManyToMany manyToMany)</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;org.grails.datastore.mapping.document.config.Collection <strong>getManyToManyKeys</strong>(org.grails.datastore.mapping.model.PersistentEntity persistentEntity, java.lang.Object object, java.io.Serializable nativeKey, T nativeEntry, org.grails.datastore.mapping.model.types.ManyToMany manyToMany)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -759,10 +759,10 @@ extends org.grails.datastore.mapping.engine.NativeEntryEntityPersister</pre>
                             </li>
                         </ul>
                     
-                        <a name="setManyToMany(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, T, org.grails.datastore.mapping.model.types.ManyToMany, java.util.Collection, Map)"><!-- --></a>
+                        <a name="setManyToMany(org.grails.datastore.mapping.model.PersistentEntity, java.lang.Object, T, org.grails.datastore.mapping.model.types.ManyToMany, org.grails.datastore.mapping.document.config.Collection, Map)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;void <strong>setManyToMany</strong>(org.grails.datastore.mapping.model.PersistentEntity persistentEntity, java.lang.Object obj, T nativeEntry, org.grails.datastore.mapping.model.types.ManyToMany manyToMany, java.util.Collection associatedObjects, java.util.Map&lt;org.grails.datastore.mapping.model.types.Association, java.util.List&lt;java.io.Serializable&gt;&gt; toManyKeys)</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;void <strong>setManyToMany</strong>(org.grails.datastore.mapping.model.PersistentEntity persistentEntity, java.lang.Object obj, T nativeEntry, org.grails.datastore.mapping.model.types.ManyToMany manyToMany, org.grails.datastore.mapping.document.config.Collection associatedObjects, java.util.Map&lt;org.grails.datastore.mapping.model.types.Association, java.util.List&lt;java.io.Serializable&gt;&gt; toManyKeys)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/engine/MongoEntityPersister.html b/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/engine/MongoEntityPersister.html
index 2c8078f8b0..1a66ed8dfb 100644
--- a/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/engine/MongoEntityPersister.html
+++ b/snapshot/grails-data/mongodb/api/org/grails/datastore/mapping/mongo/engine/MongoEntityPersister.html
@@ -338,7 +338,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/mongo/engine/Abs
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.html'>AbstractMongoObectEntityPersister</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.html#cascadeDeleteCollection(org.grails.datastore.mapping.engine.EntityAccess, org.grails.datastore.mapping.model.types.Association)'>cascadeDeleteCollection</a>, <a href='../../../../../../org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.html#createInstanceCacheEntryKey(java.lang.Object)'>createInstanceCac [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.html#cascadeDeleteCollection(org.grails.datastore.mapping.engine.EntityAccess, org.grails.datastore.mapping.model.types.Association)'>cascadeDeleteCollection</a>, <a href='../../../../../../org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.html#createInstanceCacheEntryKey(java.lang.Object)'>createInstanceCac [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html b/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html
index 9e8cffc593..4e9fce5dd7 100644
--- a/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html
+++ b/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.html
@@ -287,7 +287,7 @@ extends org.grails.datastore.gorm.GormStaticApi&lt;D&gt;</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>java.util.List</code></td>
-                            <td class="colLast"><code><strong><a href="#executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)">executeQuery</a></strong>(java.lang.CharSequence query, java.util.Collection params, java.util.Map args)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#executeQuery(java.lang.CharSequence, org.grails.datastore.mapping.document.config.Collection, java.util.Map)">executeQuery</a></strong>(java.lang.CharSequence query, org.grails.datastore.mapping.document.config.Collection params, java.util.Map args)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -323,7 +323,7 @@ extends org.grails.datastore.gorm.GormStaticApi&lt;D&gt;</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>D</code></td>
-                            <td class="colLast"><code><strong><a href="#find(java.lang.CharSequence, java.util.Collection, java.util.Map)">find</a></strong>(java.lang.CharSequence query, java.util.Collection params, java.util.Map args)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#find(java.lang.CharSequence, org.grails.datastore.mapping.document.config.Collection, java.util.Map)">find</a></strong>(java.lang.CharSequence query, org.grails.datastore.mapping.document.config.Collection params, java.util.Map args)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -365,7 +365,7 @@ extends org.grails.datastore.gorm.GormStaticApi&lt;D&gt;</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>java.util.List&lt;D&gt;</code></td>
-                            <td class="colLast"><code><strong><a href="#findAll(java.lang.CharSequence, java.util.Collection, java.util.Map)">findAll</a></strong>(java.lang.CharSequence query, java.util.Collection params, java.util.Map args)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#findAll(java.lang.CharSequence, org.grails.datastore.mapping.document.config.Collection, java.util.Map)">findAll</a></strong>(java.lang.CharSequence query, org.grails.datastore.mapping.document.config.Collection params, java.util.Map args)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -670,10 +670,10 @@ extends org.grails.datastore.gorm.GormStaticApi&lt;D&gt;</pre>
                             </li>
                         </ul>
                     
-                        <a name="executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)"><!-- --></a>
+                        <a name="executeQuery(java.lang.CharSequence, org.grails.datastore.mapping.document.config.Collection, java.util.Map)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>java.util.List <strong>executeQuery</strong>(java.lang.CharSequence query, java.util.Collection params, java.util.Map args)</h4>
+                                <h4>@java.lang.Override<br>java.util.List <strong>executeQuery</strong>(java.lang.CharSequence query, org.grails.datastore.mapping.document.config.Collection params, java.util.Map args)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -718,10 +718,10 @@ extends org.grails.datastore.gorm.GormStaticApi&lt;D&gt;</pre>
                             </li>
                         </ul>
                     
-                        <a name="find(java.lang.CharSequence, java.util.Collection, java.util.Map)"><!-- --></a>
+                        <a name="find(java.lang.CharSequence, org.grails.datastore.mapping.document.config.Collection, java.util.Map)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>D <strong>find</strong>(java.lang.CharSequence query, java.util.Collection params, java.util.Map args)</h4>
+                                <h4>@java.lang.Override<br>D <strong>find</strong>(java.lang.CharSequence query, org.grails.datastore.mapping.document.config.Collection params, java.util.Map args)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -774,10 +774,10 @@ extends org.grails.datastore.gorm.GormStaticApi&lt;D&gt;</pre>
                             </li>
                         </ul>
                     
-                        <a name="findAll(java.lang.CharSequence, java.util.Collection, java.util.Map)"><!-- --></a>
+                        <a name="findAll(java.lang.CharSequence, org.grails.datastore.mapping.document.config.Collection, java.util.Map)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>java.util.List&lt;D&gt; <strong>findAll</strong>(java.lang.CharSequence query, java.util.Collection params, java.util.Map args)</h4>
+                                <h4>@java.lang.Override<br>java.util.List&lt;D&gt; <strong>findAll</strong>(java.lang.CharSequence query, org.grails.datastore.mapping.document.config.Collection params, java.util.Map args)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateSession.html b/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateSession.html
index c44fb2b468..0695f4191c 100644
--- a/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateSession.html
+++ b/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateSession.html
@@ -283,7 +283,7 @@ implements org.grails.datastore.mapping.query.api.QueryAliasAwareSession</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;java.util.Collection</code></td>
+                            <td class="colLast"><code>protected&nbsp;org.grails.datastore.mapping.document.config.Collection</code></td>
                             <td class="colLast"><code><strong><a href="#getIterableAsCollection(java.lang.Iterable)">getIterableAsCollection</a></strong>(java.lang.Iterable objects)</code><br></td>
                         </tr>
                         
@@ -602,7 +602,7 @@ implements org.grails.datastore.mapping.query.api.QueryAliasAwareSession</pre>
                         <a name="getIterableAsCollection(java.lang.Iterable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.SuppressWarnings("unchecked")<br>protected&nbsp;java.util.Collection <strong>getIterableAsCollection</strong>(java.lang.Iterable objects)</h4>
+                                <h4>@java.lang.SuppressWarnings("unchecked")<br>protected&nbsp;org.grails.datastore.mapping.document.config.Collection <strong>getIterableAsCollection</strong>(java.lang.Iterable objects)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index dacdf67fd4..a15d8ac981 100644
--- a/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
+++ b/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
@@ -444,7 +444,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;java.util.Collection</code></td>
+                            <td class="colLast"><code>protected&nbsp;org.grails.datastore.mapping.document.config.Collection</code></td>
                             <td class="colLast"><code><strong><a href="#getIterableAsCollection(java.lang.Iterable)">getIterableAsCollection</a></strong>(java.lang.Iterable objects)</code><br></td>
                         </tr>
                         
@@ -524,7 +524,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <tr class="altColor">
                             <td class="colFirst"><code>&lt;T&gt;</code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#prepareCriteria(Query)">prepareCriteria</a></strong>(org.hibernate.Query&lt;T&gt; jpaQuery)</code><br>Prepare the given Query object, applying cache settings and/or a
+                            <td class="colLast"><code><strong><a href="#prepareCriteria(Query)">prepareCriteria</a></strong>(org.hibernate.query.Query&lt;T&gt; jpaQuery)</code><br>Prepare the given Query object, applying cache settings and/or a
  transaction timeout.</td>
                         </tr>
                         
@@ -1011,7 +1011,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="getIterableAsCollection(java.lang.Iterable)"><!-- --></a>
... 855 lines suppressed ...