瀏覽代碼

YARN-11783. Upgrade wro4j to 1.8.0 (#7457)

* There was a change to upgrade Mockito
  to 4.11.0 in HADOOP-19243. Github
  PR #6968.
* This broke the build on Windows in the
  hadoop-yarn-ui module.
* This PR upgrades the version wro4j to
  1.8.0 to get rid of its dependency on
  mockito, in order to fix the build failure
  of hadoop-yarn-ui module.
Gautham B A 2 月之前
父節點
當前提交
7c9811062d

+ 1 - 0
LICENSE-binary

@@ -362,6 +362,7 @@ org.objenesis:objenesis:2.6
 org.xerial.snappy:snappy-java:1.1.10.4
 org.yaml:snakeyaml:2.0
 org.wildfly.openssl:wildfly-openssl:2.1.4.Final
+ro.isdc.wro4j:wro4j-maven-plugin:1.8.0
 software.amazon.awssdk:bundle:2.25.53
 net.jodah:failsafe:2.4.4
 

+ 1 - 9
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml

@@ -269,15 +269,7 @@
           <plugin>
             <groupId>ro.isdc.wro4j</groupId>
             <artifactId>wro4j-maven-plugin</artifactId>
-            <version>1.7.9</version>
-            <dependencies>
-              <!-- TODO: Remove this dependency after upgrading wro4j-maven-plugin to 1.8.1 or later. -->
-              <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-inline</artifactId>
-                <version>4.11.0</version>
-              </dependency>
-            </dependencies>
+            <version>1.8.0</version>
             <executions>
               <execution>
                 <phase>prepare-package</phase>

+ 16 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/wro.properties

@@ -0,0 +1,16 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License. See accompanying LICENSE file.
+#
+
+groups.vendor=vendor.js
+groups.yarn-ui=yarn-ui.js