From 2874f131c0703d9e3caca665e85e0bbababc99cb Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Mon, 6 May 2024 11:57:00 +0300 Subject: [PATCH 1/2] [#331] Allow downgrade version without upgrade task --- .../java/org/opends/server/tools/upgrade/Upgrade.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java index 24e5a52d35..132d3bf2a2 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java +++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java @@ -726,10 +726,13 @@ private static UpgradeTask convertJEBackendsToPDBBackends(final String objectCla private static List getUpgradeTasks(final BuildVersion fromVersion, final BuildVersion toVersion) { final List tasks = new LinkedList<>(); - for (final List subList : TASKS.subMap(fromVersion, false, - toVersion, true).values()) - { - tasks.addAll(subList); + try { + for (final List subList : TASKS.subMap(fromVersion, false, + toVersion, true).values()) { + tasks.addAll(subList); + } + }catch (IllegalArgumentException e) { + logger.warn(LocalizableMessage.raw("Downgrade: "+e.getMessage())); } tasks.addAll(MANDATORY_TASKS); return tasks; From 9e9bea3c70c7f4c69b65e90a2a455f0fff65090b Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Mon, 6 May 2024 11:58:01 +0300 Subject: [PATCH 2/2] [#331] Allow downgrade version without upgrade task --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bcd61b65c5..762854e263 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: java: [ '8','11','17','21'] - os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ] + os: [ 'ubuntu-latest', 'macos-12', 'windows-latest' ] fail-fast: false steps: - name: Install wine+rpm for distribution