You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2026/10/24 18:07:59 UTC
(ozone) branch master updated: HDDS-15748. Create submodule ozone-cli-local for Ozone Local (#11735)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 1acf315d546 HDDS-15748. Create submodule ozone-cli-local for Ozone Local (#11735)
1acf315d546 is described below
commit 1acf315d5467a18f125f1e516e42741556cfcdc5
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Sat Oct 24 20:07:52 2026 +0200
HDDS-15748. Create submodule ozone-cli-local for Ozone Local (#11735)
---
.../cli-local/dev-support/findbugsExcludeFile.xml | 19 +++++++
hadoop-ozone/{tools => cli-local}/pom.xml | 63 +++++++++++++---------
.../hadoop/ozone/local/LocalOzoneCluster.java | 0
.../ozone/local/LocalOzoneClusterConfig.java | 0
.../hadoop/ozone/local/LocalOzoneRuntime.java | 0
.../org/apache/hadoop/ozone/local/OzoneLocal.java | 0
.../apache/hadoop/ozone/local/package-info.java | 0
.../hadoop/ozone/local/TestLocalOzoneCluster.java | 0
.../ozone/local/TestLocalOzoneClusterConfig.java | 0
.../ozone/local/TestLocalOzoneClusterRuntime.java | 0
.../hadoop/ozone/local/TestLocalOzoneRecon.java | 0
.../hadoop/ozone/local/TestLocalOzoneS3.java | 0
.../apache/hadoop/ozone/local/TestOzoneLocal.java | 0
.../hadoop/ozone/ClientConfigForTesting.java | 0
hadoop-ozone/dist/pom.xml | 5 ++
hadoop-ozone/dist/src/main/license/jar-report.txt | 1 +
hadoop-ozone/dist/src/shell/ozone/ozone | 2 +-
hadoop-ozone/integration-test-recon/pom.xml | 5 --
hadoop-ozone/integration-test-s3/pom.xml | 22 --------
hadoop-ozone/integration-test/pom.xml | 11 ----
hadoop-ozone/mini-cluster/pom.xml | 9 ++--
hadoop-ozone/pom.xml | 1 +
hadoop-ozone/tools/pom.xml | 28 ----------
pom.xml | 14 +++++
24 files changed, 85 insertions(+), 95 deletions(-)
diff --git a/hadoop-ozone/cli-local/dev-support/findbugsExcludeFile.xml b/hadoop-ozone/cli-local/dev-support/findbugsExcludeFile.xml
new file mode 100644
index 00000000000..55abc263017
--- /dev/null
+++ b/hadoop-ozone/cli-local/dev-support/findbugsExcludeFile.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<FindBugsFilter>
+</FindBugsFilter>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/cli-local/pom.xml
similarity index 89%
copy from hadoop-ozone/tools/pom.xml
copy to hadoop-ozone/cli-local/pom.xml
index ca04dca1f01..f2c93d0ac9f 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/cli-local/pom.xml
@@ -19,34 +19,21 @@
<artifactId>ozone</artifactId>
<version>2.3.0-SNAPSHOT</version>
</parent>
- <artifactId>ozone-tools</artifactId>
+ <artifactId>ozone-cli-local</artifactId>
<version>2.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Apache Ozone Tools</name>
- <description>Apache Ozone Tools</description>
+ <name>Apache Ozone Local</name>
+ <description>Apache Ozone Local</description>
<properties>
<classpath.skip>false</classpath.skip>
- <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
</properties>
<dependencies>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
</dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
@@ -99,14 +86,6 @@
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-shell</artifactId>
- </dependency>
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -174,6 +153,42 @@
<artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-client</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>auth</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>aws-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>regions</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>s3</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>sdk-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/local/LocalOzoneCluster.java b/hadoop-ozone/cli-local/src/main/java/org/apache/hadoop/ozone/local/LocalOzoneCluster.java
similarity index 100%
rename from hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/local/LocalOzoneCluster.java
rename to hadoop-ozone/cli-local/src/main/java/org/apache/hadoop/ozone/local/LocalOzoneCluster.java
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/local/LocalOzoneClusterConfig.java b/hadoop-ozone/cli-local/src/main/java/org/apache/hadoop/ozone/local/LocalOzoneClusterConfig.java
similarity index 100%
rename from hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/local/LocalOzoneClusterConfig.java
rename to hadoop-ozone/cli-local/src/main/java/org/apache/hadoop/ozone/local/LocalOzoneClusterConfig.java
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/local/LocalOzoneRuntime.java b/hadoop-ozone/cli-local/src/main/java/org/apache/hadoop/ozone/local/LocalOzoneRuntime.java
similarity index 100%
rename from hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/local/LocalOzoneRuntime.java
rename to hadoop-ozone/cli-local/src/main/java/org/apache/hadoop/ozone/local/LocalOzoneRuntime.java
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/local/OzoneLocal.java b/hadoop-ozone/cli-local/src/main/java/org/apache/hadoop/ozone/local/OzoneLocal.java
similarity index 100%
rename from hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/local/OzoneLocal.java
rename to hadoop-ozone/cli-local/src/main/java/org/apache/hadoop/ozone/local/OzoneLocal.java
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/local/package-info.java b/hadoop-ozone/cli-local/src/main/java/org/apache/hadoop/ozone/local/package-info.java
similarity index 100%
rename from hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/local/package-info.java
rename to hadoop-ozone/cli-local/src/main/java/org/apache/hadoop/ozone/local/package-info.java
diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneCluster.java b/hadoop-ozone/cli-local/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneCluster.java
similarity index 100%
rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneCluster.java
rename to hadoop-ozone/cli-local/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneCluster.java
diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneClusterConfig.java b/hadoop-ozone/cli-local/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneClusterConfig.java
similarity index 100%
rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneClusterConfig.java
rename to hadoop-ozone/cli-local/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneClusterConfig.java
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneClusterRuntime.java b/hadoop-ozone/cli-local/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneClusterRuntime.java
similarity index 100%
rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneClusterRuntime.java
rename to hadoop-ozone/cli-local/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneClusterRuntime.java
diff --git a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneRecon.java b/hadoop-ozone/cli-local/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneRecon.java
similarity index 100%
rename from hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneRecon.java
rename to hadoop-ozone/cli-local/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneRecon.java
diff --git a/hadoop-ozone/integration-test-s3/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneS3.java b/hadoop-ozone/cli-local/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneS3.java
similarity index 100%
rename from hadoop-ozone/integration-test-s3/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneS3.java
rename to hadoop-ozone/cli-local/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneS3.java
diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/local/TestOzoneLocal.java b/hadoop-ozone/cli-local/src/test/java/org/apache/hadoop/ozone/local/TestOzoneLocal.java
similarity index 100%
rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/local/TestOzoneLocal.java
rename to hadoop-ozone/cli-local/src/test/java/org/apache/hadoop/ozone/local/TestOzoneLocal.java
diff --git a/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/ClientConfigForTesting.java b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/ClientConfigForTesting.java
similarity index 100%
rename from hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/ClientConfigForTesting.java
rename to hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/ClientConfigForTesting.java
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 6aad4509573..7cdf560c273 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -87,6 +87,11 @@
<artifactId>ozone-cli-interactive</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-cli-local</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-cli-repair</artifactId>
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt
index 49eeece3b05..4510d52bdfa 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -242,6 +242,7 @@ share/ozone/lib/osgi-resource-locator.jar
share/ozone/lib/ozone-cli-admin.jar
share/ozone/lib/ozone-cli-debug.jar
share/ozone/lib/ozone-cli-interactive.jar
+share/ozone/lib/ozone-cli-local.jar
share/ozone/lib/ozone-cli-repair.jar
share/ozone/lib/ozone-cli-shell.jar
share/ozone/lib/ozone-client.jar
diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone b/hadoop-ozone/dist/src/shell/ozone/ozone
index d52e9d50b4d..88811258f8c 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone
@@ -211,7 +211,7 @@ function ozonecmd_case
;;
local)
OZONE_CLASSNAME=org.apache.hadoop.ozone.local.OzoneLocal
- OZONE_RUN_ARTIFACT_NAME="ozone-tools"
+ OZONE_RUN_ARTIFACT_NAME="ozone-cli-local"
;;
version)
OZONE_CLASSNAME=org.apache.hadoop.ozone.util.OzoneVersionInfo
diff --git a/hadoop-ozone/integration-test-recon/pom.xml b/hadoop-ozone/integration-test-recon/pom.xml
index cdb4b06a88c..0f1d46d926f 100644
--- a/hadoop-ozone/integration-test-recon/pom.xml
+++ b/hadoop-ozone/integration-test-recon/pom.xml
@@ -191,11 +191,6 @@
<artifactId>ozone-reconcodegen</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-tools</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-common</artifactId>
diff --git a/hadoop-ozone/integration-test-s3/pom.xml b/hadoop-ozone/integration-test-s3/pom.xml
index 9629f2ba31c..fb951dfbfa9 100644
--- a/hadoop-ozone/integration-test-s3/pom.xml
+++ b/hadoop-ozone/integration-test-s3/pom.xml
@@ -25,23 +25,6 @@
<name>Apache Ozone S3 Integration Tests</name>
<description>Apache Ozone Integration Tests with S3 Gateway</description>
- <properties>
- <!-- move to root POM when needed in any other module -->
- <aws-java-sdk2.version>2.55.6</aws-java-sdk2.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>bom</artifactId>
- <version>${aws-java-sdk2.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
@@ -149,11 +132,6 @@
<artifactId>ozone-s3gateway</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-tools</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-common</artifactId>
diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml
index 21388aa3aec..b9505460497 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -403,17 +403,6 @@
<artifactId>ozone-multitenancy-ranger</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-s3gateway</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-tools</artifactId>
diff --git a/hadoop-ozone/mini-cluster/pom.xml b/hadoop-ozone/mini-cluster/pom.xml
index 60b234bf9b4..8a47d4e4ed0 100644
--- a/hadoop-ozone/mini-cluster/pom.xml
+++ b/hadoop-ozone/mini-cluster/pom.xml
@@ -55,10 +55,6 @@
<artifactId>hadoop-common</artifactId>
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-client</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
@@ -105,6 +101,11 @@
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-client</artifactId>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-common</artifactId>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 1f9757c434e..80524d94a8e 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -28,6 +28,7 @@
<module>cli-admin</module>
<module>cli-debug</module>
<module>cli-interactive</module>
+ <module>cli-local</module>
<module>cli-repair</module>
<module>cli-shell</module>
<module>client</module>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index ca04dca1f01..533839297cf 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -63,38 +63,10 @@
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-config</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-admin</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-manager</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-recon</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-s3gateway</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-common</artifactId>
diff --git a/pom.xml b/pom.xml
index 0f1c3a4d5f5..83c47c7f3d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
<aspectj.java8.version>1.9.7</aspectj.java8.version>
<assertj.version>3.27.7</assertj.version>
<aws-java-sdk.version>1.12.788</aws-java-sdk.version>
+ <aws-java-sdk2.version>2.55.6</aws-java-sdk2.version>
<bonecp.version>0.8.0.RELEASE</bonecp.version>
<bouncycastle.version>1.86</bouncycastle.version>
<build-helper-maven-plugin.version>3.6.2</build-helper-maven-plugin.version>
@@ -322,6 +323,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>bom</artifactId>
+ <version>${aws-java-sdk2.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>aopalliance</groupId>
@@ -1298,6 +1306,11 @@
<artifactId>ozone-cli-interactive</artifactId>
<version>${ozone.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-cli-local</artifactId>
+ <version>${ozone.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-cli-repair</artifactId>
@@ -2390,6 +2403,7 @@
<ignoredNonTestScopedDependency>org.apache.ozone:ozone-interface-client:jar</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>org.glassfish.jersey.core:jersey-common:jar</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>org.rocksdb:rocksdbjni:jar</ignoredNonTestScopedDependency>
+ <ignoredNonTestScopedDependency>org.slf4j:slf4j-api</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>org.springframework:spring-core:jar</ignoredNonTestScopedDependency>
</ignoredNonTestScopedDependencies>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org