This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch corrupt-jar-fixes in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 4e642816275f6e486305a88b2215e02fab72aff3 Author: James Daugherty <[email protected]> AuthorDate: Thu May 15 17:30:00 2025 -0400 Remove duplicate files now that AST transforms are properly generating them --- gradle/java-config.gradle | 27 ++++++++--------- .../org/grails/plugins/CodecsGrailsPlugin.groovy | 32 -------------------- .../plugins/codecs/CodecsGrailsPlugin.groovy | 35 +++++++++++----------- .../src/main/resources/META-INF/grails-plugin.xml | 3 -- .../src/main/resources/META-INF/grails-plugin.xml | 3 -- .../src/main/resources/META-INF/grails.factories | 1 - .../src/main/resources/META-INF/grails-plugin.xml | 3 -- .../src/main/resources/META-INF/grails.factories | 1 - grails-gradle/gradle/java-config.gradle | 27 ++++++++--------- .../src/main/resources/META-INF/grails-plugin.xml | 3 -- .../src/main/resources/META-INF/grails-plugin.xml | 3 -- .../src/main/resources/META-INF/grails.factories | 1 - .../src/main/resources/META-INF/grails-plugin.xml | 3 -- .../testing/spock/WebSetupSpecInterceptor.groovy | 28 ++++++++--------- .../src/main/resources/META-INF/grails-plugin.xml | 3 -- .../src/main/resources/META-INF/grails.factories | 1 - 16 files changed, 54 insertions(+), 120 deletions(-) diff --git a/gradle/java-config.gradle b/gradle/java-config.gradle index 96d64fae69..52ba4c4949 100644 --- a/gradle/java-config.gradle +++ b/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 diff --git a/grails-codecs/src/main/groovy/org/grails/plugins/CodecsGrailsPlugin.groovy b/grails-codecs/src/main/groovy/org/grails/plugins/CodecsGrailsPlugin.groovy deleted file mode 100644 index 72ed16cf56..0000000000 --- a/grails-codecs/src/main/groovy/org/grails/plugins/CodecsGrailsPlugin.groovy +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.plugins - -import org.grails.plugins.codecs.DefaultCodecLookup - -/** - * @deprecated Use {@link org.grails.plugins.codecs.CodecsGrailsPlugin} instead - */ -@Deprecated -class CodecsGrailsPlugin extends org.grails.plugins.codecs.CodecsGrailsPlugin { - - Closure doWithSpring() {{-> - codecLookup(DefaultCodecLookup) - }} -} diff --git a/grails-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsGrailsPlugin.groovy b/grails-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsGrailsPlugin.groovy index 8d20e8e892..02186baa7a 100644 --- a/grails-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsGrailsPlugin.groovy +++ b/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) + } + } } \ No newline at end of file diff --git a/grails-codecs/src/main/resources/META-INF/grails-plugin.xml b/grails-codecs/src/main/resources/META-INF/grails-plugin.xml deleted file mode 100644 index dc10929225..0000000000 --- a/grails-codecs/src/main/resources/META-INF/grails-plugin.xml +++ /dev/null @@ -1,3 +0,0 @@ -<plugin name='codecs'> - <type>org.grails.plugins.codecs.CodecsGrailsPlugin</type> -</plugin> \ No newline at end of file diff --git a/grails-controllers/src/main/resources/META-INF/grails-plugin.xml b/grails-controllers/src/main/resources/META-INF/grails-plugin.xml deleted file mode 100644 index d482c7aa80..0000000000 --- a/grails-controllers/src/main/resources/META-INF/grails-plugin.xml +++ /dev/null @@ -1,3 +0,0 @@ -<plugin name='controllers'> - <type>org.grails.plugins.web.controllers.ControllersGrailsPlugin</type> -</plugin> \ No newline at end of file diff --git a/grails-controllers/src/main/resources/META-INF/grails.factories b/grails-controllers/src/main/resources/META-INF/grails.factories deleted file mode 100644 index e570518b6c..0000000000 --- a/grails-controllers/src/main/resources/META-INF/grails.factories +++ /dev/null @@ -1 +0,0 @@ -grails.compiler.traits.TraitInjector=grails.compiler.traits.ControllerTraitInjector diff --git a/grails-domain-class/src/main/resources/META-INF/grails-plugin.xml b/grails-domain-class/src/main/resources/META-INF/grails-plugin.xml deleted file mode 100644 index 4e90e27e85..0000000000 --- a/grails-domain-class/src/main/resources/META-INF/grails-plugin.xml +++ /dev/null @@ -1,3 +0,0 @@ -<plugin name='domainClass'> - <type>org.grails.plugins.domain.DomainClassGrailsPlugin</type> -</plugin> \ No newline at end of file diff --git a/grails-domain-class/src/main/resources/META-INF/grails.factories b/grails-domain-class/src/main/resources/META-INF/grails.factories deleted file mode 100644 index f2c568a97e..0000000000 --- a/grails-domain-class/src/main/resources/META-INF/grails.factories +++ /dev/null @@ -1 +0,0 @@ -grails.compiler.traits.TraitInjector=grails.compiler.traits.DomainClassTraitInjector diff --git a/grails-gradle/gradle/java-config.gradle b/grails-gradle/gradle/java-config.gradle index bc521df6d0..ecf4e01e51 100644 --- a/grails-gradle/gradle/java-config.gradle +++ b/grails-gradle/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() @@ -57,7 +55,6 @@ tasks.withType(Jar).configureEach { 'Implementation-Version': projectVersion, 'Implementation-Vendor': 'grails.org' ) - duplicatesStrategy = DuplicatesStrategy.INCLUDE } // Any jar, zip, or archive should be reproducible diff --git a/grails-i18n/src/main/resources/META-INF/grails-plugin.xml b/grails-i18n/src/main/resources/META-INF/grails-plugin.xml deleted file mode 100644 index 23cfc1be62..0000000000 --- a/grails-i18n/src/main/resources/META-INF/grails-plugin.xml +++ /dev/null @@ -1,3 +0,0 @@ -<plugin name='i18n'> - <type>org.grails.plugins.i18n.I18nGrailsPlugin</type> -</plugin> \ No newline at end of file diff --git a/grails-rest-transforms/src/main/resources/META-INF/grails-plugin.xml b/grails-rest-transforms/src/main/resources/META-INF/grails-plugin.xml deleted file mode 100644 index b624e1207f..0000000000 --- a/grails-rest-transforms/src/main/resources/META-INF/grails-plugin.xml +++ /dev/null @@ -1,3 +0,0 @@ -<plugin name='restResponder'> - <type>org.grails.plugins.web.rest.plugin.RestResponderGrailsPlugin</type> -</plugin> \ No newline at end of file diff --git a/grails-rest-transforms/src/main/resources/META-INF/grails.factories b/grails-rest-transforms/src/main/resources/META-INF/grails.factories deleted file mode 100644 index 6a5af32b8e..0000000000 --- a/grails-rest-transforms/src/main/resources/META-INF/grails.factories +++ /dev/null @@ -1 +0,0 @@ -grails.compiler.traits.TraitInjector=grails.compiler.traits.RestResponderTraitInjector diff --git a/grails-services/src/main/resources/META-INF/grails-plugin.xml b/grails-services/src/main/resources/META-INF/grails-plugin.xml deleted file mode 100644 index dcbf53863b..0000000000 --- a/grails-services/src/main/resources/META-INF/grails-plugin.xml +++ /dev/null @@ -1,3 +0,0 @@ -<plugin name='services'> - <type>org.grails.plugins.services.ServicesGrailsPlugin</type> -</plugin> \ No newline at end of file diff --git a/grails-testing-support-web/src/main/groovy/org/grails/testing/spock/WebSetupSpecInterceptor.groovy b/grails-testing-support-web/src/main/groovy/org/grails/testing/spock/WebSetupSpecInterceptor.groovy index ec55aeaa77..19f996b48f 100644 --- a/grails-testing-support-web/src/main/groovy/org/grails/testing/spock/WebSetupSpecInterceptor.groovy +++ b/grails-testing-support-web/src/main/groovy/org/grails/testing/spock/WebSetupSpecInterceptor.groovy @@ -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. */ package org.grails.testing.spock @@ -33,7 +31,7 @@ import org.grails.datastore.gorm.validation.constraints.registry.DefaultConstrai import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValueMappingContext import org.grails.gsp.GroovyPagesTemplateEngine import org.grails.gsp.jsp.TagLibraryResolverImpl -import org.grails.plugins.CodecsGrailsPlugin +import org.grails.plugins.codecs.CodecsGrailsPlugin import org.grails.plugins.codecs.DefaultCodecLookup import org.grails.plugins.converters.ConvertersGrailsPlugin import org.grails.plugins.web.rest.render.DefaultRendererRegistry diff --git a/grails-url-mappings/src/main/resources/META-INF/grails-plugin.xml b/grails-url-mappings/src/main/resources/META-INF/grails-plugin.xml deleted file mode 100644 index c592ade31d..0000000000 --- a/grails-url-mappings/src/main/resources/META-INF/grails-plugin.xml +++ /dev/null @@ -1,3 +0,0 @@ -<plugin name='urlMappings'> - <type>org.grails.plugins.web.mapping.UrlMappingsGrailsPlugin</type> -</plugin> \ No newline at end of file diff --git a/grails-web-databinding/src/main/resources/META-INF/grails.factories b/grails-web-databinding/src/main/resources/META-INF/grails.factories deleted file mode 100644 index 69fbad2cfc..0000000000 --- a/grails-web-databinding/src/main/resources/META-INF/grails.factories +++ /dev/null @@ -1 +0,0 @@ -grails.compiler.traits.TraitInjector=grails.compiler.traits.WebDataBindingTraitInjector \ No newline at end of file
