From cc22c45b2c369b52c682356aea601dfc8c60243a Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Sun, 3 Nov 2024 19:18:53 +0100 Subject: [PATCH] Revert "Remove `-plain` suffix from plugin artifacts (#525)" This reverts commit e2f68f847a508b45e6b220cd186a2731174701f7. --- gradle/grails-plugin-config.gradle | 7 ------- grails-plugin-gsp/build.gradle | 8 +++++--- grails-plugin-sitemesh2/build.gradle | 7 +++++-- 3 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 gradle/grails-plugin-config.gradle diff --git a/gradle/grails-plugin-config.gradle b/gradle/grails-plugin-config.gradle deleted file mode 100644 index da07410b72..0000000000 --- a/gradle/grails-plugin-config.gradle +++ /dev/null @@ -1,7 +0,0 @@ -tasks.named('bootJar') { - enabled = false // Plugins should not create a bootJar -} -tasks.named('jar', Jar) { - enabled = true // Enable the jar task again, as the bootJar task has been disabled - archiveClassifier = '' // Remove '-plain' suffix from jar file name -} \ No newline at end of file diff --git a/grails-plugin-gsp/build.gradle b/grails-plugin-gsp/build.gradle index 4a2c973b83..89e134da45 100644 --- a/grails-plugin-gsp/build.gradle +++ b/grails-plugin-gsp/build.gradle @@ -41,7 +41,11 @@ dependencies { testRuntimeOnly "org.grails:grails-plugin-url-mappings:$grailsVersion" } - +// disable main class +bootJar { + mainClass.set('dummy.Application') +} +findMainClass.onlyIf { false } test { if (isCiBuild) { maxParallelForks = 1 @@ -58,5 +62,3 @@ test { System.out.flush() } } - -apply from: rootProject.layout.projectDirectory.file('gradle/grails-plugin-config.gradle') diff --git a/grails-plugin-sitemesh2/build.gradle b/grails-plugin-sitemesh2/build.gradle index e984a1ecf9..c1862710cf 100644 --- a/grails-plugin-sitemesh2/build.gradle +++ b/grails-plugin-sitemesh2/build.gradle @@ -23,5 +23,8 @@ dependencies { exclude group:'org.grails', module:'grails-web-common' } } - -apply from: rootProject.layout.projectDirectory.file('gradle/grails-plugin-config.gradle') \ No newline at end of file +// disable main class +bootJar { + mainClass.set('dummy.Application') +} +findMainClass.onlyIf { false } \ No newline at end of file