#14729 - Corrupt Jar & War Files

UPGRADE7.md

@@ -17,32 +17,12 @@ limitations under the License.
 # Common 7.0 Upgrade Gotchas - DRAFT -
 
 Experienced while upgrading modules for Grails 7
-- the following deprecated classes were removed, please use the suggested replacement
-  * grails.core.GrailsTagLibClass -> grails.core.gsp.GrailsTagLibClass
-  * org.grails.core.artefact.TagLibArtefactHandler -> org.grails.core.artefact.gsp.TagLibArtefactHandler
-  * org.grails.core.DefaultGrailsTagLibClass -> org.grails.core.gsp.DefaultGrailsTagLibClass 
-- h2 2.x is stricter about reserved words
-  - https://github.com/apache/gorm-hibernate5/pull/910/commits/c8de45df204966ccc228b46b94beeb2142ae0f59 
-- [GROOVY-10621](https://issues.apache.org/jira/browse/GROOVY-10621) 
-  - Primitive booleans will no longer generate the form of isProperty & getProperty.  They will only generate isProperty()
+
+- NOTE: Several items have been directly integrated into the upgrade guide. Please refer there for the full list.
 - The amount of boilerplate required in gradle files has been reduced:  
   - When `org.grails.grails-plugin` gradle plugin is applied, the bootJar task is disabled by default.  No more needing to explicitly set it to false!
   - We no longer have a `micronaut-bom` and a `spring-bom`.  We only have the `spring-bom` now, which allows `grails-bom` to inherit from it and be applied as part of the Spring Dependency Management plugin.  This means versions do not need included for any library in the bom.  Override bom versions via gradle properties.
   - The `grailsPublish` plugin returns and is no longer an internal only plugin.  It has been enhanced to work with some multi-project workflows.  Eliminate publishing boilerplate of the nexus-publish, maven-publish, & signing plugin by adopting it.
-- Jar artifacts produced by Grails Plugins will no longer have the suffix `-plain`
-  - https://github.com/apache/grails-gradle-plugin/pull/347
-- [GROOVY-5169](https://issues.apache.org/jira/browse/GROOVY-5169)  [GROOVY-10449](https://issues.apache.org/jira/browse/GROOVY-10449)
-  - Fields with a public modifier were not returned with MetaClassImpl#getProperties() in groovy 3, but are now.
-- Some older libraries may include an older version of groovy, but still be compatible with Groovy 4.  One example is `GPars`.  In your gradle file, you can force a dependency upgrade via this code:
-
-        configurations.configureEach {
-            resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-                if (details.requested.group == 'org.codehaus.groovy') {
-                    details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: '4.0.25')
-                }
-            }
-        }
-- The `jakarta` package switch means that older libraries using `javax` will need to be updated to use the correct namespace.  The side effect of this change is most grails plugins will likely need updated to be compatible with Grails 7.
 - When migrating a new project to Grails 7, it's advised to generate a stock 7.0 app from [start.grails.org](https://start.grails.org) and compare the project with a grails app generated from the same grails version that your application uses.  This helps catch the dependency clean up that has occurred.  Including the additions of new dependencies.  Note: due to an issue with project resolution the `grails-bom` will need explicitly imported in buildSrc or any project that does not apply the grails gradle plugins (grails-plugin, grails-web, or grails-gsp).  By default, the grails gradle plugins (grails-plugin, grails-web, grails-gsp) will apply the bom automatically.
 - the gradle property `groovyVersion` is being replaced with the upstream spring property name `groovy.version`.  Please update your projects accordingly.
 - hibernate-ehcache
@@ -66,20 +46,8 @@ Experienced while upgrading modules for Grails 7
 
 ## NOTE: This document is a draft and the explanations are only highlights and will be expanded further prior to release of 7.0.
 
