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/03/24 10:57:38 UTC

(ozone) branch ozone-2.1 updated (7b572015971 -> 7da3351ac61)

This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a change to branch ozone-2.1
in repository https://gitbox.apache.org/repos/asf/ozone.git


    from 7b572015971 HDDS-14093. Timeout in xcompat-cluster-2.0.0-client-2.0.0-write (#9444)
     new b0fc4493bd6 HDDS-14858. OM request fails with ClassNotFoundException: java.lang.constant.Constable (#9945)
     new a0db1a1fba4 HDDS-14778. Append dot to relocation patterns in ozone-filesystem-shaded (#9893)
     new 4694d997290 HDDS-14085. Bump Hugo to 0.152.2 (#9441)
     new 199b86c70bd HDDS-10178. Shaded Jar build fails on case-insensitive filesystem (#6042)
     new 7da3351ac61 HDDS-13947. Stop managing plexus-archiver version (#9311)

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 hadoop-hdds/docs/content/feature/Quota.md       |  1 -
 hadoop-ozone/dev-support/checks/install/hugo.sh |  2 +-
 hadoop-ozone/ozone-manager/pom.xml              | 15 -------
 hadoop-ozone/ozonefs-hadoop2/pom.xml            |  6 +++
 hadoop-ozone/ozonefs-hadoop3-client/pom.xml     |  6 +++
 hadoop-ozone/ozonefs-hadoop3/pom.xml            |  6 +++
 hadoop-ozone/ozonefs-shaded/pom.xml             | 60 ++++++++++++-------------
 pom.xml                                         | 36 +++++++++++----
 8 files changed, 76 insertions(+), 56 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org


(ozone) 02/05: HDDS-14778. Append dot to relocation patterns in ozone-filesystem-shaded (#9893)

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch ozone-2.1
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit a0db1a1fba43081a4f21671a8c4f7cd0e263cc5e
Author: Jason O'Sullivan <ja...@gmail.com>
AuthorDate: Fri Mar 20 16:18:55 2026 +0000

    HDDS-14778. Append dot to relocation patterns in ozone-filesystem-shaded (#9893)
    
    (cherry picked from commit 0afee11a137c75cff6793b214d0ec7ec546fc12a)
---
 hadoop-ozone/ozonefs-shaded/pom.xml | 60 ++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml
index a03301d15d7..d801c5ae77c 100644
--- a/hadoop-ozone/ozonefs-shaded/pom.xml
+++ b/hadoop-ozone/ozonefs-shaded/pom.xml
@@ -193,13 +193,12 @@
               </transformers>
               <relocations>
                 <relocation>
-                  <pattern>org</pattern>
-                  <shadedPattern>${shaded.prefix}.org</shadedPattern>
+                  <pattern>org.</pattern>
+                  <shadedPattern>${shaded.prefix}.org.</shadedPattern>
                   <excludes>
                     <exclude>org.apache.hadoop.**</exclude>
                     <exclude>org.apache.log4j.**</exclude>
                     <exclude>org.apache.ozone.**</exclude>
-                    <exclude>org.apache.ratis.**</exclude>
                     <!-- These packages are the ones that are not shaded in the hadoop release package.
                       To prevent conflicts, we do not include these packages in the ozone client release package.
                       Ozone will use hadoop / JVM to provide these dependencies. -->
@@ -213,10 +212,9 @@
                   </excludes>
                 </relocation>
                 <relocation>
-                  <pattern>org.apache.ratis</pattern>
-                  <shadedPattern>${shaded.prefix}.org.apache.ratis</shadedPattern>
-                </relocation>
-                <relocation>
+                  <!-- TODO: pattern should be "com." (with trailing dot) to avoid unintended shading,
+                  but this causes intermittent Ratis gRPC client timeouts. Fix root cause first.
+                  See https://issues.apache.org/jira/browse/HDDS-14869 -->
                   <pattern>com</pattern>
                   <shadedPattern>${shaded.prefix}.com</shadedPattern>
                   <excludes>
@@ -233,44 +231,44 @@
                   </excludes>
                 </relocation>
                 <relocation>
-                  <pattern>google</pattern>
-                  <shadedPattern>${shaded.prefix}.google</shadedPattern>
+                  <pattern>google.</pattern>
+                  <shadedPattern>${shaded.prefix}.google.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>net.jcip</pattern>
-                  <shadedPattern>${shaded.prefix}.net.jcip</shadedPattern>
+                  <pattern>net.jcip.</pattern>
+                  <shadedPattern>${shaded.prefix}.net.jcip.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>javassist</pattern>
-                  <shadedPattern>${shaded.prefix}.javassist</shadedPattern>
+                  <pattern>javassist.</pattern>
+                  <shadedPattern>${shaded.prefix}.javassist.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>javax.xml.bind</pattern>
-                  <shadedPattern>${shaded.prefix}.javax.xml.bind</shadedPattern>
+                  <pattern>javax.xml.bind.</pattern>
+                  <shadedPattern>${shaded.prefix}.javax.xml.bind.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>javax.activation</pattern>
-                  <shadedPattern>${shaded.prefix}.javax.activation</shadedPattern>
+                  <pattern>javax.activation.</pattern>
+                  <shadedPattern>${shaded.prefix}.javax.activation.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>jakarta.annotation</pattern>
-                  <shadedPattern>${shaded.prefix}.jakarta.annotation</shadedPattern>
+                  <pattern>jakarta.annotation.</pattern>
+                  <shadedPattern>${shaded.prefix}.jakarta.annotation.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>kotlin</pattern>
-                  <shadedPattern>${shaded.prefix}.kotlin</shadedPattern>
+                  <pattern>kotlin.</pattern>
+                  <shadedPattern>${shaded.prefix}.kotlin.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>picocli</pattern>
-                  <shadedPattern>${shaded.prefix}.picocli</shadedPattern>
+                  <pattern>picocli.</pattern>
+                  <shadedPattern>${shaded.prefix}.picocli.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>info</pattern>
-                  <shadedPattern>${shaded.prefix}.info</shadedPattern>
+                  <pattern>info.</pattern>
+                  <shadedPattern>${shaded.prefix}.info.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>io</pattern>
-                  <shadedPattern>${shaded.prefix}.io</shadedPattern>
+                  <pattern>io.</pattern>
+                  <shadedPattern>${shaded.prefix}.io.</shadedPattern>
                   <excludes>
                     <exclude>io!netty!*</exclude>
                     <!-- Exclude config keys for Hadoop that look like package names -->
@@ -290,12 +288,12 @@
 
                 <!-- handling some special packages with special names -->
                 <relocation>
-                  <pattern>okio</pattern>
-                  <shadedPattern>${shaded.prefix}.okio</shadedPattern>
+                  <pattern>okio.</pattern>
+                  <shadedPattern>${shaded.prefix}.okio.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>okhttp3</pattern>
-                  <shadedPattern>${shaded.prefix}.okhttp3</shadedPattern>
+                  <pattern>okhttp3.</pattern>
+                  <shadedPattern>${shaded.prefix}.okhttp3.</shadedPattern>
                 </relocation>
               </relocations>
             </configuration>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org


(ozone) 03/05: HDDS-14085. Bump Hugo to 0.152.2 (#9441)

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch ozone-2.1
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit 4694d9972904a4dd44d25c170e7311a6203158f5
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Sat Dec 6 20:39:40 2025 +0100

    HDDS-14085. Bump Hugo to 0.152.2 (#9441)
    
    (cherry picked from commit 9437ffa6a36f5f4eb0aa2cd13a96741517c38931)
---
 hadoop-hdds/docs/content/feature/Quota.md       | 1 -
 hadoop-ozone/dev-support/checks/install/hugo.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/hadoop-hdds/docs/content/feature/Quota.md b/hadoop-hdds/docs/content/feature/Quota.md
index 53c196307fa..47dba21792f 100644
--- a/hadoop-hdds/docs/content/feature/Quota.md
+++ b/hadoop-hdds/docs/content/feature/Quota.md
@@ -7,7 +7,6 @@ icon: user
 menu:
    main:
       parent: Features
-summary: Introduction to Ozone Quota
 ---
 <!---
   Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/hadoop-ozone/dev-support/checks/install/hugo.sh b/hadoop-ozone/dev-support/checks/install/hugo.sh
index 293fd6b1981..cff2e46d21c 100644
--- a/hadoop-ozone/dev-support/checks/install/hugo.sh
+++ b/hadoop-ozone/dev-support/checks/install/hugo.sh
@@ -17,7 +17,7 @@
 # This script installs Hugo.
 # Requires _install_tool from _lib.sh.  Use `source` for both scripts, because it modifies $PATH.
 
-: ${HUGO_VERSION:=0.141.0}
+: ${HUGO_VERSION:=0.152.2}
 
 _install_hugo() {
   local os=$(uname -s)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org


(ozone) 04/05: HDDS-10178. Shaded Jar build fails on case-insensitive filesystem (#6042)

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch ozone-2.1
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit 199b86c70bd8ae62748cab2fbe2b32dd5310eadd
Author: Swaminathan Balachandran <sw...@gmail.com>
AuthorDate: Mon Nov 17 08:12:34 2025 -0500

    HDDS-10178. Shaded Jar build fails on case-insensitive filesystem (#6042)
    
    (cherry picked from commit beac3271cc174989490dc8390bf8a0ea2f6651e9)
---
 hadoop-ozone/ozonefs-hadoop2/pom.xml        | 6 ++++++
 hadoop-ozone/ozonefs-hadoop3-client/pom.xml | 6 ++++++
 hadoop-ozone/ozonefs-hadoop3/pom.xml        | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml
index a4f4c78f78b..a44633bfe4a 100644
--- a/hadoop-ozone/ozonefs-hadoop2/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml
@@ -139,6 +139,12 @@
                   <groupId>org.apache.ozone</groupId>
                   <artifactId>ozone-filesystem-shaded</artifactId>
                   <version>${project.version}</version>
+                  <fileMappers>
+                    <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                      <pattern>META-INF/license/</pattern>
+                      <replacement>META-INF/licenses/</replacement>
+                    </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                  </fileMappers>
                 </artifactItem>
               </artifactItems>
               <outputDirectory>target/classes</outputDirectory>
diff --git a/hadoop-ozone/ozonefs-hadoop3-client/pom.xml b/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
index 28b9e8b4506..963b3058c7e 100644
--- a/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
@@ -93,6 +93,12 @@
                   <groupId>org.apache.ozone</groupId>
                   <artifactId>ozone-filesystem-shaded</artifactId>
                   <version>${project.version}</version>
+                  <fileMappers>
+                    <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                      <pattern>META-INF/license/</pattern>
+                      <replacement>META-INF/licenses/</replacement>
+                    </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                  </fileMappers>
                 </artifactItem>
               </artifactItems>
               <outputDirectory>target/classes</outputDirectory>
diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml
index 42031d6c258..ae29b66c1e3 100644
--- a/hadoop-ozone/ozonefs-hadoop3/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml
@@ -90,6 +90,12 @@
                   <groupId>org.apache.ozone</groupId>
                   <artifactId>ozone-filesystem-shaded</artifactId>
                   <version>${project.version}</version>
+                  <fileMappers>
+                    <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                      <pattern>META-INF/license/</pattern>
+                      <replacement>META-INF/licenses/</replacement>
+                    </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                  </fileMappers>
                 </artifactItem>
               </artifactItems>
               <outputDirectory>target/classes</outputDirectory>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org


(ozone) 01/05: HDDS-14858. OM request fails with ClassNotFoundException: java.lang.constant.Constable (#9945)

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch ozone-2.1
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit b0fc4493bd668da10e7c77f798d43725703f419a
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Tue Mar 24 09:05:55 2026 +0100

    HDDS-14858. OM request fails with ClassNotFoundException: java.lang.constant.Constable (#9945)
    
    (cherry picked from commit 448357940bcefdd0b240394d3bd77f8f2687528a)
---
 hadoop-ozone/ozone-manager/pom.xml | 15 ---------------
 pom.xml                            | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index c7d2e168922..f9bf83a7fc1 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -379,26 +379,11 @@
       <plugin>
         <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <configuration>
-          <source>${maven.compiler.release}</source>
-          <target>${maven.compiler.release}</target>
-          <argumentFileDirectory>${project.build.directory}/aspectj-build</argumentFileDirectory>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjtools</artifactId>
-            <version>${aspectj.version}</version>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <goals>
               <goal>compile</goal>
             </goals>
-            <configuration>
-              <complianceLevel>${maven.compiler.release}</complianceLevel>
-            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/pom.xml b/pom.xml
index ca48743aecb..02057774073 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1769,6 +1769,17 @@
           <groupId>dev.aspectj</groupId>
           <artifactId>aspectj-maven-plugin</artifactId>
           <version>${aspectj-plugin.version}</version>
+          <configuration>
+            <complianceLevel>${maven.compiler.release}</complianceLevel>
+            <argumentFileDirectory>${project.build.directory}/aspectj-build</argumentFileDirectory>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.aspectj</groupId>
+              <artifactId>aspectjtools</artifactId>
+              <version>${aspectj.version}</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -2725,6 +2736,23 @@
         <aspectj.version>${aspectj.java21.version}</aspectj.version>
       </properties>
     </profile>
+    <profile>
+      <id>java11+</id>
+      <activation>
+        <jdk>[11,]</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>dev.aspectj</groupId>
+            <artifactId>aspectj-maven-plugin</artifactId>
+            <configuration>
+              <release>${maven.compiler.release}</release>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>go-offline</id>
       <properties>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org


(ozone) 05/05: HDDS-13947. Stop managing plexus-archiver version (#9311)

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch ozone-2.1
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit 7da3351ac612e14a57bf9bf9454e0baf5878121d
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Tue Nov 18 10:48:43 2025 +0100

    HDDS-13947. Stop managing plexus-archiver version (#9311)
    
    (cherry picked from commit dc57ebb07ab52fc4d959ba14051cd3cb0e375531)
---
 pom.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 02057774073..710c9664ecb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,6 @@
     <ozone.release>Joshua Tree</ozone.release>
     <ozone.version>2.1.0</ozone.version>
     <picocli.version>4.7.7</picocli.version>
-    <plexus-archiver.version>4.2.2</plexus-archiver.version>
     <pmd.version>3.26.0</pmd.version>
     <!-- Enable Reproducible Builds mode -->
     <project.build.outputTimestamp>2025-03-12T22:12:52Z</project.build.outputTimestamp>
@@ -1924,13 +1923,6 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
           <version>${maven-dependency-plugin.version}</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.codehaus.plexus</groupId>
-              <artifactId>plexus-archiver</artifactId>
-              <version>${plexus-archiver.version}</version>
-            </dependency>
-          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org