Skip to content

deps: update org.ossreviewtoolkit:version-catalog to v84 #4862

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.

Sign up for GitHub

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

Merged
mnonnenmacher merged 1 commit into from
Apr 20, 2026
Merged

deps: update org.ossreviewtoolkit:version-catalog to v84 #4862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions services/ort-run/src/main/kotlin/OrtServerMappings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ import org.eclipse.apoapsis.ortserver.model.runs.scanner.SnippetFinding
import org.eclipse.apoapsis.ortserver.model.runs.scanner.TextLocation
import org.eclipse.apoapsis.ortserver.model.runs.scanner.UnknownProvenance

import org.ossreviewtoolkit.model.AdvisorCapability as OrtAdvisorCapability
import org.ossreviewtoolkit.model.AdvisorDetails as OrtAdvisorDetails
import org.ossreviewtoolkit.model.AdvisorResult as OrtAdvisorResult
import org.ossreviewtoolkit.model.AdvisorRun as OrtAdvisorRun
Expand Down Expand Up @@ -206,16 +205,12 @@ fun AdvisorConfiguration.mapToOrt() =

fun AdvisorResult.mapToOrt() =
OrtAdvisorResult(
advisor = OrtAdvisorDetails(
name = advisorName,
capabilities = enumSetOf(OrtAdvisorCapability.VULNERABILITIES)
),
advisor = OrtAdvisorDetails(name = advisorName),
summary = OrtAdvisorSummary(
startTime = startTime.toJavaInstant(),
endTime = endTime.toJavaInstant(),
issues = issues.map(Issue::mapToOrt)
),
defects = emptyList(),
vulnerabilities = vulnerabilities.map(Vulnerability::mapToOrt)
)

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ dependencyResolutionManagement {
}

create("ortLibs") {
from("org.ossreviewtoolkit:version-catalog:83.1.0")
from("org.ossreviewtoolkit:version-catalog:84.0.0")
}
}
}
7 changes: 1 addition & 6 deletions shared/ort-test-data/src/main/kotlin/OrtTestData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import java.net.URI
import kotlin.time.Instant
import kotlin.time.toJavaInstant

import org.ossreviewtoolkit.model.AdvisorCapability
import org.ossreviewtoolkit.model.AdvisorDetails
import org.ossreviewtoolkit.model.AdvisorResult
import org.ossreviewtoolkit.model.AdvisorRun
Expand Down Expand Up @@ -449,16 +448,12 @@ object OrtTestData {
val advisorResults = sortedMapOf(
pkgIdentifier to listOf(
AdvisorResult(
advisor = AdvisorDetails(
name = "VulnerableCode",
capabilities = enumSetOf(AdvisorCapability.VULNERABILITIES)
),
advisor = AdvisorDetails(name = "VulnerableCode"),
summary = AdvisorSummary(
startTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
endTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
issues = listOf(issue)
),
defects = emptyList(),
vulnerabilities = listOf(vulnerability)
)
)
Expand Down
14 changes: 2 additions & 12 deletions workers/advisor/src/test/kotlin/AdvisorWorkerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ import org.eclipse.apoapsis.ortserver.workers.common.RunResult
import org.eclipse.apoapsis.ortserver.workers.common.context.WorkerContext
import org.eclipse.apoapsis.ortserver.workers.common.context.WorkerContextFactory

import org.ossreviewtoolkit.model.AdvisorCapability
import org.ossreviewtoolkit.model.AdvisorDetails
import org.ossreviewtoolkit.model.AdvisorResult
import org.ossreviewtoolkit.model.AdvisorRun
Expand All @@ -81,7 +80,6 @@ import org.ossreviewtoolkit.model.config.VulnerabilityResolution
import org.ossreviewtoolkit.model.config.VulnerabilityResolutionReason
import org.ossreviewtoolkit.model.vulnerabilities.Vulnerability
import org.ossreviewtoolkit.model.vulnerabilities.VulnerabilityReference
import org.ossreviewtoolkit.utils.common.enumSetOf

private const val ORT_SERVER_MAPPINGS_FILE = "org.eclipse.apoapsis.ortserver.services.ortrun.OrtServerMappingsKt"

Expand Down Expand Up @@ -354,16 +352,12 @@ class AdvisorWorkerTest : StringSpec({
results = sortedMapOf(
Identifier("Maven:com.example:package:1.0") to listOf(
AdvisorResult(
advisor = AdvisorDetails(
name = "VulnerableCode",
capabilities = enumSetOf(AdvisorCapability.VULNERABILITIES)
),
advisor = AdvisorDetails(name = "VulnerableCode"),
summary = AdvisorSummary(
startTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
endTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
issues = listOf(advisorIssue)
),
defects = emptyList(),
vulnerabilities = listOf(advisorVulnerability)
)
)
Expand Down Expand Up @@ -459,16 +453,12 @@ class AdvisorWorkerTest : StringSpec({
results = sortedMapOf(
Identifier("Maven:com.example:package:1.0") to listOf(
AdvisorResult(
advisor = AdvisorDetails(
name = "VulnerableCode",
capabilities = enumSetOf(AdvisorCapability.VULNERABILITIES)
),
advisor = AdvisorDetails(name = "VulnerableCode"),
summary = AdvisorSummary(
startTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
endTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
issues = emptyList()
),
defects = emptyList(),
vulnerabilities = listOf(advisorVulnerability)
)
)
Expand Down
Loading