diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 41707f5002414..8eaa8f9bde359 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -241,7 +241,8 @@ org.mockito - mockito-core + mockito-inline + ${mockito-inline.version} test diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index baca814eccbda..2584350c04d88 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -166,7 +166,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.mockito - mockito-core + mockito-inline + ${mockito-inline.version} test diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index b2176ccaa90d7..c53ad67b05a3f 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -106,7 +106,7 @@ 3.4.0 27.0-jre - 4.2.3 + 5.1.0 1.68 @@ -208,6 +208,8 @@ 3.12.2 3.9.0 1.5.6 + 3.6.28 + 3.11.2 8.11.2 1.1.3.Final 1.0.2 @@ -1306,8 +1308,8 @@ org.mockito mockito-core - ${mockito.version} - test + ${mockito-core.version} + provided org.mockito diff --git a/hadoop-tools/hadoop-sls/pom.xml b/hadoop-tools/hadoop-sls/pom.xml index 208cbdf6c142a..61ac1271f6725 100644 --- a/hadoop-tools/hadoop-sls/pom.xml +++ b/hadoop-tools/hadoop-sls/pom.xml @@ -53,6 +53,18 @@ metrics-core compile + + org.graalvm.js + js + 22.0.0 + test + + + org.graalvm.js + js-scriptengine + 22.0.0 + test + org.eclipse.jetty jetty-server diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index f85d875bf490b..88074a6e2b78a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -110,7 +110,8 @@ org.mockito - mockito-core + mockito-inline + ${mockito-inline.version} test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index d36ca02d7d099..e2d804a03fe23 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -47,6 +47,18 @@ org.slf4j slf4j-api + + org.graalvm.js + js + 22.0.0 + provided + + + org.graalvm.js + js-scriptengine + 22.0.0 + provided + org.apache.hadoop diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/MetricsInvariantChecker.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/MetricsInvariantChecker.java index 2ea44d2aa67fb..634930232f990 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/MetricsInvariantChecker.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/MetricsInvariantChecker.java @@ -94,7 +94,7 @@ public void init(Configuration config, RMContext rmContext, // prepare bindings and evaluation engine this.bindings = new SimpleBindings(); this.manager = new ScriptEngineManager(); - this.scriptEngine = (Compilable) manager.getEngineByName("JavaScript"); + this.scriptEngine = (Compilable) manager.getEngineByName("graal.js"); // load metrics invariant from file this.invariantFile = getConf().get(MetricsInvariantChecker.INVARIANTS_FILE); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml index 56089a42ea87b..72d937e4a5ea1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml @@ -58,8 +58,8 @@ org.mockito - mockito-core - 2.8.9 + mockito-inline + ${mockito-inline.version} test @@ -71,25 +71,33 @@ org.powermock powermock-api-mockito2 - 1.7.1 + 2.0.0 test - org.mockito - mockito-core - + net.bytebuddy + byte-buddy + + + net.bytebuddy + byte-buddy-agent + org.powermock powermock-module-junit4 - 1.7.1 + 2.0.0 test - org.mockito - mockito-core + net.bytebuddy + byte-buddy + + net.bytebuddy + byte-buddy-agent + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml index 15df5456810ce..50f65407162e3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml @@ -66,7 +66,8 @@ org.mockito - mockito-core + mockito-inline + ${mockito-inline.version} test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml index e18a7eac3387d..b9f93809b7389 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml @@ -274,9 +274,9 @@ org.mockito - mockito-core - 2.18.0 - + mockito-inline + ${mockito-inline.version} + diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml index 78f09a3971069..62a8e0def2e2c 100644 --- a/hadoop-yarn-project/pom.xml +++ b/hadoop-yarn-project/pom.xml @@ -93,6 +93,7 @@ org.mockito mockito-core + ${mockito-core.version} test