Automatic merge from branch-5.3

* origin/branch-5.3:
  SONAR-7093 Allow projects to define their leak period
  fix display of date leak period

1 files changed, 11 insertions, 2 deletions

diff --git a/it/it-tests/src/test/java/util/ItUtils.java b/it/it-tests/src/test/java/util/ItUtils.java
index b25b564479f..865790b75a5 100644
--- a/it/it-tests/src/test/java/util/ItUtils.java
+++ b/it/it-tests/src/test/java/util/ItUtils.java
@@ -220,10 +220,14 @@ public class ItUtils {
   }
 
   public static void setServerProperty(Orchestrator orchestrator, String key, @Nullable String value) {
+    setServerProperty(orchestrator, null, key, value);
+  }
+
+  public static void setServerProperty(Orchestrator orchestrator, @Nullable  String componentKey, String key, @Nullable String value) {
     if (value == null) {
-      orchestrator.getServer().getAdminWsClient().delete(new PropertyDeleteQuery(key));
+      orchestrator.getServer().getAdminWsClient().delete(new PropertyDeleteQuery(key).setResourceKeyOrId(componentKey));
     } else {
-      orchestrator.getServer().getAdminWsClient().update(new PropertyUpdateQuery().setKey(key).setValue(value));
+      orchestrator.getServer().getAdminWsClient().update(new PropertyUpdateQuery().setKey(key).setResourceKeyOrId(componentKey).setValue(value));
     }
   }
 
@@ -267,4 +271,9 @@ public class ItUtils {
     }
   }
 
+  public static String formatDate(Date d) {
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+    return sdf.format(d);
+  }
+
 }