Skip to content

Commit 02e4a2d

Browse files
committed
chore(license-fact-providers)!: Do not use "Provider" in the plugin ID
Consistently do not use a "Provider" suffix for plugin IDs (not class names). This is a follow-up to [1]. [1]: #12086 Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.io>
1 parent 0b01b87 commit 02e4a2d

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

model/src/main/kotlin/config/OrtConfiguration.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ data class OrtConfiguration(
8787
*/
8888
val licenseFactProviders: List<ProviderPluginConfiguration> = listOf(
8989
ProviderPluginConfiguration(type = "DefaultCustomLicenseTexts"),
90-
ProviderPluginConfiguration(type = "DefaultLicenseTextCurationProvider"),
90+
ProviderPluginConfiguration(type = "DefaultLicenseTextCuration"),
9191
ProviderPluginConfiguration(type = "SPDX"),
9292
ProviderPluginConfiguration(type = "ScanCode")
9393
),

plugins/license-fact-providers/dir/src/main/kotlin/CustomLicenseTextsProvider.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ data class CustomLicenseTextsProviderConfig(
4444
* must be named after the SPDX-conform license IDs, e.g., 'Apache-2.0' or 'LicenseRef-custom-license'.
4545
*/
4646
@OrtPlugin(
47+
id = "DefaultCustomLicenseTexts",
4748
displayName = "Default Custom License Texts Provider",
4849
summary = "Provide license texts from the default custom license texts directory.",
4950
factory = LicenseFactProviderFactory::class

plugins/license-fact-providers/dir/src/main/kotlin/LicenseTextCurationProvider.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ data class LicenseTextCurationProviderConfig(
5151
* returns id-specific license texts.
5252
*/
5353
@OrtPlugin(
54+
id = "DefaultLicenseTextCuration",
5455
displayName = "Default License Text Curation Provider",
5556
summary = "Provide project- and / or package-specific license texts from the default directory.",
5657
factory = LicenseFactProviderFactory::class
@@ -69,7 +70,7 @@ class DefaultLicenseTextCurationProvider(
6970
* texts.
7071
*/
7172
@OrtPlugin(
72-
id = "LicenseTextCurationProvider",
73+
id = "LicenseTextCuration",
7374
displayName = "License Text Curation Provider",
7475
summary = "Provide project- and / or package-specific license texts from a custom directory.",
7576
factory = LicenseFactProviderFactory::class

0 commit comments

Comments
 (0)