diff --git a/build.gradle.kts b/build.gradle.kts index 045e143..189add1 100644 --- 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 { processorVersion.set(annotationProcessorVersion) diff --git a/gradle.properties b/gradle.properties index 017cfaa..74daaf4 100644 --- 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 index 7aec6b7..9dd9b96 100644 --- 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 index 3994668..0aa1f8e 100644 --- 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. \ No newline at end of file +- 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 index 8d6fdfa..6aad8c1 100644 --- 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,7 +32,7 @@ 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")) } @@ -40,7 +40,7 @@ gradlePlugin { 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 index f373dc9..67d7a9f 100644 --- 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 index aa1e4d1..fe95e8d 100644 --- 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 index 93c5cd4..b301294 100644 --- 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")) }