From 6714898bc9838312ac753ddbd570673705fc4e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Kleinb=C3=B6lting?= Date: Thu, 14 Mar 2024 15:21:19 +0100 Subject: [PATCH] fix: Disable broken upgrade plugins (#3117) --- webapi/src/main/resources/knora-ontologies/knora-base.ttl | 2 +- webapi/src/main/scala/org/knora/webapi/package.scala | 2 +- .../store/triplestore/upgrade/RepositoryUpdatePlan.scala | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/webapi/src/main/resources/knora-ontologies/knora-base.ttl b/webapi/src/main/resources/knora-ontologies/knora-base.ttl index 910c3492c6..a9657aa5eb 100644 --- a/webapi/src/main/resources/knora-ontologies/knora-base.ttl +++ b/webapi/src/main/resources/knora-ontologies/knora-base.ttl @@ -19,7 +19,7 @@ rdf:type owl:Ontology ; rdfs:label "The Knora base ontology"@en ; :attachedToProject knora-admin:SystemProject ; - :ontologyVersion "knora-base v30" . + :ontologyVersion "knora-base v28" . ################################################################# diff --git a/webapi/src/main/scala/org/knora/webapi/package.scala b/webapi/src/main/scala/org/knora/webapi/package.scala index 3c51e25537..a340373862 100644 --- a/webapi/src/main/scala/org/knora/webapi/package.scala +++ b/webapi/src/main/scala/org/knora/webapi/package.scala @@ -11,7 +11,7 @@ package object webapi { * The version of `knora-base` and of the other built-in ontologies that this version of Knora requires. * Must be the same as the object of `knora-base:ontologyVersion` in the `knora-base` ontology being used. */ - val KnoraBaseVersion: String = "knora-base v30" + val KnoraBaseVersion: String = "knora-base v28" /** * `IRI` is a synonym for `String`, used to improve code readability. diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala index 37994a324f..c79dc659b6 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala @@ -8,7 +8,6 @@ package org.knora.webapi.store.triplestore.upgrade import com.typesafe.scalalogging.Logger import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject -import org.knora.webapi.store.triplestore.upgrade.plugins.UpgradePluginPR3110 import org.knora.webapi.store.triplestore.upgrade.plugins.* /** @@ -64,8 +63,8 @@ object RepositoryUpdatePlan { PluginForKnoraBaseVersion(versionNumber = 26, plugin = new MigrateOnlyBuiltInGraphs), // PR 3003 PluginForKnoraBaseVersion(versionNumber = 27, plugin = new MigrateOnlyBuiltInGraphs), // PR 3026 PluginForKnoraBaseVersion(versionNumber = 28, plugin = new MigrateOnlyBuiltInGraphs), // PR 3038 - PluginForKnoraBaseVersion(versionNumber = 29, plugin = new UpgradePluginPR3110()), - PluginForKnoraBaseVersion(versionNumber = 30, plugin = new UpgradePluginPR3111()), +// PluginForKnoraBaseVersion(versionNumber = 29, plugin = new UpgradePluginPR3110()), +// PluginForKnoraBaseVersion(versionNumber = 30, plugin = new UpgradePluginPR3111()), // KEEP IT ON THE BOTTOM // From "versionNumber = 6" don't use prBasedVersionString! )