This is an automated email from the ASF dual-hosted git repository.
gaurava pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7c9811062de YARN-11783. Upgrade wro4j to 1.8.0 (#7457)
7c9811062de is described below
commit 7c9811062de0c5243561e33d51ee678a729aec17
Author: Gautham B A <gautham.bangal...@gmail.com>
AuthorDate: Tue Mar 4 16:19:19 2025 +0530
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.
---
LICENSE-binary | 1 +
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml | 10 +---------
.../src/main/webapp/WEB-INF/wro.properties | 16 ++++++++++++++++
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index a7893dc0739..917aa4751fc 100644
--- a/LICENSE-binary
+++ b/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
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 eadf3ba1f38..8b42a0c8dd3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/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>
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/wro.properties
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/wro.properties
new file mode 100644
index 00000000000..9c8efa302ed
--- /dev/null
+++
b/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
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
