Skip to content

Commit 24e87cd

Browse files
sschuberthsschuberth
committed
fix(analyzer)!: Suffix project types with "Project"
In relation to #9417, this avoids duplicate project vs. package IDs by adding a "Project" suffix to the `type` of project IDs. This change breaks existing package configurations that refer to project IDs. The fix it to simply add the "Project" suffix to the type as part of the project ID in the package configurations as well. Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent bf9de57 commit 24e87cd

File tree

150 files changed

+2078
-1387
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+2078
-1387
lines changed

Diff for: ‎cli/src/funTest/kotlin/OrtMainFunTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class OrtMainFunTest : StringSpec() {
161161

162162
ortResult.analyzer shouldNotBeNull {
163163
result.projects should haveSize(1)
164-
result.projects.single().id.type shouldBe "Unmanaged"
164+
result.projects.single().id.type shouldBe "UnmanagedProject"
165165
}
166166
}
167167

Diff for: ‎plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-7.2-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-7.2/MODULE.bazel:"
3+
id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-7.2/MODULE.bazel:"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-archive-override.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-archive-override/MODULE.bazel:"
3+
id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-archive-override/MODULE.bazel:"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-git-repository.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-git-repository/MODULE.bazel:"
3+
id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-git-repository/MODULE.bazel:"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-path-override.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-path-override/MODULE.bazel:"
3+
id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-path-override/MODULE.bazel:"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry-with-local-path.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-registry-with-local-path/MODULE.bazel:"
3+
id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-registry-with-local-path/MODULE.bazel:"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-registry/MODULE.bazel:"
3+
id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-registry/MODULE.bazel:"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ analyzer:
2828
skip_excluded: false
2929
result:
3030
projects:
31-
- id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-registry2/MODULE.bazel:"
31+
- id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-registry2/MODULE.bazel:"
3232
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
3333
declared_licenses: []
3434
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-no-lock-file.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-no-lock-file/MODULE.bazel:"
3+
id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-no-lock-file/MODULE.bazel:"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel/MODULE.bazel:"
3+
id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel/MODULE.bazel:"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/bazel/src/main/kotlin/Bazel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class Bazel(
107107
analysisRoot: File,
108108
analyzerConfig: AnalyzerConfiguration,
109109
repoConfig: RepositoryConfiguration
110-
) : PackageManager(name, "Bazel", analysisRoot, analyzerConfig, repoConfig) {
110+
) : PackageManager(name, "BazelProject", analysisRoot, analyzerConfig, repoConfig) {
111111
class Factory : AbstractPackageManagerFactory<Bazel>("Bazel") {
112112
override val globsForDefinitionFiles = listOf("MODULE", "MODULE.bazel")
113113

Diff for: ‎plugins/package-managers/bower/src/funTest/assets/projects/synthetic/bower-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Bower::a-test-project:"
3+
id: "BowerProject::a-test-project:"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
authors:
66
- "author-abc"

Diff for: ‎plugins/package-managers/bower/src/main/kotlin/Bower.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class Bower(
5050
analysisRoot: File,
5151
analyzerConfig: AnalyzerConfiguration,
5252
repoConfig: RepositoryConfiguration
53-
) : PackageManager(name, "Bower", analysisRoot, analyzerConfig, repoConfig) {
53+
) : PackageManager(name, "BowerProject", analysisRoot, analyzerConfig, repoConfig) {
5454
class Factory : AbstractPackageManagerFactory<Bower>("Bower") {
5555
override val globsForDefinitionFiles = listOf("bower.json")
5656

Diff for: ‎plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/bundler-expected-output-gemspec.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Bundler::test-project:1.0.0"
3+
id: "BundlerProject::test-project:1.0.0"
44
definition_file_path: "plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/gemspec/Gemfile"
55
authors:
66
- "Bob Example"

Diff for: ‎plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/bundler-expected-output-lockfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Bundler::src/funTest/assets/projects/synthetic/lockfile/Gemfile:"
3+
id: "BundlerProject::src/funTest/assets/projects/synthetic/lockfile/Gemfile:"
44
definition_file_path: "plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/lockfile/Gemfile"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/bundler/src/main/kotlin/Bundler.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class Bundler(
134134
analysisRoot: File,
135135
analyzerConfig: AnalyzerConfiguration,
136136
repoConfig: RepositoryConfiguration
137-
) : PackageManager(name, "Bundler", analysisRoot, analyzerConfig, repoConfig) {
137+
) : PackageManager(name, "BundlerProject", analysisRoot, analyzerConfig, repoConfig) {
138138
companion object {
139139
/**
140140
* The name of the option to specify the Bundler version.

Diff for: ‎plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Cargo::lib:0.1.0"
3+
id: "CargoProject::lib:0.1.0"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
authors:
66
- "Another Author"

Diff for: ‎plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-client-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Cargo::client:0.1.0"
3+
id: "CargoProject::client:0.1.0"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
authors:
66
- "anon"

Diff for: ‎plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-integration-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Cargo::integration:0.1.0"
3+
id: "CargoProject::integration:0.1.0"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
authors:
66
- "anon"

Diff for: ‎plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-lib-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Cargo::lib:0.1.0"
3+
id: "CargoProject::lib:0.1.0"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses:
66
- "Apache-2.0"

Diff for: ‎plugins/package-managers/cargo/src/main/kotlin/Cargo.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class Cargo(
7272
analysisRoot: File,
7373
analyzerConfig: AnalyzerConfiguration,
7474
repoConfig: RepositoryConfiguration
75-
) : PackageManager(name, "Cargo", analysisRoot, analyzerConfig, repoConfig) {
75+
) : PackageManager(name, "CargoProject", analysisRoot, analyzerConfig, repoConfig) {
7676
class Factory : AbstractPackageManagerFactory<Cargo>("Cargo") {
7777
override val globsForDefinitionFiles = listOf("Cargo.toml")
7878

Diff for: ‎plugins/package-managers/carthage/src/funTest/assets/projects/synthetic/carthage-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Carthage:<REPLACE_GITHUB_ORGANIZATION>:ort:<REPLACE_REVISION>"
3+
id: "CarthageProject:<REPLACE_GITHUB_ORGANIZATION>:ort:<REPLACE_REVISION>"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/carthage/src/main/kotlin/Carthage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class Carthage(
5151
analysisRoot: File,
5252
analyzerConfig: AnalyzerConfiguration,
5353
repoConfig: RepositoryConfiguration
54-
) : PackageManager(name, "Carthage", analysisRoot, analyzerConfig, repoConfig) {
54+
) : PackageManager(name, "CarthageProject", analysisRoot, analyzerConfig, repoConfig) {
5555
class Factory : AbstractPackageManagerFactory<Carthage>("Carthage") {
5656
// TODO: Add support for the Cartfile.
5757
// This would require to resolve the actual dependency versions as a Cartfile supports dynamic versions.

Diff for: ‎plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/dep-tree-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "CocoaPods::src/funTest/assets/projects/synthetic/dep-tree/Podfile:"
3+
id: "CocoaPodsProject::src/funTest/assets/projects/synthetic/dep-tree/Podfile:"
44
definition_file_path: "plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/dep-tree/Podfile"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/external-sources-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "CocoaPods::src/funTest/assets/projects/synthetic/external-sources/Podfile:"
3+
id: "CocoaPodsProject::src/funTest/assets/projects/synthetic/external-sources/Podfile:"
44
definition_file_path: "plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/external-sources/Podfile"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/no-lockfile-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "CocoaPods::src/funTest/assets/projects/synthetic/no-lockfile/Podfile:"
3+
id: "CocoaPodsProject::src/funTest/assets/projects/synthetic/no-lockfile/Podfile:"
44
definition_file_path: "plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/no-lockfile/Podfile"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/regular-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "CocoaPods::src/funTest/assets/projects/synthetic/regular/Podfile:"
3+
id: "CocoaPodsProject::src/funTest/assets/projects/synthetic/regular/Podfile:"
44
definition_file_path: "plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/regular/Podfile"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/version-resolution-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "CocoaPods::src/funTest/assets/projects/synthetic/version-resolution/Podfile:"
3+
id: "CocoaPodsProject::src/funTest/assets/projects/synthetic/version-resolution/Podfile:"
44
definition_file_path: "plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/version-resolution/Podfile"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/cocoapods/src/main/kotlin/CocoaPods.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class CocoaPods(
6868
analysisRoot: File,
6969
analyzerConfig: AnalyzerConfiguration,
7070
repoConfig: RepositoryConfiguration
71-
) : PackageManager(name, "CocoaPods", analysisRoot, analyzerConfig, repoConfig) {
71+
) : PackageManager(name, "CocoaPodsProject", analysisRoot, analyzerConfig, repoConfig) {
7272
class Factory : AbstractPackageManagerFactory<CocoaPods>("CocoaPods") {
7373
override val globsForDefinitionFiles = listOf("Podfile")
7474

Diff for: ‎plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-no-deps.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Composer:ort:composer-test-project:0.1.0"
3+
id: "ComposerProject:ort:composer-test-project:0.1.0"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
authors:
66
- "The Author"

Diff for: ‎plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-with-provide.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Composer:ort:composer-test-project:0.1.0"
3+
id: "ComposerProject:ort:composer-test-project:0.1.0"
44
definition_file_path: "plugins/package-managers/composer/src/funTest/assets/projects/synthetic/with-provide/composer.json"
55
declared_licenses:
66
- "Apache-2.0"

Diff for: ‎plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-with-replace.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Composer:ort:composer-test-project:0.1.0"
3+
id: "ComposerProject:ort:composer-test-project:0.1.0"
44
definition_file_path: "plugins/package-managers/composer/src/funTest/assets/projects/synthetic/with-replace/composer.json"
55
declared_licenses:
66
- "Apache-2.0"

Diff for: ‎plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Composer:ort:composer-test-project:0.1.0"
3+
id: "ComposerProject:ort:composer-test-project:0.1.0"
44
definition_file_path: "plugins/package-managers/composer/src/funTest/assets/projects/synthetic/lockfile/composer.json"
55
declared_licenses:
66
- "Apache-2.0"

Diff for: ‎plugins/package-managers/composer/src/main/kotlin/Composer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class Composer(
8888
analysisRoot: File,
8989
analyzerConfig: AnalyzerConfiguration,
9090
repoConfig: RepositoryConfiguration
91-
) : PackageManager(name, "Composer", analysisRoot, analyzerConfig, repoConfig) {
91+
) : PackageManager(name, "ComposerProject", analysisRoot, analyzerConfig, repoConfig) {
9292
class Factory : AbstractPackageManagerFactory<Composer>("Composer") {
9393
override val globsForDefinitionFiles = listOf("composer.json")
9494

Diff for: ‎plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py-lockfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Conan::poco:"
3+
id: "ConanProject::poco:"
44
definition_file_path: "plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-py-lockfile/conanfile.py"
55
declared_licenses:
66
- "BSL-1.0"

Diff for: ‎plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Conan::poco:"
3+
id: "ConanProject::poco:"
44
definition_file_path: "plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-py/conanfile.py"
55
declared_licenses:
66
- "BSL-1.0"

Diff for: ‎plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-txt.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "Conan::conanfile.txt:"
3+
id: "ConanProject::conanfile.txt:"
44
definition_file_path: "plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-txt/conanfile.txt"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/conan/src/main/kotlin/Conan.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class Conan(
9797
analysisRoot: File,
9898
analyzerConfig: AnalyzerConfiguration,
9999
repoConfig: RepositoryConfiguration
100-
) : PackageManager(name, "Conan", analysisRoot, analyzerConfig, repoConfig) {
100+
) : PackageManager(name, "ConanProject", analysisRoot, analyzerConfig, repoConfig) {
101101
companion object {
102102
/**
103103
* The name of the option to specify the name of the lockfile.

Diff for: ‎plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/dangling-embed-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "GoMod::gomod_dangling_embed:<REPLACE_REVISION>"
3+
id: "GoModProject::gomod_dangling_embed:<REPLACE_REVISION>"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go-as-dep-with-transitive-deps-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "GoMod::my-module:<REPLACE_REVISION>"
3+
id: "GoModProject::my-module:<REPLACE_REVISION>"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/no-deps-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "GoMod::gomod_no_deps:<REPLACE_REVISION>"
3+
id: "GoModProject::gomod_no_deps:<REPLACE_REVISION>"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/project-with-tests-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "GoMod::github.com/oss-review-toolkit/ort/gomod-synthetic-test-project:<REPLACE_REVISION>"
3+
id: "GoModProject::github.com/oss-review-toolkit/ort/gomod-synthetic-test-project:<REPLACE_REVISION>"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules-expected-output.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
projects:
3-
- id: "GoMod::app:<REPLACE_REVISION>"
3+
- id: "GoModProject::app:<REPLACE_REVISION>"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}
@@ -36,7 +36,7 @@ projects:
3636
linkage: "PROJECT_STATIC"
3737
- id: "Go::golang.org/x/sys:0.6.0"
3838
linkage: "PROJECT_STATIC"
39-
- id: "GoMod::utils:<REPLACE_REVISION>"
39+
- id: "GoModProject::utils:<REPLACE_REVISION>"
4040
linkage: "PROJECT_STATIC"
4141
dependencies:
4242
- id: "Go::github.com/google/uuid:1.0.0"
@@ -66,7 +66,7 @@ projects:
6666
linkage: "PROJECT_STATIC"
6767
- id: "Go::golang.org/x/sys:0.6.0"
6868
linkage: "PROJECT_STATIC"
69-
- id: "GoMod::utils:<REPLACE_REVISION>"
69+
- id: "GoModProject::utils:<REPLACE_REVISION>"
7070
linkage: "PROJECT_STATIC"
7171
dependencies:
7272
- id: "Go::github.com/google/uuid:1.0.0"
@@ -76,7 +76,7 @@ projects:
7676
dependencies:
7777
- id: "Go::github.com/google/uuid:1.0.0"
7878
linkage: "PROJECT_STATIC"
79-
- id: "GoMod::utils:<REPLACE_REVISION>"
79+
- id: "GoModProject::utils:<REPLACE_REVISION>"
8080
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH_UTILS>"
8181
declared_licenses: []
8282
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "GoMod::github.com/oss-review-toolkit/ort/gomod-synthetic-test-project:<REPLACE_REVISION>"
3+
id: "GoModProject::github.com/oss-review-toolkit/ort/gomod-synthetic-test-project:<REPLACE_REVISION>"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

Diff for: ‎plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/unused-deps-expected-output.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
project:
3-
id: "GoMod::gomod_unused_deps:<REPLACE_REVISION>"
3+
id: "GoModProject::gomod_unused_deps:<REPLACE_REVISION>"
44
definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
55
declared_licenses: []
66
declared_licenses_processed: {}

0 commit comments

Comments
 (0)