This is an automated email from the ASF dual-hosted git repository.
nanda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 5e273a48da9 HDDS-12977. Fail build on dependency problems (#8574)
5e273a48da9 is described below
commit 5e273a48da9faaeb5ae1102c68c9148d75b3a1ae
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Jun 9 10:35:22 2025 +0200
HDDS-12977. Fail build on dependency problems (#8574)
---
.github/workflows/ci.yml | 3 +++
.../java/org/apache/hadoop/hdds/conf/ReconfigurableBase.java | 11 ++---------
hadoop-ozone/ozonefs-hadoop2/pom.xml | 1 +
hadoop-ozone/ozonefs-hadoop3/pom.xml | 1 +
hadoop-ozone/ozonefs-shaded/pom.xml | 1 +
pom.xml | 1 +
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f1bc6bb5288..04c944c9b4a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -265,7 +265,10 @@ jobs:
integration:
needs:
- build-info
+ - build
- basic
+ - dependency
+ - license
if: needs.build-info.outputs.needs-integration-tests == 'true'
uses: ./.github/workflows/check.yml
secrets: inherit
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/ReconfigurableBase.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/ReconfigurableBase.java
index 3d3f7e29662..70e7d6ff72c 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/ReconfigurableBase.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/ReconfigurableBase.java
@@ -25,7 +25,6 @@
import java.util.Map;
import java.util.Optional;
import java.util.function.Consumer;
-import org.apache.hadoop.classification.VisibleForTesting;
import org.apache.hadoop.conf.ConfigRedactor;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
@@ -42,7 +41,6 @@
*/
public abstract class ReconfigurableBase extends Configured implements
Reconfigurable {
private static final Logger LOG =
LoggerFactory.getLogger(ReconfigurableBase.class);
- private final ReconfigurationUtil reconfigurationUtil = new
ReconfigurationUtil();
private Thread reconfigThread = null;
private volatile boolean shouldRun = true;
private final Object reconfigLock = new Object();
@@ -57,12 +55,6 @@ public ReconfigurableBase(Configuration conf) {
protected abstract Configuration getNewConf();
- @VisibleForTesting
- public Collection<ReconfigurationUtil.PropertyChange>
getChangedProperties(Configuration newConf,
- Configuration oldConf) {
- return this.reconfigurationUtil.parseChangedProperties(newConf, oldConf);
- }
-
public void startReconfigurationTask() throws IOException {
synchronized (this.reconfigLock) {
String errorMessage;
@@ -150,7 +142,8 @@ public void run() {
LOG.info("Starting reconfiguration task.");
Configuration oldConf = this.parent.getConf();
Configuration newConf = this.parent.getNewConf();
- Collection<ReconfigurationUtil.PropertyChange> changes =
this.parent.getChangedProperties(newConf, oldConf);
+ Collection<ReconfigurationUtil.PropertyChange> changes =
+ ReconfigurationUtil.getChangedProperties(newConf, oldConf);
Map<ReconfigurationUtil.PropertyChange, Optional<String>> results =
Maps.newHashMap();
ConfigRedactor oldRedactor = new ConfigRedactor(oldConf);
ConfigRedactor newRedactor = new ConfigRedactor(newConf);
diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml
b/hadoop-ozone/ozonefs-hadoop2/pom.xml
index f7aba1ab438..a82e3189ebd 100644
--- a/hadoop-ozone/ozonefs-hadoop2/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml
@@ -24,6 +24,7 @@
<packaging>jar</packaging>
<name>Apache Ozone FS Hadoop 2.x compatibility</name>
<properties>
+ <mdep.analyze.skip>true</mdep.analyze.skip>
<shaded.prefix>org.apache.hadoop.ozone.shaded</shaded.prefix>
</properties>
<dependencies>
diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml
b/hadoop-ozone/ozonefs-hadoop3/pom.xml
index 0535abe3109..7834b18a24b 100644
--- a/hadoop-ozone/ozonefs-hadoop3/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml
@@ -26,6 +26,7 @@
<properties>
<!-- no tests in this module so far -->
<maven.test.skip>true</maven.test.skip>
+ <mdep.analyze.skip>true</mdep.analyze.skip>
<shaded.prefix>org.apache.hadoop.ozone.shaded</shaded.prefix>
</properties>
<dependencies>
diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml
b/hadoop-ozone/ozonefs-shaded/pom.xml
index c5e5d4f0ea1..245a597243f 100644
--- a/hadoop-ozone/ozonefs-shaded/pom.xml
+++ b/hadoop-ozone/ozonefs-shaded/pom.xml
@@ -27,6 +27,7 @@
<properties>
<!-- no tests in this module so far -->
<maven.test.skip>true</maven.test.skip>
+ <mdep.analyze.skip>true</mdep.analyze.skip>
<ozone.shaded.native.prefix>org_apache_ozone_shaded</ozone.shaded.native.prefix>
<!-- refer to ratis thirdparty ratis.thirdparty.shaded.native.prefix -->
<ratis.thirdparty.shaded.native.prefix>org_apache_ratis_thirdparty_</ratis.thirdparty.shaded.native.prefix>
diff --git a/pom.xml b/pom.xml
index d670d6f1fd5..8c3cdc38db2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2178,6 +2178,7 @@
<goal>analyze-only</goal>
</goals>
<configuration>
+ <failOnWarning>true</failOnWarning>
<ignoreNonCompile>true</ignoreNonCompile>
<excludedClasses>
<!-- disabled test -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
