Skip to content

Commit 7c98110

Browse files
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.
1 parent eda1236 commit 7c98110

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

LICENSE-binary

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ org.objenesis:objenesis:2.6
362362
org.xerial.snappy:snappy-java:1.1.10.4
363363
org.yaml:snakeyaml:2.0
364364
org.wildfly.openssl:wildfly-openssl:2.1.4.Final
365+
ro.isdc.wro4j:wro4j-maven-plugin:1.8.0
365366
software.amazon.awssdk:bundle:2.25.53
366367
net.jodah:failsafe:2.4.4
367368

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,7 @@
269269
<plugin>
270270
<groupId>ro.isdc.wro4j</groupId>
271271
<artifactId>wro4j-maven-plugin</artifactId>
272-
<version>1.7.9</version>
273-
<dependencies>
274-
<!-- TODO: Remove this dependency after upgrading wro4j-maven-plugin to 1.8.1 or later. -->
275-
<dependency>
276-
<groupId>org.mockito</groupId>
277-
<artifactId>mockito-inline</artifactId>
278-
<version>4.11.0</version>
279-
</dependency>
280-
</dependencies>
272+
<version>1.8.0</version>
281273
<executions>
282274
<execution>
283275
<phase>prepare-package</phase>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# Licensed under the Apache License, Version 2.0 (the "License");
3+
# you may not use this file except in compliance with the License.
4+
# You may obtain a copy of the License at
5+
#
6+
# http://www.apache.org/licenses/LICENSE-2.0
7+
#
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License. See accompanying LICENSE file.
13+
#
14+
15+
groups.vendor=vendor.js
16+
groups.yarn-ui=yarn-ui.js

0 commit comments

Comments
 (0)