Skip to content

Commit f60d9e3

Browse files
authored
fix: use gradle 'group' property instead of 'groupId' (#116)
1 parent 2295e8a commit f60d9e3

File tree

8 files changed

+16
-17
lines changed

8 files changed

+16
-17
lines changed

build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ plugins {
88
alias(libs.plugins.publish) apply false
99
}
1010

11-
val groupId: String by project
11+
val group: String by project
1212
val annotationProcessorVersion: String by project
1313

1414
allprojects {
15-
apply(plugin = "org.eclipse.edc.edc-build")
16-
group = groupId
15+
apply(plugin = "${group}.edc-build")
1716

1817
configure<org.eclipse.edc.plugins.autodoc.AutodocExtension> {
1918
processorVersion.set(annotationProcessorVersion)

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
groupId=org.eclipse.edc
1+
group=org.eclipse.edc
22
version=0.0.1-SNAPSHOT
3+
34
annotationProcessorVersion=0.0.1-SNAPSHOT

plugins/autodoc/autodoc-plugin/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
implementation(libs.jackson.datatypeJsr310)
1111
}
1212

13-
val groupId: String by project
13+
val group: String by project
1414

1515
gradlePlugin {
1616
website.set("https://projects.eclipse.org/projects/technology.edc")
@@ -22,7 +22,7 @@ gradlePlugin {
2222
displayName = "autodoc"
2323
description =
2424
"Plugin to generate a documentation manifest for the EDC Metamodel, i.e. extensions, SPIs, etc."
25-
id = "${groupId}.autodoc"
25+
id = "${group}.autodoc"
2626
implementationClass = "org.eclipse.edc.plugins.autodoc.AutodocPlugin"
2727
tags.set(listOf("build", "documentation", "generated", "autodoc"))
2828
}

plugins/edc-build/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@ This module contains a Gradle Plugin, that acts as a "meta-plugin" of sorts, bec
1818
Note that the `edc.publish.repoName=foobar` is important, because it will define actual
1919
command `publishAllPublicationsToFoobar`
2020
- performs general configuration, e.g. adding standard dependencies to all projects
21-
- applies the `groupId`
22-
- applies all values for the signing config, e.g. developer name, etc.
21+
- applies all values for the signing config, e.g. developer name, etc.

plugins/edc-build/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
`java-gradle-plugin`
33
}
44

5-
val groupId: String by project
5+
val group: String by project
66

77
repositories {
88
mavenCentral()
@@ -32,15 +32,15 @@ gradlePlugin {
3232
displayName = "edc-build-base"
3333
description =
3434
"Meta-plugin that provides the capabilities of the EDC build"
35-
id = "${groupId}.edc-build-base"
35+
id = "${group}.edc-build-base"
3636
implementationClass = "org.eclipse.edc.plugins.edcbuild.EdcBuildBasePlugin"
3737
tags.set(listOf("build", "verification", "test"))
3838
}
3939
create("edc-build") {
4040
displayName = "edc-build"
4141
description =
4242
"Plugin that applies the base capabilities and provides default configuration for the EDC build"
43-
id = "${groupId}.edc-build"
43+
id = "${group}.edc-build"
4444
implementationClass = "org.eclipse.edc.plugins.edcbuild.EdcBuildPlugin"
4545
tags.set(listOf("build", "verification", "test"))
4646
}

plugins/module-names/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
`java-gradle-plugin`
33
}
44

5-
val groupId: String by project
5+
val group: String by project
66

77
gradlePlugin {
88
website.set("https://projects.eclipse.org/projects/technology.edc")
@@ -13,7 +13,7 @@ gradlePlugin {
1313
displayName = "module-names"
1414
description =
1515
"Plugin to verify that a project has no duplicate submodules (by name)"
16-
id = "${groupId}.module-names"
16+
id = "${group}.module-names"
1717
implementationClass = "org.eclipse.edc.plugins.modulenames.ModuleNamesPlugin"
1818
tags.set(listOf("build", "verification"))
1919
version = version

plugins/openapi-merger/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
`java-gradle-plugin`
33
}
44

5-
val groupId: String by project
5+
val group: String by project
66

77
dependencies {
88
// contains the actual merger task
@@ -20,7 +20,7 @@ gradlePlugin {
2020
displayName = "openapi-merger"
2121
description =
2222
"Plugin to several OpenAPI spec files into one"
23-
id = "${groupId}.openapi-merger"
23+
id = "${group}.openapi-merger"
2424
implementationClass = "org.eclipse.edc.plugins.openapimerger.OpenApiMergerPlugin"
2525
tags.set(listOf("build", "openapi", "merge", "documentation"))
2626
}

plugins/test-summary/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
`java-gradle-plugin`
33
}
44

5-
val groupId: String by project
5+
val group: String by project
66

77
gradlePlugin {
88
website.set("https://projects.eclipse.org/projects/technology.edc")
@@ -14,7 +14,7 @@ gradlePlugin {
1414
displayName = "test-summary"
1515
description =
1616
"Plugin to verify that a project has no duplicate submodules (by name)"
17-
id = "${groupId}.test-summary"
17+
id = "${group}.test-summary"
1818
implementationClass = "org.eclipse.edc.plugins.testsummary.TestSummaryPlugin"
1919
tags.set(listOf("build", "verification", "test"))
2020
}

0 commit comments

Comments
 (0)