Skip to content

Commit be33216

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 2f319ed commit be33216

File tree

164 files changed

+428
-577
lines changed

Some content is hidden

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

164 files changed

+428
-577
lines changed

‎cli/src/funTest/kotlin/OrtMainFunTest.kt‎

Lines changed: 1 addition & 1 deletion
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

‎model/src/test/assets/gradle-all-dependencies-expected-result.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ analyzer:
5252
- "Gradle"
5353
result:
5454
projects:
55-
- id: "Gradle::Gradle-Example:"
55+
- id: "GradleProject::Gradle-Example:"
5656
definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/build.gradle"
5757
declared_licenses: []
5858
declared_licenses_processed: {}
@@ -68,7 +68,7 @@ analyzer:
6868
path: "analyzer/src/funTest/assets/projects/synthetic/gradle"
6969
homepage_url: ""
7070
scopes: []
71-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
71+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
7272
definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app/build.gradle"
7373
declared_licenses: []
7474
declared_licenses_processed: {}
@@ -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,18 +99,18 @@ 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"
110110
dependencies:
111111
- id: "Maven:org.apache.commons:commons-lang3:3.5"
112112
- id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
113-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
113+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
114114
definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle"
115115
declared_licenses: []
116116
declared_licenses_processed: {}
@@ -156,7 +156,7 @@ analyzer:
156156
dependencies:
157157
- id: "Maven:org.apache.commons:commons-lang3:3.5"
158158
- id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
159-
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib-without-repo:1.0.0"
159+
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib-without-repo:1.0.0"
160160
definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle"
161161
declared_licenses: []
162162
declared_licenses_processed: {}

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

Lines changed: 1 addition & 1 deletion
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"

‎model/src/test/assets/result-with-issues-graph-old.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ analyzer:
2727
allow_dynamic_versions: false
2828
result:
2929
projects:
30-
- id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
30+
- id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
3131
definition_file_path: "common/target-scala-2.12-common_2.12-0.1-SNAPSHOT.pom"
3232
authors:
3333
- "com.pbassiner"
@@ -47,7 +47,7 @@ analyzer:
4747
scope_names:
4848
- "compile"
4949
- "test"
50-
- id: "SBT:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
50+
- id: "SBTProject:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
5151
definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
5252
authors:
5353
- "com.pbassiner"
@@ -67,7 +67,7 @@ analyzer:
6767
scope_names:
6868
- "compile"
6969
- "test"
70-
- id: "SBT:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
70+
- id: "SBTProject:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
7171
definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1-SNAPSHOT.pom"
7272
authors:
7373
- "com.pbassiner"
@@ -87,7 +87,7 @@ analyzer:
8787
scope_names:
8888
- "compile"
8989
- "test"
90-
- id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
90+
- id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
9191
definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
9292
authors:
9393
- "com.pbassiner"
@@ -1205,7 +1205,7 @@ analyzer:
12051205
- "Maven:org.scalaz:scalaz-core_2.12:7.2.8"
12061206
- "Maven:com.github.julien-truffaut:monocle-macro_2.12:1.4.0"
12071207
- "Maven:org.typelevel:macro-compat_2.12:1.1.1"
1208-
- "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
1208+
- "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
12091209
- "Maven:com.github.pureconfig:pureconfig_2.12:0.8.0"
12101210
- "Maven:com.chuusai:shapeless_2.12:2.3.2"
12111211
- "Maven:com.github.pureconfig:pureconfig-macros_2.12:0.8.0"

