Skip to content

Commit ddb06ee

Browse files
eclipse-apoapsis-botmnonnenmacher
authored andcommitted
deps: update org.ossreviewtoolkit:version-catalog to v84
1 parent 9c2b386 commit ddb06ee

4 files changed

Lines changed: 5 additions & 24 deletions

File tree

services/ort-run/src/main/kotlin/OrtServerMappings.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ import org.eclipse.apoapsis.ortserver.model.runs.scanner.SnippetFinding
104104
import org.eclipse.apoapsis.ortserver.model.runs.scanner.TextLocation
105105
import org.eclipse.apoapsis.ortserver.model.runs.scanner.UnknownProvenance
106106

107-
import org.ossreviewtoolkit.model.AdvisorCapability as OrtAdvisorCapability
108107
import org.ossreviewtoolkit.model.AdvisorDetails as OrtAdvisorDetails
109108
import org.ossreviewtoolkit.model.AdvisorResult as OrtAdvisorResult
110109
import org.ossreviewtoolkit.model.AdvisorRun as OrtAdvisorRun
@@ -206,16 +205,12 @@ fun AdvisorConfiguration.mapToOrt() =
206205

207206
fun AdvisorResult.mapToOrt() =
208207
OrtAdvisorResult(
209-
advisor = OrtAdvisorDetails(
210-
name = advisorName,
211-
capabilities = enumSetOf(OrtAdvisorCapability.VULNERABILITIES)
212-
),
208+
advisor = OrtAdvisorDetails(name = advisorName),
213209
summary = OrtAdvisorSummary(
214210
startTime = startTime.toJavaInstant(),
215211
endTime = endTime.toJavaInstant(),
216212
issues = issues.map(Issue::mapToOrt)
217213
),
218-
defects = emptyList(),
219214
vulnerabilities = vulnerabilities.map(Vulnerability::mapToOrt)
220215
)
221216

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ dependencyResolutionManagement {
150150
}
151151

152152
create("ortLibs") {
153-
from("org.ossreviewtoolkit:version-catalog:83.1.0")
153+
from("org.ossreviewtoolkit:version-catalog:84.0.0")
154154
}
155155
}
156156
}

shared/ort-test-data/src/main/kotlin/OrtTestData.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import java.net.URI
2525
import kotlin.time.Instant
2626
import kotlin.time.toJavaInstant
2727

28-
import org.ossreviewtoolkit.model.AdvisorCapability
2928
import org.ossreviewtoolkit.model.AdvisorDetails
3029
import org.ossreviewtoolkit.model.AdvisorResult
3130
import org.ossreviewtoolkit.model.AdvisorRun
@@ -449,16 +448,12 @@ object OrtTestData {
449448
val advisorResults = sortedMapOf(
450449
pkgIdentifier to listOf(
451450
AdvisorResult(
452-
advisor = AdvisorDetails(
453-
name = "VulnerableCode",
454-
capabilities = enumSetOf(AdvisorCapability.VULNERABILITIES)
455-
),
451+
advisor = AdvisorDetails(name = "VulnerableCode"),
456452
summary = AdvisorSummary(
457453
startTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
458454
endTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
459455
issues = listOf(issue)
460456
),
461-
defects = emptyList(),
462457
vulnerabilities = listOf(vulnerability)
463458
)
464459
)

workers/advisor/src/test/kotlin/AdvisorWorkerTest.kt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ import org.eclipse.apoapsis.ortserver.workers.common.RunResult
6464
import org.eclipse.apoapsis.ortserver.workers.common.context.WorkerContext
6565
import org.eclipse.apoapsis.ortserver.workers.common.context.WorkerContextFactory
6666

67-
import org.ossreviewtoolkit.model.AdvisorCapability
6867
import org.ossreviewtoolkit.model.AdvisorDetails
6968
import org.ossreviewtoolkit.model.AdvisorResult
7069
import org.ossreviewtoolkit.model.AdvisorRun
@@ -354,16 +353,12 @@ class AdvisorWorkerTest : StringSpec({
354353
results = sortedMapOf(
355354
Identifier("Maven:com.example:package:1.0") to listOf(
356355
AdvisorResult(
357-
advisor = AdvisorDetails(
358-
name = "VulnerableCode",
359-
capabilities = enumSetOf(AdvisorCapability.VULNERABILITIES)
360-
),
356+
advisor = AdvisorDetails(name = "VulnerableCode"),
361357
summary = AdvisorSummary(
362358
startTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
363359
endTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
364360
issues = listOf(advisorIssue)
365361
),
366-
defects = emptyList(),
367362
vulnerabilities = listOf(advisorVulnerability)
368363
)
369364
)
@@ -459,16 +454,12 @@ class AdvisorWorkerTest : StringSpec({
459454
results = sortedMapOf(
460455
Identifier("Maven:com.example:package:1.0") to listOf(
461456
AdvisorResult(
462-
advisor = AdvisorDetails(
463-
name = "VulnerableCode",
464-
capabilities = enumSetOf(AdvisorCapability.VULNERABILITIES)
465-
),
457+
advisor = AdvisorDetails(name = "VulnerableCode"),
466458
summary = AdvisorSummary(
467459
startTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
468460
endTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
469461
issues = emptyList()
470462
),
471-
defects = emptyList(),
472463
vulnerabilities = listOf(advisorVulnerability)
473464
)
474465
)

0 commit comments

Comments
 (0)