Skip to content

Add a "Project" suffix to project types #9780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/src/funTest/kotlin/OrtMainFunTest.kt
Original file line number Diff line number Diff line change
@@ -161,7 +161,7 @@ class OrtMainFunTest : StringSpec() {

ortResult.analyzer shouldNotBeNull {
result.projects should haveSize(1)
result.projects.single().id.type shouldBe "Unmanaged"
result.projects.single().id.type shouldBe "UnmanagedProject"
}
}

Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ analyzer:
- "Gradle"
result:
projects:
- id: "Gradle::Gradle-Example:"
- id: "GradleProject::Gradle-Example:"
definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/build.gradle"
declared_licenses: []
declared_licenses_processed: {}
@@ -68,7 +68,7 @@ analyzer:
path: "analyzer/src/funTest/assets/projects/synthetic/gradle"
homepage_url: ""
scopes: []
- id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app/build.gradle"
declared_licenses: []
declared_licenses_processed: {}
@@ -86,11 +86,11 @@ analyzer:
scopes:
- name: "compileClasspath"
dependencies:
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
linkage: "PROJECT_DYNAMIC"
- name: "runtimeClasspath"
dependencies:
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.apache.commons:commons-text:1.1"
@@ -99,18 +99,18 @@ analyzer:
- id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
- name: "testCompileClasspath"
dependencies:
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
linkage: "PROJECT_DYNAMIC"
- name: "testRuntimeClasspath"
dependencies:
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.apache.commons:commons-text:1.1"
dependencies:
- id: "Maven:org.apache.commons:commons-lang3:3.5"
- id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle"
declared_licenses: []
declared_licenses_processed: {}
@@ -156,7 +156,7 @@ analyzer:
dependencies:
- id: "Maven:org.apache.commons:commons-lang3:3.5"
- id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
- id: "Gradle:org.ossreviewtoolkit.gradle.example:lib-without-repo:1.0.0"
- id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib-without-repo:1.0.0"
definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle"
declared_licenses: []
declared_licenses_processed: {}
2 changes: 1 addition & 1 deletion model/src/test/assets/maven-expected-output-app.yml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ project:
scopes:
- name: "compile"
dependencies:
- id: "Maven:org.ossreviewtoolkit.maven:maven-lib:1.0-SNAPSHOT"
- id: "MavenProject:org.ossreviewtoolkit.maven:maven-lib:1.0-SNAPSHOT"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.apache.beam:beam-parent:2.3.0"
10 changes: 5 additions & 5 deletions model/src/test/assets/result-with-issues-graph-old.yml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ analyzer:
allow_dynamic_versions: false
result:
projects:
- id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
definition_file_path: "common/target-scala-2.12-common_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -47,7 +47,7 @@ analyzer:
scope_names:
- "compile"
- "test"
- id: "SBT:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -67,7 +67,7 @@ analyzer:
scope_names:
- "compile"
- "test"
- id: "SBT:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -87,7 +87,7 @@ analyzer:
scope_names:
- "compile"
- "test"
- id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -1205,7 +1205,7 @@ analyzer:
- "Maven:org.scalaz:scalaz-core_2.12:7.2.8"
- "Maven:com.github.julien-truffaut:monocle-macro_2.12:1.4.0"
- "Maven:org.typelevel:macro-compat_2.12:1.1.1"
- "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
- "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
- "Maven:com.github.pureconfig:pureconfig_2.12:0.8.0"
- "Maven:com.chuusai:shapeless_2.12:2.3.2"
- "Maven:com.github.pureconfig:pureconfig-macros_2.12:0.8.0"
10 changes: 5 additions & 5 deletions model/src/test/assets/result-with-issues-graph.yml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ analyzer:
allow_dynamic_versions: false
result:
projects:
- id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
definition_file_path: "common/target-scala-2.12-common_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -47,7 +47,7 @@ analyzer:
scope_names:
- "compile"
- "test"
- id: "SBT:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -67,7 +67,7 @@ analyzer:
scope_names:
- "compile"
- "test"
- id: "SBT:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -87,7 +87,7 @@ analyzer:
scope_names:
- "compile"
- "test"
- id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -1205,7 +1205,7 @@ analyzer:
- "Maven:org.scalaz:scalaz-core_2.12:7.2.8"
- "Maven:com.github.julien-truffaut:monocle-macro_2.12:1.4.0"
- "Maven:org.typelevel:macro-compat_2.12:1.1.1"
- "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
- "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
- "Maven:com.github.pureconfig:pureconfig_2.12:0.8.0"
- "Maven:com.chuusai:shapeless_2.12:2.3.2"
- "Maven:com.github.pureconfig:pureconfig-macros_2.12:0.8.0"
12 changes: 6 additions & 6 deletions model/src/test/assets/result-with-issues-scopes.yml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ analyzer:
allow_dynamic_versions: false
result:
projects:
- id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
definition_file_path: "common/target-scala-2.12-common_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -90,7 +90,7 @@ analyzer:
source: "Gradle"
message: "Test issue 2"
severity: "ERROR"
- id: "SBT:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -139,7 +139,7 @@ analyzer:
- id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
- id: "Maven:org.scala-lang:scala-library:2.12.3"
- id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
- id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
linkage: "PROJECT_DYNAMIC"
- name: "test"
dependencies:
@@ -151,7 +151,7 @@ analyzer:
- id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
- id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
- id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
- id: "SBT:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -201,7 +201,7 @@ analyzer:
- id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
- id: "Maven:org.scala-lang:scala-library:2.12.3"
- id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
- id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
linkage: "PROJECT_DYNAMIC"
- name: "test"
dependencies:
@@ -213,7 +213,7 @@ analyzer:
- id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
- id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
- id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
- id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ analyzer:
skip_excluded: false
result:
projects:
- id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
- id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
definition_file_path: "common/target-scala-2.12-common_2.12-0.1.0-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -81,7 +81,7 @@ analyzer:
- id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
- id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
- id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
- id: "SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
- id: "SBTProject:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1.0-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -130,7 +130,7 @@ analyzer:
- id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
- id: "Maven:org.scala-lang:scala-library:2.12.15"
- id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
- id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
- id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
linkage: "PROJECT_DYNAMIC"
- name: "test"
dependencies:
@@ -142,7 +142,7 @@ analyzer:
- id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
- id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
- id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
- id: "SBT:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
- id: "SBTProject:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1.0-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -192,7 +192,7 @@ analyzer:
- id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
- id: "Maven:org.scala-lang:scala-library:2.12.15"
- id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
- id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
- id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
linkage: "PROJECT_DYNAMIC"
- name: "test"
dependencies:
@@ -204,7 +204,7 @@ analyzer:
- id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
- id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
- id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
- id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1.0-SNAPSHOT"
- id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1.0-SNAPSHOT"
definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1.0-SNAPSHOT.pom"
authors:
- "com.pbassiner"
10 changes: 5 additions & 5 deletions model/src/test/assets/sbt-multi-project-example-graph-old.yml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ analyzer:
allow_dynamic_versions: false
result:
projects:
- id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
- id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
definition_file_path: "common/target-scala-2.12-common_2.12-0.1.0-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -47,7 +47,7 @@ analyzer:
scope_names:
- "compile"
- "test"
- id: "SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
- id: "SBTProject:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -67,7 +67,7 @@ analyzer:
scope_names:
- "compile"
- "test"
- id: "SBT:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
- id: "SBTProject:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1.0-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -87,7 +87,7 @@ analyzer:
scope_names:
- "compile"
- "test"
- id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -1205,7 +1205,7 @@ analyzer:
- "Maven:org.scalaz:scalaz-core_2.12:7.2.8"
- "Maven:com.github.julien-truffaut:monocle-macro_2.12:1.4.0"
- "Maven:org.typelevel:macro-compat_2.12:1.1.1"
- "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
- "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
- "Maven:com.github.pureconfig:pureconfig_2.12:0.8.0"
- "Maven:com.chuusai:shapeless_2.12:2.3.2"
- "Maven:com.github.pureconfig:pureconfig-macros_2.12:0.8.0"
10 changes: 5 additions & 5 deletions model/src/test/assets/sbt-multi-project-example-graph.yml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ analyzer:
allow_dynamic_versions: false
result:
projects:
- id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
- id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
definition_file_path: "common/target-scala-2.12-common_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -47,7 +47,7 @@ analyzer:
scope_names:
- "compile"
- "test"
- id: "SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
- id: "SBTProject:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -67,7 +67,7 @@ analyzer:
scope_names:
- "compile"
- "test"
- id: "SBT:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
- id: "SBTProject:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -87,7 +87,7 @@ analyzer:
scope_names:
- "compile"
- "test"
- id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
- id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
authors:
- "com.pbassiner"
@@ -1205,7 +1205,7 @@ analyzer:
- "Maven:org.scalaz:scalaz-core_2.12:7.2.8"
- "Maven:com.github.julien-truffaut:monocle-macro_2.12:1.4.0"
- "Maven:org.typelevel:macro-compat_2.12:1.1.1"
- "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
- "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
- "Maven:com.github.pureconfig:pureconfig_2.12:0.8.0"
- "Maven:com.chuusai:shapeless_2.12:2.3.2"
- "Maven:com.github.pureconfig:pureconfig-macros_2.12:0.8.0"
6 changes: 3 additions & 3 deletions model/src/test/kotlin/AbstractDependencyNavigatorTest.kt
Original file line number Diff line number Diff line change
@@ -248,7 +248,7 @@ abstract class AbstractDependencyNavigatorTest : WordSpec() {
}

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

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

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

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