Merge branch '7.0.x' into 7.1.x

Author: matrei

dependencies.gradle

@@ -25,7 +25,7 @@ ext {
             'ant.version'                   : '1.10.15',
             'asciidoctor-gradle-jvm.version': '4.0.5',
             'asciidoctorj.version'          : '3.0.0',
-            'asset-pipeline-gradle.version' : '5.0.20',
+            'asset-pipeline-gradle.version' : '5.0.21',
             'byte-buddy.version'            : '1.17.7',
             'commons-text.version'          : '1.13.1',
             'directory-watcher.version'     : '0.19.1',
@@ -68,11 +68,11 @@ ext {
     ]
 
     bomDependencyVersions = [
-            'asset-pipeline-bom.version'  : '5.0.20',
+            'asset-pipeline-bom.version'  : '5.0.21',
             'bootstrap-icons.version'     : '1.13.1',
-            'bootstrap.version'           : '5.3.7',
+            'bootstrap.version'           : '5.3.8',
             'commons-codec.version'       : '1.18.0',
-            'geb-spock.version'           : '8.0.0',
+            'geb-spock.version'           : '8.0.1',
             'groovy.version'              : '4.0.29',
             'jackson.version'             : '2.19.1',
             'jquery.version'              : '3.7.1',
@@ -81,7 +81,7 @@ ext {
             'rxjava.version'              : '1.3.8',
             'rxjava2.version'             : '2.2.21',
             'rxjava3.version'             : '3.1.11',
-            'selenium.version'            : '4.34.0',
+            'selenium.version'            : '4.38.0',
             'spock.version'               : '2.3-groovy-4.0',
             'sitemesh.version'            : '2.6.0',
             'starter-sitemesh.version'    : '3.2.2',

grails-cache/build.gradle

@@ -18,18 +18,15 @@
  */
 
 plugins {
-    id 'groovy'
-    id 'java-library'
     id 'project-report'
+    id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
 }
 
 version = projectVersion
 group = 'org.apache.grails'
 
-apply plugin: 'org.apache.grails.gradle.grails-plugin'
-
 ext {
     pomTitle = 'Grails Cache Plugin'
     pomDescription = 'Provides AST transformations for caching method calls'

grails-converters/src/main/groovy/org/grails/web/converters/marshaller/json/GenericJavaBeanMarshaller.java

@@ -61,6 +61,7 @@ public void marshalObject(Object o, JSON json) throws ConverterException {
                 if (!shouldInclude(includeExcludeSupport, includes, excludes, o, name)) continue;
 
                 if (readMethod != null && !(name.equals("metaClass")) && !(name.equals("class"))) {
+                    if (Modifier.isStatic(readMethod.getModifiers())) continue;
                     if (readMethod.getAnnotation(PersistenceMethod.class) != null) continue;
                     if (readMethod.getAnnotation(ControllerMethod.class) != null) continue;
                     Object value = readMethod.invoke(o, (Object[]) null);

grails-converters/src/main/groovy/org/grails/web/converters/marshaller/json/GroovyBeanMarshaller.java

@@ -63,6 +63,7 @@ public void marshalObject(Object o, JSON json) throws ConverterException {
                 if (!shouldInclude(includeExcludeSupport, includes, excludes, o, name)) continue;
 
                 if (readMethod != null && !(name.equals("metaClass")) && !(name.equals("class"))) {
+                    if (Modifier.isStatic(readMethod.getModifiers())) continue;
                     if (readMethod.getAnnotation(PersistenceMethod.class) != null) continue;
                     if (readMethod.getAnnotation(ControllerMethod.class) != null) continue;
                     Object value = readMethod.invoke(o, (Object[]) null);

grails-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/GenericJavaBeanMarshaller.java

@@ -45,6 +45,7 @@ public void marshalObject(Object o, XML xml) throws ConverterException {
                 String name = property.getName();
                 Method readMethod = property.getReadMethod();
                 if (readMethod != null) {
+                    if (Modifier.isStatic(readMethod.getModifiers())) continue;
                     Object value = readMethod.invoke(o, (Object[]) null);
                     xml.startNode(name);
                     xml.convertAnother(value);

grails-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/GroovyBeanMarshaller.java

@@ -63,6 +63,7 @@ public void marshalObject(Object o, XML xml) throws ConverterException {
                 if (isEntity && (name.equals(GormProperties.ATTACHED) || name.equals(GormProperties.ERRORS))) continue;
                 Method readMethod = property.getReadMethod();
                 if (readMethod != null && !(name.equals("metaClass")) && !(name.equals("class"))) {
+                    if (Modifier.isStatic(readMethod.getModifiers())) continue;
                     if (readMethod.getAnnotation(PersistenceMethod.class) != null) continue;
                     if (readMethod.getAnnotation(ControllerMethod.class) != null) continue;
                     Object value = readMethod.invoke(o, (Object[]) null);

grails-converters/src/test/groovy/org/grails/web/converters/marshaller/json/StaticPropertySpec.groovy

@@ -0,0 +1,68 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.grails.web.converters.marshaller.json
+
+import spock.lang.Specification
+
+import org.springframework.context.ApplicationContext
+
+import grails.converters.JSON
+import grails.core.DefaultGrailsApplication
+import grails.validation.Constrained
+import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValueMappingContext
+import org.grails.datastore.mapping.model.MappingContext
+import org.grails.web.converters.configuration.ConvertersConfigurationInitializer
+
+class StaticPropertySpec extends Specification {
+    void initJson() {
+        final initializer = new ConvertersConfigurationInitializer()
+        def grailsApplication = new DefaultGrailsApplication(MyGroovyBean)
+        grailsApplication.initialise()
+        def mappingContext = new KeyValueMappingContext("json")
+        grailsApplication.setApplicationContext(Stub(ApplicationContext) {
+            getBean('grailsDomainClassMappingContext', MappingContext) >> {
+                mappingContext
+            }
+        })
+        grailsApplication.setMappingContext(mappingContext)
+        initializer.grailsApplication = grailsApplication
+        initializer.initialize()
+
+    }
+
+    void "static property should be excluded"() {
+        given:
+        initJson()
+
+        when:
+        MyGroovyBean bean = new MyGroovyBean(aProperty: 'testing')
+
+        then:
+        def jsonString = new JSON(bean).toString()
+        jsonString == '{"aProperty":"testing"}'
+    }
+}
+
+class MyGroovyBean {
+    static Map<String, Constrained> getConstraintsMap() {
+        [:]
+    }
+
+    String aProperty
+}

grails-data-hibernate5/dbmigration/build.gradle

@@ -18,7 +18,6 @@
  */
 
 plugins {
-    id 'java-library'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'

grails-data-hibernate5/grails-plugin/build.gradle

@@ -18,7 +18,6 @@
  */
 
 plugins {
-    id 'java-library'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'

grails-data-mongodb/grails-plugin/build.gradle

@@ -18,18 +18,15 @@
  */
 
 plugins {
-    id 'groovy'
-    id 'java-library'
     id 'java-test-fixtures'
+    id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
 }
 
 version = projectVersion
 group = 'org.apache.grails'
 
-apply plugin: 'org.apache.grails.gradle.grails-plugin'
-
 ext {
     gormApiDocs = true
     pomTitle = 'GORM for MongoDB'