Skip to content

Commit 6ef9963

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 6ef9963

File tree

157 files changed

+2138
-1447
lines changed

Some content is hidden

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

157 files changed

+2138
-1447
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: ‎model/src/test/assets/gradle-all-dependencies-expected-result.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ analyzer:
8686
scopes:
8787
- name: "compileClasspath"
8888
dependencies:
89-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
89+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
9090
linkage: "PROJECT_DYNAMIC"
9191
- name: "runtimeClasspath"
9292
dependencies:
93-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
93+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
9494
linkage: "PROJECT_DYNAMIC"
9595
dependencies:
9696
- id: "Maven:org.apache.commons:commons-text:1.1"
@@ -99,11 +99,11 @@ analyzer:
9999
- id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
100100
- name: "testCompileClasspath"
101101
dependencies:
102-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
102+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
103103
linkage: "PROJECT_DYNAMIC"
104104
- name: "testRuntimeClasspath"
105105
dependencies:
106-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
106+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
107107
linkage: "PROJECT_DYNAMIC"
108108
dependencies:
109109
- id: "Maven:org.apache.commons:commons-text:1.1"

Diff for: ‎model/src/test/assets/maven-expected-output-app.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ project:
2525
scopes:
2626
- name: "compile"
2727
dependencies:
28-
- id: "Maven:org.ossreviewtoolkit.maven:maven-lib:1.0-SNAPSHOT"
28+
- id: "MavenProject:org.ossreviewtoolkit.maven:maven-lib:1.0-SNAPSHOT"
2929
linkage: "PROJECT_DYNAMIC"
3030
dependencies:
3131
- id: "Maven:org.apache.beam:beam-parent:2.3.0"

Diff for: ‎model/src/test/assets/result-with-issues-scopes.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ analyzer:
139139
- id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
140140
- id: "Maven:org.scala-lang:scala-library:2.12.3"
141141
- id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
142-
- id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
142+
- id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
143143
linkage: "PROJECT_DYNAMIC"
144144
- name: "test"
145145
dependencies:
@@ -201,7 +201,7 @@ analyzer:
201201
- id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
202202
- id: "Maven:org.scala-lang:scala-library:2.12.3"
203203
- id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
204-
- id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
204+
- id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
205205
linkage: "PROJECT_DYNAMIC"
206206
- name: "test"
207207
dependencies:

Diff for: ‎model/src/test/assets/sbt-multi-project-example-expected-output.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ analyzer:
130130
- id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
131131
- id: "Maven:org.scala-lang:scala-library:2.12.15"
132132
- id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
133-
- id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
133+
- id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
134134
linkage: "PROJECT_DYNAMIC"
135135
- name: "test"
136136
dependencies:
@@ -192,7 +192,7 @@ analyzer:
192192
- id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
193193
- id: "Maven:org.scala-lang:scala-library:2.12.15"
194194
- id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
195-
- id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
195+
- id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
196196
linkage: "PROJECT_DYNAMIC"
197197
- name: "test"
198198
dependencies:

Diff for: ‎model/src/test/kotlin/AbstractDependencyNavigatorTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ abstract class AbstractDependencyNavigatorTest : WordSpec() {
247247
)
248248
}
249249

250-
"find all the sub projects of a project" {
251-
val projectId = Identifier("SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT")
250+
"find all the sub-projects of a project" {
251+
val projectId = Identifier("SBTProject:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT")
252252
testResult.getProject(projectId) shouldNotBeNull {
253253
val subProjectIds = navigator.projectDependencies(this, matcher = MATCH_SUB_PROJECTS)
254254

Diff for: ‎plugins/advisors/vulnerable-code/src/test/assets/ort-analyzer-result.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ analyzer:
8888
dependencies: []
8989
- name: "compile"
9090
dependencies:
91-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
91+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
9292
linkage: "PROJECT_DYNAMIC"
9393
dependencies:
9494
- id: "Maven:org.apache.commons:commons-text:1.1"
@@ -97,7 +97,7 @@ analyzer:
9797
- id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
9898
- name: "compileClasspath"
9999
dependencies:
100-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
100+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
101101
linkage: "PROJECT_DYNAMIC"
102102
dependencies:
103103
- id: "Maven:org.apache.commons:commons-text:1.1"
@@ -108,7 +108,7 @@ analyzer:
108108
dependencies: []
109109
- name: "default"
110110
dependencies:
111-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
111+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
112112
linkage: "PROJECT_DYNAMIC"
113113
dependencies:
114114
- id: "Maven:org.apache.commons:commons-text:1.1"
@@ -117,7 +117,7 @@ analyzer:
117117
- id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
118118
- name: "runtime"
119119
dependencies:
120-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
120+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
121121
linkage: "PROJECT_DYNAMIC"
122122
dependencies:
123123
- id: "Maven:org.apache.commons:commons-text:1.1"
@@ -126,7 +126,7 @@ analyzer:
126126
- id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
127127
- name: "runtimeClasspath"
128128
dependencies:
129-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
129+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
130130
linkage: "PROJECT_DYNAMIC"
131131
dependencies:
132132
- id: "Maven:org.apache.commons:commons-text:1.1"
@@ -137,7 +137,7 @@ analyzer:
137137
dependencies: []
138138
- name: "testCompile"
139139
dependencies:
140-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
140+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
141141
linkage: "PROJECT_DYNAMIC"
142142
dependencies:
143143
- id: "Maven:org.apache.commons:commons-text:1.1"
@@ -146,7 +146,7 @@ analyzer:
146146
- id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
147147
- name: "testCompileClasspath"
148148
dependencies:
149-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
149+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
150150
linkage: "PROJECT_DYNAMIC"
151151
dependencies:
152152
- id: "Maven:org.apache.commons:commons-text:1.1"
@@ -157,7 +157,7 @@ analyzer:
157157
dependencies: []
158158
- name: "testRuntime"
159159
dependencies:
160-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
160+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
161161
linkage: "PROJECT_DYNAMIC"
162162
dependencies:
163163
- id: "Maven:org.apache.commons:commons-text:1.1"
@@ -166,7 +166,7 @@ analyzer:
166166
- id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
167167
- name: "testRuntimeClasspath"
168168
dependencies:
169-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
169+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
170170
linkage: "PROJECT_DYNAMIC"
171171
dependencies:
172172
- id: "Maven:org.apache.commons:commons-text:1.1"

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: {}

0 commit comments

Comments
 (0)