‎model/src/test/assets/result-with-issues-graph.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ analyzer:
2727
allow_dynamic_versions: false
2828
result:
2929
projects:
30-
- id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
30+
- id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
3131
definition_file_path: "common/target-scala-2.12-common_2.12-0.1-SNAPSHOT.pom"
3232
authors:
3333
- "com.pbassiner"
@@ -47,7 +47,7 @@ analyzer:
4747
scope_names:
4848
- "compile"
4949
- "test"
50-
- id: "SBT:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
50+
- id: "SBTProject:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
5151
definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
5252
authors:
5353
- "com.pbassiner"
@@ -67,7 +67,7 @@ analyzer:
6767
scope_names:
6868
- "compile"
6969
- "test"
70-
- id: "SBT:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
70+
- id: "SBTProject:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
7171
definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1-SNAPSHOT.pom"
7272
authors:
7373
- "com.pbassiner"
@@ -87,7 +87,7 @@ analyzer:
8787
scope_names:
8888
- "compile"
8989
- "test"
90-
- id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
90+
- id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
9191
definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
9292
authors:
9393
- "com.pbassiner"
@@ -1205,7 +1205,7 @@ analyzer:
12051205
- "Maven:org.scalaz:scalaz-core_2.12:7.2.8"
12061206
- "Maven:com.github.julien-truffaut:monocle-macro_2.12:1.4.0"
12071207
- "Maven:org.typelevel:macro-compat_2.12:1.1.1"
1208-
- "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
1208+
- "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
12091209
- "Maven:com.github.pureconfig:pureconfig_2.12:0.8.0"
12101210
- "Maven:com.chuusai:shapeless_2.12:2.3.2"
12111211
- "Maven:com.github.pureconfig:pureconfig-macros_2.12:0.8.0"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ analyzer:
2727
allow_dynamic_versions: false
2828
result:
2929
projects:
30-
- id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
30+
- id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
3131
definition_file_path: "common/target-scala-2.12-common_2.12-0.1-SNAPSHOT.pom"
3232
authors:
3333
- "com.pbassiner"
@@ -90,7 +90,7 @@ analyzer:
9090
source: "Gradle"
9191
message: "Test issue 2"
9292
severity: "ERROR"
93-
- id: "SBT:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
93+
- id: "SBTProject:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
9494
definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
9595
authors:
9696
- "com.pbassiner"
@@ -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:
@@ -151,7 +151,7 @@ analyzer:
151151
- id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
152152
- id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
153153
- id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
154-
- id: "SBT:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
154+
- id: "SBTProject:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
155155
definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1-SNAPSHOT.pom"
156156
authors:
157157
- "com.pbassiner"
@@ -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:
@@ -213,7 +213,7 @@ analyzer:
213213
- id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
214214
- id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
215215
- id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
216-
- id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
216+
- id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
217217
definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
218218
authors:
219219
- "com.pbassiner"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ analyzer:
2828
skip_excluded: false
2929
result:
3030
projects:
31-
- id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
31+
- id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
3232
definition_file_path: "common/target-scala-2.12-common_2.12-0.1.0-SNAPSHOT.pom"
3333
authors:
3434
- "com.pbassiner"
@@ -81,7 +81,7 @@ analyzer:
8181
- id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
8282
- id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
8383
- id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
84-
- id: "SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
84+
- id: "SBTProject:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
8585
definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1.0-SNAPSHOT.pom"
8686
authors:
8787
- "com.pbassiner"
@@ -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:
@@ -142,7 +142,7 @@ analyzer:
142142
- id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
143143
- id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
144144
- id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
145-
- id: "SBT:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
145+
- id: "SBTProject:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
146146
definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1.0-SNAPSHOT.pom"
147147
authors:
148148
- "com.pbassiner"
@@ -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:
@@ -204,7 +204,7 @@ analyzer:
204204
- id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
205205
- id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
206206
- id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
207-
- id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1.0-SNAPSHOT"
207+
- id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1.0-SNAPSHOT"
208208
definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1.0-SNAPSHOT.pom"
209209
authors:
210210
- "com.pbassiner"

