diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java index df92d31..2d5708f 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java @@ -16,10 +16,8 @@ */ package org.apache.jackrabbit.oak.upgrade.cli; -import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.regex.Pattern; import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.oak.upgrade.cli.parser.CliArgumentException; @@ -88,19 +86,4 @@ public class CliUtils { } }); } - - public static void backupOldJcr2Files(String repositoryDirPath) { - // backup old jcr2 files when doing an in-place upgrade - File repositoryDir = new File(repositoryDirPath); - File crx2 = new File(repositoryDir, "crx2"); - log.info("Moving existing repository under {}", crx2.getAbsolutePath()); - crx2.mkdir(); - Pattern pattern = Pattern.compile("crx2|segmentstore"); - for (File file : repositoryDir.listFiles()) { - String name = file.getName(); - if (!pattern.matcher(name).matches()) { - file.renameTo(new File(crx2, name)); - } - } - } } diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java index 821bbca..9387076 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java @@ -59,9 +59,6 @@ public class OakUpgrade { } finally { closer.close(); } - if (stores.isInPlaceUpgrade()) { - CliUtils.backupOldJcr2Files(stores.getSrcPaths()[0]); - } } private static void upgrade(MigrationFactory migrationFactory) throws IOException, RepositoryException {