From f36eb27c1dc91e62ece44bebc9d36003a17f8415 Mon Sep 17 00:00:00 2001
From: Uwe Kubosch <uwe@datek.no>
Date: Tue, 16 May 2023 10:13:03 +0200
Subject: [PATCH] Correct plugin id for com.github.jruby-gradle.war Rename
 gradle project for the base plugin to jruby-gradle-base-plugin

---
 gradle.properties       | 4 +---
 jar-plugin/build.gradle | 4 ++--
 settings.gradle         | 2 +-
 war-plugin/build.gradle | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 4312d7b..0eb590f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,12 @@
 version=2.1.0-beta.0
 group=com.github.jruby-gradle
-copyrightYear=2014-2020
+copyrightYear=2014-2023
 
 org.gradle.daemon=true
 org.gradle.caching=true
 org.gradle.parallel=false
 org.gradle.configureondemand=false
 
-bintrayUser=
-bintrayKey=
 releaseBuild=false
 
 targetCompatibility=1.8
diff --git a/jar-plugin/build.gradle b/jar-plugin/build.gradle
index 7d8b154..17add64 100644
--- a/jar-plugin/build.gradle
+++ b/jar-plugin/build.gradle
@@ -11,12 +11,12 @@ configurations {
 }
 
 generateTestConfig {
-    testProperties mavenrepo: new File(project(':jruby-gradle-plugin').projectDir,'src/integTest/mavenrepo').absolutePath,
+    testProperties mavenrepo: new File(project(':jruby-gradle-base-plugin').projectDir,'src/integTest/mavenrepo').absolutePath,
             flatrepo: testRepoDir.absolutePath
 }
 
 dependencies {
-    compile project(':jruby-gradle-plugin')
+    compile project(':jruby-gradle-base-plugin')
     /*
      * NOTE: version 5.0.0 of the shadow plugin supports only Gradle 5.x and later
      */
diff --git a/settings.gradle b/settings.gradle
index 0edba7c..e9d3042 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 ['base','war','jar', 'core'].each { mod ->
-    def fName = "jruby-gradle${(mod == 'base') ? '' : ('-' + mod)}-plugin"
+    def fName = "jruby-gradle-${mod}-plugin"
 
     include fName
     project(":${fName}").projectDir = file("${mod}-plugin")
diff --git a/war-plugin/build.gradle b/war-plugin/build.gradle
index 15a9887..501193b 100644
--- a/war-plugin/build.gradle
+++ b/war-plugin/build.gradle
@@ -2,7 +2,7 @@ description = 'This plugin encapsulates web archive building functionality for J
 
 
 dependencies {
-    compile project(':jruby-gradle-plugin')
+    compile project(':jruby-gradle-base-plugin')
     compile group: 'com.github.jruby-gradle', name: 'warbler-bootstrap', version: '0.2.0+'
 
     testCompile(spockVersion) {
@@ -17,7 +17,7 @@ artifacts {
 pluginBundle {
     plugins {
         gradlePlugin {
-            id = 'com.github.jruby-gradle.jar'
+            id = 'com.github.jruby-gradle.war'
             displayName = 'JRuby/Gradle base plugin'
             description = 'This plugin encapsulates building deployable WARs using JRuby'
             tags = (['jruby', 'war'])