diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml
index 96b4cb0ba607..f24f0253de32 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -65,6 +65,12 @@
org.apache.ozone
ozone-s3gateway
+
+
+ *
+ *
+
+
org.apache.ozone
@@ -92,12 +98,6 @@
hadoop-common
test-jar
test
-
-
- com.sun.jersey
- jersey-servlet
-
-
org.apache.hadoop
@@ -153,10 +153,6 @@
ch.qos.reload4j
reload4j
-
- com.sun.jersey
- jersey-servlet
-
log4j
log4j
@@ -177,10 +173,6 @@
ch.qos.reload4j
reload4j
-
- com.sun.jersey
- jersey-servlet
-
log4j
log4j
@@ -195,12 +187,6 @@
org.apache.hadoop
hadoop-mapreduce-client-core
test
-
-
- com.sun.jersey
- jersey-servlet
-
-
org.apache.hadoop
@@ -211,10 +197,6 @@
ch.qos.reload4j
reload4j
-
- com.sun.jersey
- jersey-servlet
-
log4j
log4j
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
index 0947e354a0d7..35d4dae2d2fa 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
@@ -112,7 +112,6 @@
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.tag.Flaky;
-import org.apache.ozone.test.tag.Unhealthy;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -120,7 +119,6 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
-@Unhealthy("HDDS-11879")
class TestOzoneAtRestEncryption {
private static MiniOzoneCluster cluster = null;
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
index d1aa84c5808a..d7fbce84f1ee 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
@@ -99,7 +99,6 @@
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.ToolRunner;
import org.apache.ozone.test.GenericTestUtils;
-import org.apache.ozone.test.tag.Unhealthy;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
@@ -169,7 +168,7 @@ public void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
conf.setBoolean(OZONE_HBASE_ENHANCEMENTS_ALLOWED, true);
conf.setBoolean(OZONE_FS_HSYNC_ENABLED, true);
- // startKMS();
+ startKMS();
startCluster(conf);
}
@@ -1809,7 +1808,6 @@ public void testSetECReplicationConfigOnBucket() throws Exception {
}
@Test
- @Unhealthy("HDDS-11879")
public void testSetEncryptionKey() throws Exception {
final String volumeName = "volume111";
getVolume(volumeName);
@@ -2489,7 +2487,6 @@ public void testKeyDeleteLegacyWithEnableFileSystemPath() throws IOException {
}
private static String getKeyProviderURI(MiniKMS kms) {
- // HDDS-11879
if (kms == null) {
return "";
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHAWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHAWithFSO.java
index 0fde4ab88c46..a5e9ebd04205 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHAWithFSO.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHAWithFSO.java
@@ -41,7 +41,7 @@ public void init() throws Exception {
conf.setBoolean(OzoneConfigKeys.OZONE_HBASE_ENHANCEMENTS_ALLOWED, true);
conf.setBoolean("ozone.client.hbase.enhancements.allowed", true);
conf.setBoolean(OzoneConfigKeys.OZONE_FS_HSYNC_ENABLED, true);
- // startKMS();
+ startKMS();
startCluster(conf);
}
}