Merge branch 'stable-3.6'

* stable-3.6:
  Fix compilation errors against stable-3.6

Change-Id: I6b53f916bc04589d813df652ad28a4c71165d3a0

src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java
index d05e541..7cd965c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java
@@ -25,7 +25,7 @@
 import com.googlesource.gerrit.plugins.its.base.its.ItsFacade;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 
 /** Extractor to translate the various {@code *Attribute}s to properties. */
 class PropertyAttributeExtractor {

src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java
index 8ca3d5b..58b4b38 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java
@@ -22,7 +22,7 @@
 import com.google.gerrit.entities.Change;
 import com.google.gerrit.entities.Project;
 import com.googlesource.gerrit.plugins.its.base.testutil.log.LogUtil;
-import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.Iterator;
 import java.util.logging.LogRecord;
 import junit.framework.TestCase;
@@ -147,6 +147,6 @@
         testChangeId,
         testAccountId,
         BranchNameKey.create(Project.nameKey(project), branch),
-        new Timestamp(System.currentTimeMillis()));
+        Instant.now());
   }
 }

src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/log/LogUtil.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/log/LogUtil.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/log/LogUtil.java
index 17830db..fe69fbd 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/log/LogUtil.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/log/LogUtil.java
@@ -132,7 +132,8 @@
    * @return The corresponding JUL LogRecord
    */
   public static LogRecord logRecordFromLog4jLoggingEvent(LoggingEvent event) {
-    LogRecord logRecord = new LogRecord(Level.ALL, event.getRenderedMessage());
+    LogRecord logRecord =
+        new LogRecord(log4jToJul.get(event.getLevel()), event.getRenderedMessage());
     ThrowableInformation tInfo = event.getThrowableInformation();
     if (tInfo != null) {
       logRecord.setThrown(tInfo.getThrowable());