deps: update org.ossreviewtoolkit:version-catalog to v67

This ORT major release contains two breaking changes which require
changes:

* The introduction of the new `LicenseFactProvider` plugins allows to
  simplify the custom implementation that reads license texts from the
  config directory.
* The `Environment.toolVersion` property and related database tables
  need to be removed.

Author: mnonnenmacher

core/src/test/kotlin/api/RunsRouteIntegrationTest.kt

@@ -894,8 +894,7 @@ class RunsRouteIntegrationTest : AbstractIntegrationTest({
                         os = "Linux",
                         processors = 8,
                         maxMemory = 8321499136,
-                        variables = emptyMap(),
-                        toolVersions = emptyMap()
+                        variables = emptyMap()
                     ),
                     config = AnalyzerConfiguration(
                         allowDynamicVersions = true,
@@ -992,8 +991,7 @@ class RunsRouteIntegrationTest : AbstractIntegrationTest({
                         os = "Linux",
                         processors = 8,
                         maxMemory = 8321499136,
-                        variables = emptyMap(),
-                        toolVersions = emptyMap()
+                        variables = emptyMap()
                     ),
                     config = AdvisorConfiguration(
                         config = mapOf(
@@ -1098,8 +1096,7 @@ class RunsRouteIntegrationTest : AbstractIntegrationTest({
                         os = "Linux",
                         processors = 8,
                         maxMemory = 8321499136,
-                        variables = emptyMap(),
-                        toolVersions = emptyMap()
+                        variables = emptyMap()
                     ),
                     config = AnalyzerConfiguration(
                         allowDynamicVersions = true,
@@ -1412,8 +1409,7 @@ class RunsRouteIntegrationTest : AbstractIntegrationTest({
                         os = "Linux",
                         processors = 8,
                         maxMemory = 8321499136,
-                        variables = emptyMap(),
-                        toolVersions = emptyMap()
+                        variables = emptyMap()
                     ),
                     config = AnalyzerConfiguration(
                         allowDynamicVersions = true,
@@ -1882,8 +1878,7 @@ class RunsRouteIntegrationTest : AbstractIntegrationTest({
                         os = "Linux",
                         processors = 8,
                         maxMemory = 8321499136,
-                        variables = emptyMap(),
-                        toolVersions = emptyMap()
+                        variables = emptyMap()
                     ),
                     config = AnalyzerConfiguration(
                         allowDynamicVersions = true,
@@ -2002,8 +1997,7 @@ class RunsRouteIntegrationTest : AbstractIntegrationTest({
                         os = "Linux",
                         processors = 8,
                         maxMemory = 8321499136,
-                        variables = emptyMap(),
-                        toolVersions = emptyMap()
+                        variables = emptyMap()
                     ),
                     config = AdvisorConfiguration(
                         config = mapOf(
@@ -2320,8 +2314,7 @@ private fun generateAdvisorEnvironment() = Environment(
     os = "Linux",
     processors = 8,
     maxMemory = 8321499136,
-    variables = emptyMap(),
-    toolVersions = emptyMap()
+    variables = emptyMap()
 )
 
 private fun generateAdvisorConfiguration() = AdvisorConfiguration(

dao/src/main/kotlin/queries/environment/GetEnvironmentQuery.kt

@@ -21,9 +21,7 @@ package org.eclipse.apoapsis.ortserver.dao.queries.environment
 
 import org.eclipse.apoapsis.ortserver.dao.Query
 import org.eclipse.apoapsis.ortserver.dao.tables.shared.EnvironmentsTable
-import org.eclipse.apoapsis.ortserver.dao.tables.shared.EnvironmentsToolVersionsTable
 import org.eclipse.apoapsis.ortserver.dao.tables.shared.EnvironmentsVariablesTable
-import org.eclipse.apoapsis.ortserver.dao.tables.shared.ToolVersionsTable
 import org.eclipse.apoapsis.ortserver.dao.tables.shared.VariablesTable
 import org.eclipse.apoapsis.ortserver.model.runs.Environment
 
@@ -39,13 +37,6 @@ class GetEnvironmentQuery(
 
         if (resultRow == null) return null
 
-        val toolVersions = EnvironmentsToolVersionsTable
-            .innerJoin(ToolVersionsTable)
-            .select(ToolVersionsTable.name, ToolVersionsTable.version)
-            .where { EnvironmentsToolVersionsTable.environmentId eq environmentId }.associate {
-                it[ToolVersionsTable.name] to it[ToolVersionsTable.version]
-            }
-
         val variables = EnvironmentsVariablesTable
             .innerJoin(VariablesTable)
             .select(VariablesTable.name, VariablesTable.value)
@@ -59,8 +50,7 @@ class GetEnvironmentQuery(
             os = resultRow[EnvironmentsTable.os],
             processors = resultRow[EnvironmentsTable.processors],
             maxMemory = resultRow[EnvironmentsTable.maxMemory],
-            variables = variables,
-            toolVersions = toolVersions
+            variables = variables
         )
     }
 }

dao/src/main/kotlin/tables/shared/EnvironmentsTable.kt

@@ -50,8 +50,7 @@ class EnvironmentDao(id: EntityID<Long>) : LongEntity(id) {
                         (EnvironmentsTable.processors eq environment.processors) and
                         (EnvironmentsTable.maxMemory eq environment.maxMemory)
             }.firstOrNull { dao ->
-                dao.variables.associate { it.name to it.value } == environment.variables &&
-                        dao.toolVersions.associate { it.name to it.version } == environment.toolVersions
+                dao.variables.associate { it.name to it.value } == environment.variables
             }
 
         fun getOrPut(environment: Environment): EnvironmentDao =
@@ -62,15 +61,6 @@ class EnvironmentDao(id: EntityID<Long>) : LongEntity(id) {
                 processors = environment.processors
                 maxMemory = environment.maxMemory
             }.also { environmentDao ->
-                environment.toolVersions.forEach { (name, version) ->
-                    val toolVersionDao = ToolVersionDao.getOrPut(name, version)
-
-                    EnvironmentsToolVersionsTable.insert {
-                        it[environmentId] = environmentDao.id
-                        it[toolVersionId] = toolVersionDao.id
-                    }
-                }
-
                 environment.variables.forEach { (name, value) ->
                     val variableDao = VariableDao.getOrPut(name, value)
 
@@ -89,15 +79,13 @@ class EnvironmentDao(id: EntityID<Long>) : LongEntity(id) {
     var maxMemory by EnvironmentsTable.maxMemory
 
     val variables by VariableDao via EnvironmentsVariablesTable
-    val toolVersions by ToolVersionDao via EnvironmentsToolVersionsTable
 
     fun mapToModel() = Environment(
         ortVersion = ortVersion,
         javaVersion = javaVersion,
         os = os,
         processors = processors,
         maxMemory = maxMemory,
-        variables = variables.associate { it.name to it.value },
-        toolVersions = toolVersions.associate { it.name to it.version }
+        variables = variables.associate { it.name to it.value }
     )
 }

dao/src/main/kotlin/tables/shared/EnvironmentsToolVersionsTable.kt

@@ -0,0 +1,3 @@
+-- Remove the tool versions because they have been removed in ORT.
+DROP TABLE environments_tool_versions;
+DROP TABLE tool_versions;

dao/src/main/kotlin/tables/shared/ToolVersionsTable.kt

@@ -343,8 +343,7 @@ private val environment = Environment(
     os = "testOS",
     processors = 2,
     maxMemory = 16384,
-    variables = emptyMap(),
-    toolVersions = emptyMap()
+    variables = emptyMap()
 )
 
 private val baseIdentifier = Identifier("test", "ns", "name", "1.0")

dao/src/main/resources/db/migration/V115__removeToolVersions.sql

@@ -117,19 +117,13 @@ private val variables = mapOf(
     "TERM" to "xterm-256color"
 )
 
-private val toolVersions = mapOf(
-    "Conan" to "1.53.0",
-    "NPM" to "8.15.1"
-)
-
 private val environment = Environment(
     ortVersion = "1.0",
     javaVersion = "11.0.16",
     os = "Linux",
     processors = 8,
     maxMemory = 8321499136,
-    variables = variables,
-    toolVersions = toolVersions
+    variables = variables
 )
 
 private val advisorConfiguration = AdvisorConfiguration(

dao/src/test/kotlin/migrations/V73__deduplicatePackagesAndProjectsTest.kt

@@ -368,19 +368,13 @@ private val variables = mapOf(
     "TERM" to "xterm-256color"
 )
 
-private val toolVersions = mapOf(
-    "Conan" to "1.53.0",
-    "NPM" to "8.15.1"
-)
-
 private val environment = Environment(
     ortVersion = "1.0",
     javaVersion = "11.0.16",
     os = "Linux",
     processors = 8,
     maxMemory = 8321499136,
-    variables = variables,
-    toolVersions = toolVersions
+    variables = variables
 )
 
 private val identifier = Identifier(

dao/src/test/kotlin/repositories/advisorrun/DaoAdvisorRunRepositoryTest.kt

@@ -398,19 +398,13 @@ private val variables = mapOf(
     "TERM" to "xterm-256color"
 )
 
-private val toolVersions = mapOf(
-    "Conan" to "1.53.0",
-    "NPM" to "8.15.1"
-)
-
 private val environment = Environment(
     ortVersion = "1.0",
     javaVersion = "11.0.16",
     os = "Linux",
     processors = 8,
     maxMemory = 8321499136,
-    variables = variables,
-    toolVersions = toolVersions
+    variables = variables
 )
 
 private val scannerRun = ScannerRun(