DSP-667 CI is failing to test upgrade correctly (#1773)

Makefile

@@ -186,15 +186,9 @@ stack-status:
 stack-down: ## stops the knora-stack.
 	docker-compose -f docker-compose.yml down
 
-.PHONY: stack-down-delete-volumes
-stack-down-delete-volumes: ## stops the knora-stack and delete any created volumes (deletes the database!).
-	docker-compose -f docker-compose.yml down --volumes
-
 .PHONY: stack-db-remove
-stack-db-remove: ## stops Fuseki and webapi, and deletes any created volumes (deletes the database!).
-	docker-compose -f docker-compose.yml stop api
-	docker-compose -f docker-compose.yml rm -f -v -s db
-	@docker volume rm -f knora-api_db-home
+stack-db-remove: ## stops the knora-stack and deletes any created volumes (deletes the database!).
+	docker-compose -f docker-compose.yml down --volumes
 
 .PHONY: stack-config
 stack-config: env-file
@@ -253,7 +247,7 @@ client-test-data: docker-build ## runs the dsp-api e2e tests and generates clien
 
 .PHONY: test-it
 test-it: docker-build ## runs the dsp-api integration tests.
-	bazel test //webapi/src/it/...
+	bazel test //webapi/src/test/scala/org/knora/webapi/it/...
 
 .PHONY: test-salsah1
 test-salsah1: docker-build ## runs salsah1 headless browser tests
@@ -270,7 +264,7 @@ test-repository-upgrade: init-db-test-minimal ## runs DB upgrade integration tes
 	$(CURRENT_DIR)/webapi/scripts/fuseki-upload-repository.sh -r knora-test -u admin -p test -h localhost:3030 $(CURRENT_DIR)/.tmp/knora-test-data/v7.0.0/v7.0.0-knora-test.trig
 	# call target which restarts the API and emits error if API does not start
 	# after a certain time. at startup, data should be upgraded.
-	@$(MAKE) -f $(THIS_FILE) stack-up || $(MAKE) -f $(THIS_FILE) stack-logs-api-no-follow
+	@$(MAKE) -f $(THIS_FILE) stack-up
 
 .PHONY: test
 test: docker-build ## runs all test targets.

webapi/BUILD.bazel

@@ -153,7 +153,6 @@ scala_library(
         "//webapi/src/main/scala/org/knora/webapi/app",
         "//webapi/src/main/scala/org/knora/webapi/core",
         "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/http/directives",
         "//webapi/src/main/scala/org/knora/webapi/http/handler",
         "//webapi/src/main/scala/org/knora/webapi/instrumentation",
         "//webapi/src/main/scala/org/knora/webapi/messages",
@@ -188,61 +187,3 @@ scala_library(
         "@maven//:redis_clients_jedis",
     ],
 )
-
-# Should be removed, after each scala_test rule is refactored to use direct
-# dependencies to the needed packages.
-scala_library(
-    name = "it_library",
-    testonly = True,
-    srcs = [
-        "//webapi/src/it/scala/org/knora/webapi:src",
-    ],
-    resources = [
-        "//sipi/config",
-        "//webapi/src/it/resources",
-    ],
-    unused_dependency_checker_mode = "warn",
-    runtime_deps = [
-        "@maven//:ch_qos_logback_logback_classic",
-        "@maven//:ch_qos_logback_logback_core",
-        "@maven//:com_typesafe_akka_akka_slf4j_2_12",
-        "@maven//:org_slf4j_log4j_over_slf4j",
-    ],
-    deps = [
-        "//webapi:test_library",
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/app",
-        "//webapi/src/main/scala/org/knora/webapi/core",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/feature",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/routing",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "//webapi/src/main/scala/org/knora/webapi/util",
-        # Logging
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_12",
-        "@maven//:org_slf4j_slf4j_api",
-        # Akka
-        "@maven//:com_typesafe_akka_akka_actor_2_12",
-        "@maven//:com_typesafe_akka_akka_http_2_12",
-        "@maven//:com_typesafe_akka_akka_http_core_2_12",
-        "@maven//:com_typesafe_akka_akka_http_spray_json_2_12",
-        "@maven//:com_typesafe_akka_akka_parsing_2_12",
-        "@maven//:com_typesafe_akka_akka_stream_2_12",
-        "@maven//:com_typesafe_config",
-        "@maven//:io_spray_spray_json_2_12",
-        "@maven//:org_scala_lang_modules_scala_xml_2_12",
-        "@maven//:org_scala_lang_scala_library",
-        "@maven//:org_scala_lang_scala_reflect",
-        "@maven//:org_scalactic_scalactic_2_12",
-        "@maven//:org_scalatest_scalatest_core_2_12",
-        "@maven//:org_scalatest_scalatest_wordspec_2_12",
-        "@maven//:org_scalatest_scalatest_matchers_core_2_12",
-        "@maven//:org_scalatest_scalatest_shouldmatchers_2_12",
-        "@maven//:org_scalatest_scalatest_compatible",
-        "@maven//:org_testcontainers_testcontainers",
-        "@maven//:junit_junit",
-        "@maven//:org_xmlunit_xmlunit_core",
-    ],
-)