fix: use gradle 'group' property instead of 'groupId' (#116)

eclipse-edc · Mar 28, 2023 · f60d9e3 · f60d9e3
1 parent 2295e8a
commit f60d9e3
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,12 +8,11 @@ plugins {
     alias(libs.plugins.publish) apply false
 }
 
-val groupId: String by project
+val group: String by project
 val annotationProcessorVersion: String by project
 
 allprojects {
-    apply(plugin = "org.eclipse.edc.edc-build")
-    group = groupId
+    apply(plugin = "${group}.edc-build")
 
     configure<org.eclipse.edc.plugins.autodoc.AutodocExtension> {
         processorVersion.set(annotationProcessorVersion)

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,4 @@
-groupId=org.eclipse.edc
+group=org.eclipse.edc
 version=0.0.1-SNAPSHOT
+
 annotationProcessorVersion=0.0.1-SNAPSHOT
diff --git a/plugins/autodoc/autodoc-plugin/build.gradle.kts b/plugins/autodoc/autodoc-plugin/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     implementation(libs.jackson.datatypeJsr310)
 }
 
-val groupId: String by project
+val group: String by project
 
 gradlePlugin {
     website.set("https://projects.eclipse.org/projects/technology.edc")
@@ -22,7 +22,7 @@ gradlePlugin {
             displayName = "autodoc"
             description =
                 "Plugin to generate a documentation manifest for the EDC Metamodel, i.e. extensions, SPIs, etc."
-            id = "${groupId}.autodoc"
+            id = "${group}.autodoc"
             implementationClass = "org.eclipse.edc.plugins.autodoc.AutodocPlugin"
             tags.set(listOf("build", "documentation", "generated", "autodoc"))
         }

diff --git a/plugins/edc-build/README.md b/plugins/edc-build/README.md
@@ -18,5 +18,4 @@ This module contains a Gradle Plugin, that acts as a "meta-plugin" of sorts, bec
   Note that the `edc.publish.repoName=foobar` is important, because it will define actual
   command `publishAllPublicationsToFoobar`
 - performs general configuration, e.g. adding standard dependencies to all projects
-- applies the `groupId`
-- applies all values for the signing config, e.g. developer name, etc.
+- applies all values for the signing config, e.g. developer name, etc.
diff --git a/plugins/edc-build/build.gradle.kts b/plugins/edc-build/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     `java-gradle-plugin`
 }
 
-val groupId: String by project
+val group: String by project
 
 repositories {
     mavenCentral()
@@ -32,15 +32,15 @@ gradlePlugin {
             displayName = "edc-build-base"
             description =
                 "Meta-plugin that provides the capabilities of the EDC build"
-            id = "${groupId}.edc-build-base"
+            id = "${group}.edc-build-base"
             implementationClass = "org.eclipse.edc.plugins.edcbuild.EdcBuildBasePlugin"
             tags.set(listOf("build", "verification", "test"))
         }
         create("edc-build") {
             displayName = "edc-build"
             description =
                 "Plugin that applies the base capabilities and provides default configuration for the EDC build"
-            id = "${groupId}.edc-build"
+            id = "${group}.edc-build"
             implementationClass = "org.eclipse.edc.plugins.edcbuild.EdcBuildPlugin"
             tags.set(listOf("build", "verification", "test"))
         }

diff --git a/plugins/module-names/build.gradle.kts b/plugins/module-names/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     `java-gradle-plugin`
 }
 
-val groupId: String by project
+val group: String by project
 
 gradlePlugin {
     website.set("https://projects.eclipse.org/projects/technology.edc")
@@ -13,7 +13,7 @@ gradlePlugin {
             displayName = "module-names"
             description =
                 "Plugin to verify that a project has no duplicate submodules (by name)"
-            id = "${groupId}.module-names"
+            id = "${group}.module-names"
             implementationClass = "org.eclipse.edc.plugins.modulenames.ModuleNamesPlugin"
             tags.set(listOf("build", "verification"))
             version = version

diff --git a/plugins/openapi-merger/build.gradle.kts b/plugins/openapi-merger/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     `java-gradle-plugin`
 }
 
-val groupId: String by project
+val group: String by project
 
 dependencies {
     // contains the actual merger task
@@ -20,7 +20,7 @@ gradlePlugin {
             displayName = "openapi-merger"
             description =
                 "Plugin to several OpenAPI spec files into one"
-            id = "${groupId}.openapi-merger"
+            id = "${group}.openapi-merger"
             implementationClass = "org.eclipse.edc.plugins.openapimerger.OpenApiMergerPlugin"
             tags.set(listOf("build", "openapi", "merge", "documentation"))
         }

diff --git a/plugins/test-summary/build.gradle.kts b/plugins/test-summary/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     `java-gradle-plugin`
 }
 
-val groupId: String by project
+val group: String by project
 
 gradlePlugin {
     website.set("https://projects.eclipse.org/projects/technology.edc")
@@ -14,7 +14,7 @@ gradlePlugin {
             displayName = "test-summary"
             description =
                 "Plugin to verify that a project has no duplicate submodules (by name)"
-            id = "${groupId}.test-summary"
+            id = "${group}.test-summary"
             implementationClass = "org.eclipse.edc.plugins.testsummary.TestSummaryPlugin"
             tags.set(listOf("build", "verification", "test"))
         }