From 8bf05d16714ec5ec23bec6d169b4b8201c463ce4 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 28 Nov 2016 15:37:15 +0000
Subject: [PATCH] OPENDJ-3527 OPENDJ-3531 OPENDJ-1633 Fix tools bootstrap

---
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java |    8 +-------
 1 files changed, 1 insertions(+), 7 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 c142d82..24e5a52 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
@@ -133,10 +133,6 @@
             "ds-cfg-java-class: org.opends.server.extensions.PKCS5S2PasswordStorageScheme",
             "ds-cfg-enabled: true"));
 
-    /* See OPENDJ-1322 and OPENDJ-1067 */
-    register("2.8.0",
-        rerunJavaPropertiesTool(INFO_UPGRADE_TASK_9206_SUMMARY.get()));
-
     register("2.8.0",
         modifyConfigEntry(INFO_UPGRADE_TASK_10214_SUMMARY.get(),
           "(ds-cfg-java-class=org.opends.server.loggers.debug.TextDebugLogPublisher)",
@@ -611,9 +607,7 @@
             "objectClass: ds-cfg-local-backend")
     );
     register("4.0.0", moveSubordinateBaseDnToGlobalConfiguration());
-    register("4.0.0",
-             removeTools("ldif-diff", "make-ldif")
-    );
+    register("4.0.0", removeTools("ldif-diff", "make-ldif", "dsjavaproperties"));
 
     /* All upgrades will refresh the server configuration schema and generate a new upgrade folder. */
     registerLast(

--
Gitblit v1.10.0