-## New Features 
-- [grails-gsp #551](https://github.com/apache/grails-gsp/issues/551) adopts a `formActionSubmit` tag to replace `actionSubmit`.  Dispatching actions via a parameter name on a form submit will be removed in a future version of grails.
-
 ### Cool New Features
-- You can now @Scaffold Controllers and Services and virtually eliminate any boiler plate code.
 - Hello Exterminator, Good by bugs! Lot's of things started working... and working well! For instance, use of controller namespaces now work seemlessly.
-- Bootstrap 5.3.3 support. Saffolding and Fields tags now optionally support boostrap classes.
-- Priortization of AutoConfiguration over bean overriding.
-- Lightweight, Removal of numerous dependencies.
-- grails-bom overhaul for keeping depedencies up to date and in sync.
-- g:form now automatically provides csrf protection when Spring Security CSRF is enabled.
 - Massive decoupling of dependencies and cleanup between modules.  SiteMesh dependencies are no longer compiled into controllers fused between numerous modules. SiteMesh isn't even required to use Grails!
-- SiteMesh ahs been upgrade to SiteMesh 3!
-- Completely up to date modern stack that has been optimized for easier future transitions.
 - GSP can now be used OUTSIDE of Grails! see grails-boot
 - Works with Spring Security 6 out of the box. No plugin needed!
-- Tested and works with Java 17-23 [grails-core](https://github.com/apache/grails-core/blob/7.0.x/.github/workflows/gradle.yml#L18)

build.gradle

@@ -46,6 +46,12 @@ ext {
 
 allprojects {
     repositories {
+        // workaround for https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/164
+        maven {
+            name = 'localGrailsBom'
+            url = file("$rootDir/grails-bom/build/repo")
+            content { includeModule 'org.apache.grails', 'grails-bom' }
+        }
         maven { url = 'https://repo.grails.org/grails/restricted' }
         // mavenLocal() // Keep, this will be uncommented and used by CI (groovy-joint-workflow)
         maven { url = 'https://repository.apache.org/content/groups/snapshots' }

gradle/java-config.gradle

@@ -1,20 +1,18 @@
 /*
- *  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
+ *  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
+ *      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.
+ *  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.
  */
 
 compileJava.options.release = javaVersion.toInteger()
@@ -49,7 +47,6 @@ tasks.withType(Jar).configureEach {
             'Implementation-Version': grailsVersion,
             'Implementation-Vendor': 'grails.org'
     )
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
 
 // Any jar, zip, or archive should be reproducible

grails-bom/build.gradle

@@ -1,20 +1,18 @@
 /*
- *  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
+ *  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
+ *      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.
+ *  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.
  */
 
 import org.apache.grails.gradle.tasks.bom.ExtractDependenciesTask
@@ -161,4 +159,22 @@ ext {
 
 apply {
     from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
+}
+
+// Workaround for https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/164
+pluginManager.withPlugin('maven-publish') {
+    publishing {
+        repositories {
+            maven {
+                name = 'localBom'
+                url = layout.buildDirectory.dir('repo')
+            }
+        }
+    }
+
+//    project.afterEvaluate {
+//        tasks.named('assemble').configure {
+//            dependsOn tasks.named('publishMavenPublicationToLocalBomRepository')
+//        }
+//    }
 }

grails-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsGrailsPlugin.groovy

@@ -1,33 +1,27 @@
 /*
- *  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
+ *  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
+ *      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.
+ *  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.plugins.codecs
 
 import grails.plugins.Plugin
 import grails.util.GrailsUtil
-import org.grails.plugins.codecs.DefaultCodecLookup
-import org.grails.commons.CodecArtefactHandler
 import org.grails.encoder.impl.HTML4Codec
-import org.grails.plugins.codecs.HTMLCodec
 import org.grails.encoder.impl.HTMLJSCodec
 import org.grails.encoder.impl.JavaScriptCodec
 import org.grails.encoder.impl.RawCodec
-import org.grails.plugins.codecs.URLCodec
 
 /**
  * Configures pluggable codecs.
@@ -48,4 +42,9 @@ class CodecsGrailsPlugin extends Plugin {
             RawCodec
     ]
 
+    Closure doWithSpring() {
+        { ->
+            codecLookup(DefaultCodecLookup)
+        }
+    }
 }

grails-core/src/main/groovy/grails/plugins/GrailsPlugin.java

@@ -1,39 +1,36 @@
 /*
- *  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
+ *  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
+ *      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.
+ *  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 grails.plugins;
 
+import grails.core.GrailsApplication;
 import grails.util.Environment;
 import groovy.lang.GroovyObject;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import grails.core.GrailsApplication;
-import org.grails.spring.RuntimeSpringConfiguration;
 import org.grails.plugins.support.WatchPattern;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.type.filter.TypeFilter;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>Plugin interface that adds Spring {@link org.springframework.beans.factory.config.BeanDefinition}s
  * to a registry based on a {@link GrailsApplication} object. After all <code>GrailsPlugin</code> classes
@@ -214,14 +211,6 @@ public interface GrailsPlugin extends ApplicationContextAware, Comparable, Grail
      */
     boolean supportsCurrentScopeAndEnvironment();
 
-    /**
-     * Write some documentation to the DocumentationContext
-     * @deprecated Dynamic document generation no longer supported
-     * @param text
-     */
-    @Deprecated
-    void doc(String text);
-
     /**
      * Returns the path of the plug-in
      *