From 6599b684da0e6d6506a311441a0214f50e5fb3d6 Mon Sep 17 00:00:00 2001 From: Marcin Procyk Date: Thu, 23 Jun 2022 17:51:50 +0200 Subject: [PATCH] fix: fix RepositoryUpdater by removing old way of adding plugins (#2082) --- .../upgrade/RepositoryUpdatePlan.scala | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) 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 6c325dc580..97188e90d1 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 @@ -36,7 +36,11 @@ object RepositoryUpdatePlan { plugin = new UpgradePluginPR1372(featureFactoryConfig), prBasedVersionString = Some("PR 1372") ), - PluginForKnoraBaseVersion(versionNumber = 5, plugin = new NoopPlugin, prBasedVersionString = Some("PR 1440")), + PluginForKnoraBaseVersion( + versionNumber = 5, + plugin = new NoopPlugin, + prBasedVersionString = Some("PR 1440") + ), PluginForKnoraBaseVersion(versionNumber = 6, plugin = new NoopPlugin), // PR 1206 PluginForKnoraBaseVersion(versionNumber = 7, plugin = new NoopPlugin), // PR 1403 PluginForKnoraBaseVersion(versionNumber = 8, plugin = new UpgradePluginPR1615(featureFactoryConfig)), @@ -44,22 +48,12 @@ object RepositoryUpdatePlan { PluginForKnoraBaseVersion(versionNumber = 10, plugin = new NoopPlugin), // PR 1808 PluginForKnoraBaseVersion(versionNumber = 11, plugin = new NoopPlugin), // PR 1813 PluginForKnoraBaseVersion(versionNumber = 12, plugin = new NoopPlugin), // PR 1891 - PluginForKnoraBaseVersion( - versionNumber = 13, - plugin = new UpgradePluginPR1921(featureFactoryConfig, log), - prBasedVersionString = Some("PR 1921") - ), + PluginForKnoraBaseVersion(versionNumber = 13, plugin = new UpgradePluginPR1921(featureFactoryConfig, log)), PluginForKnoraBaseVersion(versionNumber = 14, plugin = new NoopPlugin), // PR 1992 - PluginForKnoraBaseVersion( - versionNumber = 20, - plugin = new UpgradePluginPR2018(featureFactoryConfig, log), - prBasedVersionString = Some("PR 2018") - ), - PluginForKnoraBaseVersion( - versionNumber = 21, - plugin = new UpgradePluginPR2079(featureFactoryConfig, log), - prBasedVersionString = Some("PR 2079") - ) + PluginForKnoraBaseVersion(versionNumber = 20, plugin = new UpgradePluginPR2018(featureFactoryConfig, log)), + PluginForKnoraBaseVersion(versionNumber = 21, plugin = new UpgradePluginPR2079(featureFactoryConfig, log)) + // KEEP IT ON THE BOTTOM + // From "versionNumber = 6" don't use prBasedVersionString! ) /**