‎model/src/test/assets/sbt-multi-project-example-graph-old.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ analyzer:
2727
allow_dynamic_versions: false
2828
result:
2929
projects:
30-
- id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
30+
- id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
3131
definition_file_path: "common/target-scala-2.12-common_2.12-0.1.0-SNAPSHOT.pom"
3232
authors:
3333
- "com.pbassiner"
@@ -47,7 +47,7 @@ analyzer:
4747
scope_names:
4848
- "compile"
4949
- "test"
50-
- id: "SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
50+
- id: "SBTProject:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
5151
definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
5252
authors:
5353
- "com.pbassiner"
@@ -67,7 +67,7 @@ analyzer:
6767
scope_names:
6868
- "compile"
6969
- "test"
70-
- id: "SBT:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
70+
- id: "SBTProject:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
7171
definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1.0-SNAPSHOT.pom"
7272
authors:
7373
- "com.pbassiner"
@@ -87,7 +87,7 @@ analyzer:
8787
scope_names:
8888
- "compile"
8989
- "test"
90-
- id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
90+
- id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
9191
definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
9292
authors:
9393
- "com.pbassiner"
@@ -1205,7 +1205,7 @@ analyzer:
12051205
- "Maven:org.scalaz:scalaz-core_2.12:7.2.8"
12061206
- "Maven:com.github.julien-truffaut:monocle-macro_2.12:1.4.0"
12071207
- "Maven:org.typelevel:macro-compat_2.12:1.1.1"
1208-
- "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
1208+
- "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
12091209
- "Maven:com.github.pureconfig:pureconfig_2.12:0.8.0"
12101210
- "Maven:com.chuusai:shapeless_2.12:2.3.2"
12111211
- "Maven:com.github.pureconfig:pureconfig-macros_2.12:0.8.0"

‎model/src/test/assets/sbt-multi-project-example-graph.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ analyzer:
2727
allow_dynamic_versions: false
2828
result:
2929
projects:
30-
- id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
30+
- id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
3131
definition_file_path: "common/target-scala-2.12-common_2.12-0.1-SNAPSHOT.pom"
3232
authors:
3333
- "com.pbassiner"
@@ -47,7 +47,7 @@ analyzer:
4747
scope_names:
4848
- "compile"
4949
- "test"
50-
- id: "SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
50+
- id: "SBTProject:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
5151
definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
5252
authors:
5353
- "com.pbassiner"
@@ -67,7 +67,7 @@ analyzer:
6767
scope_names:
6868
- "compile"
6969
- "test"
70-
- id: "SBT:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
70+
- id: "SBTProject:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
7171
definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1-SNAPSHOT.pom"
7272
authors:
7373
- "com.pbassiner"
@@ -87,7 +87,7 @@ analyzer:
8787
scope_names:
8888
- "compile"
8989
- "test"
90-
- id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
90+
- id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
9191
definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
9292
authors:
9393
- "com.pbassiner"
@@ -1205,7 +1205,7 @@ analyzer:
12051205
- "Maven:org.scalaz:scalaz-core_2.12:7.2.8"
12061206
- "Maven:com.github.julien-truffaut:monocle-macro_2.12:1.4.0"
12071207
- "Maven:org.typelevel:macro-compat_2.12:1.1.1"
1208-
- "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
1208+
- "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
12091209
- "Maven:com.github.pureconfig:pureconfig_2.12:0.8.0"
12101210
- "Maven:com.chuusai:shapeless_2.12:2.3.2"
12111211
- "Maven:com.github.pureconfig:pureconfig-macros_2.12:0.8.0"

‎model/src/test/kotlin/AbstractDependencyNavigatorTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ abstract class AbstractDependencyNavigatorTest : WordSpec() {
248248
}
249249

250250
"find all the sub-projects of a project" {
251-
val projectId = Identifier("SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT")
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

@@ -325,7 +325,7 @@ abstract class AbstractDependencyNavigatorTest : WordSpec() {
325325
"return the issues of a project" {
326326
val ortResultWithIssues = File(resultWithIssuesFileName).readValue<OrtResult>()
327327
val navigator = ortResultWithIssues.dependencyNavigator
328-
val projectIdWithIssues = Identifier("SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT")
328+
val projectIdWithIssues = Identifier("SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT")
329329
val project = ortResultWithIssues.getProject(projectIdWithIssues)
330330

331331
project shouldNotBeNull {
@@ -386,4 +386,4 @@ abstract class AbstractDependencyNavigatorTest : WordSpec() {
386386
}
387387

388388
/** Identifier of the project used by the tests. */
389-
private val PROJECT_ID = Identifier("SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT")
389+
private val PROJECT_ID = Identifier("SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT")

0 commit comments

Comments
 (0)