From 327ee2e67835c32191f9ba0e7daa611d999a4cb9 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Fri, 6 Dec 2024 15:01:05 +0100
Subject: [PATCH 1/2] HDDS-11872. Disable Apache snapshots repo

---
 hadoop-hdds/pom.xml  | 12 ------------
 hadoop-ozone/pom.xml |  7 -------
 pom.xml              | 26 +++++++++++++++++++++++++-
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index 0237210d2fca..707e9852898a 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -54,18 +54,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <module>rocks-native</module>
   </modules>
 
-  <repositories>
-    <repository>
-      <id>apache.snapshots.https</id>
-      <url>https://repository.apache.org/content/repositories/snapshots</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots.https</id>
-      <url>https://repository.apache.org/content/repositories/snapshots</url>
-    </pluginRepository>
-  </pluginRepositories>
   <dependencyManagement>
     <dependencies>
 
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index a8b32c686a0b..22cd10085ddb 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -49,13 +49,6 @@
     <module>s3-secret-store</module>
   </modules>
 
-  <repositories>
-    <repository>
-      <id>apache.snapshots.https</id>
-      <url>https://repository.apache.org/content/repositories/snapshots</url>
-    </repository>
-  </repositories>
-
   <dependencyManagement>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 869afebf493c..f780c4a27a8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,12 +44,36 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 
   <repositories>
     <repository>
-      <id>${distMgmtSnapshotsId}</id>
+      <id>apache.snapshots</id>
       <name>${distMgmtSnapshotsName}</name>
       <url>${distMgmtSnapshotsUrl}</url>
+      <releases>
+        <enabled>false</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+        <updatePolicy>never</updatePolicy>
+      </snapshots>
     </repository>
   </repositories>
 
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache.snapshots</id>
+      <name>${distMgmtSnapshotsName}</name>
+      <url>${distMgmtSnapshotsUrl}</url>
+      <releases>
+        <enabled>false</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+        <updatePolicy>never</updatePolicy>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

From 71275c1273c6ec7f7dddf4eb285f1b8d51e28001 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Mon, 9 Dec 2024 15:12:41 +0100
Subject: [PATCH 2/2] override both apache.snapshots and apache.snapshots.https

---
 pom.xml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 00e91bad795b..6f27c486c156 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,8 +45,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <repositories>
     <repository>
       <id>apache.snapshots</id>
-      <name>${distMgmtSnapshotsName}</name>
-      <url>${distMgmtSnapshotsUrl}</url>
+      <url>https://repository.apache.org/snapshots</url>
       <releases>
         <enabled>false</enabled>
         <updatePolicy>never</updatePolicy>
@@ -56,13 +55,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <updatePolicy>never</updatePolicy>
       </snapshots>
     </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>${distMgmtSnapshotsName}</name>
-      <url>${distMgmtSnapshotsUrl}</url>
+    <repository>
+      <id>apache.snapshots.https</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
       <releases>
         <enabled>false</enabled>
         <updatePolicy>never</updatePolicy>
@@ -71,8 +66,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <enabled>false</enabled>
         <updatePolicy>never</updatePolicy>
       </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
+    </repository>
+  </repositories>
 
   <licenses>
     <license>