Skip to content

Commit 4c256e8

Browse files
committed
chore(sw360)!: Remove the curation provider plugin
This still uses the "legacy" SW360 client, generally seems to be unused, and hinders the planned Jackson 2 to 3 migration. Users depending on the plugin can easily host it separately without the need to fork ORT. Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent c283e95 commit 4c256e8

File tree

5 files changed

+1
-246
lines changed

5 files changed

+1
-246
lines changed

model/src/main/resources/reference.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,6 @@ ort:
8383
options:
8484
serverUrl: 'https://api.clearlydefined.io'
8585
minTotalLicenseScore: 80
86-
- type: SW360
87-
options:
88-
restUrl: 'https://your-sw360-rest-url'
89-
authUrl: 'https://your-authentication-url'
90-
secrets:
91-
username: username
92-
password: password
93-
clientId: clientId
94-
clientPassword: clientPassword
95-
token: token
9686

9787
severeIssueThreshold: ERROR
9888
severeRuleViolationThreshold: ERROR

model/src/test/kotlin/config/OrtConfigurationTest.kt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,6 @@ class OrtConfigurationTest : WordSpec({
9090
ProviderPluginConfiguration(
9191
type = "ClearlyDefined",
9292
options = mapOf("serverUrl" to "https://api.clearlydefined.io", "minTotalLicenseScore" to "80")
93-
),
94-
ProviderPluginConfiguration(
95-
type = "SW360",
96-
options = mapOf(
97-
"restUrl" to "https://your-sw360-rest-url",
98-
"authUrl" to "https://your-authentication-url"
99-
),
100-
secrets = mapOf(
101-
"username" to "username",
102-
"password" to "password",
103-
"clientId" to "clientId",
104-
"clientPassword" to "clientPassword",
105-
"token" to "token"
106-
)
10793
)
10894
)
10995

plugins/package-curation-providers/sw360/build.gradle.kts

Lines changed: 0 additions & 36 deletions
This file was deleted.

plugins/package-curation-providers/sw360/src/main/kotlin/Sw360PackageCurationProvider.kt

Lines changed: 0 additions & 185 deletions
This file was deleted.

website/docs/configuration/package-curations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ cli/build/install/ort/bin/ort analyze
105105

106106
Alternatively to a single file, curations may also be split across multiple files below a directory, by default `$ORT_CONFIG_DIR/curations`.
107107
File and directory package curation providers may also be configured as [FilePackageCurationProviders](https://github.com/oss-review-toolkit/ort/blob/main/plugins/package-curation-providers/file/src/main/kotlin/FilePackageCurationProvider.kt) in `$ORT_CONFIG_DIR/config.yml`.
108-
Similarly, ORT can use [ClearlyDefined](https://clearlydefined.io/) and [SW360](https://www.eclipse.org/sw360/) as sources for curated metadata.
108+
Similarly, ORT can use [ClearlyDefined](https://clearlydefined.io/) as a source for curated metadata.
109109
See the [reference configuration file](https://github.com/oss-review-toolkit/ort/blob/main/model/src/main/resources/reference.yml) for examples.
110110

111111
To override curations, e.g. for testing them locally, you can also pass a `curations.yml` file or a curations directory via the `--package-curations-file` / `--package-curations-dir` options of the *evaluator*:

0 commit comments

Comments
 (0)