Merge remote-tracking branch 'upstream/8.0.x' into 8.0.x-hibernate7

# Conflicts:
#	grails-data-mongodb/core/src/test/groovy/org/apache/grails/data/mongo/core/GrailsDataMongoTckManager.groovy
#	grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeUpdatePropertyPersistenceSpec.groovy
#	grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy
#	grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NestedCriteriaWithNamedQuerySpec.groovy
#	grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormStaticApi.groovy
#	grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/NamedCriteriaProxy.groovy
#	grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NamedQuerySpec.groovy
#	grails-test-suite-uber/src/test/groovy/grails/compiler/DomainClassWithInnerClassUsingStaticCompilationSpec.groovy

Author: jdaugherty

grails-async/plugin/build.gradle

@@ -37,7 +37,6 @@ dependencies {
 
     api project(':grails-async-core')
     api project(':grails-core')
-    api project(':grails-events-compat')
     api project(':grails-events-core')
     api project(':grails-web-common')
     api 'org.apache.groovy:groovy'

grails-converters/src/main/groovy/grails/web/JSONBuilder.groovy

@@ -95,17 +95,10 @@ private void initJSONConfiguration() {
         marshallers.add(new org.grails.web.converters.marshaller.json.ByteArrayMarshaller());
         marshallers.add(new org.grails.web.converters.marshaller.json.CollectionMarshaller());
         marshallers.add(new org.grails.web.converters.marshaller.json.MapMarshaller());
+        marshallers.add(new org.grails.web.converters.marshaller.json.SimpleEnumMarshaller());
 
         Config grailsConfig = getGrailsConfig();
 
-        // Register enum marshaller - defaults to legacy for backward compatibility (will change in Grails 8.0)
-        String jsonEnumFormat = grailsConfig.getProperty("grails.converters.json.enum.format", String.class, "default");
-        if ("simple".equals(jsonEnumFormat)) {
-            marshallers.add(new org.grails.web.converters.marshaller.json.SimpleEnumMarshaller());
-        } else {
-            marshallers.add(new org.grails.web.converters.marshaller.json.EnumMarshaller());
-        }
-
         marshallers.add(new org.grails.web.converters.marshaller.ProxyUnwrappingMarshaller<>());
 
         if ("javascript".equals(grailsConfig.getProperty(SETTING_CONVERTERS_JSON_DATE, String.class, "default", Arrays.asList("javascript", "default")))) {
@@ -185,17 +178,10 @@ private void initXMLConfiguration() {
         marshallers.add(new org.grails.web.converters.marshaller.xml.ArrayMarshaller());
         marshallers.add(new org.grails.web.converters.marshaller.xml.CollectionMarshaller());
         marshallers.add(new org.grails.web.converters.marshaller.xml.MapMarshaller());
+        marshallers.add(new org.grails.web.converters.marshaller.xml.SimpleEnumMarshaller());
 
         Config grailsConfig = getGrailsConfig();
 
-        // Register enum marshaller - defaults to legacy for backward compatibility (will change in Grails 8.0)
-        String xmlEnumFormat = grailsConfig.getProperty("grails.converters.xml.enum.format", String.class, "default");
-        if ("simple".equals(xmlEnumFormat)) {
-            marshallers.add(new org.grails.web.converters.marshaller.xml.SimpleEnumMarshaller());
-        } else {
-            marshallers.add(new org.grails.web.converters.marshaller.xml.EnumMarshaller());
-        }
-
         marshallers.add(new org.grails.web.converters.marshaller.xml.DateMarshaller());
         marshallers.add(new ProxyUnwrappingMarshaller<>());
         marshallers.add(new org.grails.web.converters.marshaller.xml.ToStringBeanMarshaller());

grails-converters/src/main/groovy/org/grails/web/converters/configuration/ConvertersConfigurationInitializer.java

@@ -98,16 +98,6 @@ class GrailsApplicationPostProcessor implements BeanDefinitionRegistryPostProces
         }
     }
 
-    /**
-     * @deprecated Use {@link #GrailsApplicationPostProcessor(GrailsApplicationLifeCycle, ApplicationContext, PluginDiscovery, Class [ ])} instead.
-     * Plugin discovery is resolved from the application context when available, otherwise a default instance is created.
-     * Will be removed in Grails 8.0.0.
-     */
-    @Deprecated(forRemoval = true, since = '7.1')
-    GrailsApplicationPostProcessor(GrailsApplicationLifeCycle lifeCycle, ApplicationContext applicationContext, Class... classes) {
-        this(lifeCycle, applicationContext, resolvePluginDiscovery(applicationContext), classes)
-    }
-
     /**
      * Resolves the {@link PluginDiscovery} from the application context.
      * The bootstrap registry promotes the discovery bean before context refresh,
@@ -139,20 +129,6 @@ class GrailsApplicationPostProcessor implements BeanDefinitionRegistryPostProces
         performGrailsInitializationSequence()
     }
 
-    /**
-     * @deprecated Plugin manager customization is now handled through {@link PluginDiscovery}.
-     * This method will be removed in Grails 8.0.0.
-     *
-     * @throws UnsupportedOperationException always - callers must switch to {@link PluginDiscovery}
-     */
-    @Deprecated(forRemoval = true, since = '7.1')
-    protected void customizePluginManager(GrailsPluginManager pluginManager) {
-        throw new UnsupportedOperationException(
-                'customizePluginManager() is no longer supported. ' +
-                        'Use org.apache.grails.core.plugins.GrailsPluginDiscovery to configure plugin discovery instead.'
-        )
-    }
-
     protected void customizeGrailsApplication(GrailsApplication grailsApplication) {
 
     }