From 61e3e850ae57b591d9fb50a5bb6f5782767b2114 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Mon, 26 Aug 2024 12:59:51 +0200
Subject: [PATCH 1/2] HDDS-11365. Fix the NOTICE file

---
 NOTICE.txt           |  2 +-
 hadoop-hdds/pom.xml  | 24 +++++++++++
 hadoop-ozone/pom.xml | 23 +++++++++++
 pom.xml              | 20 +--------
 shared/pom.xml       | 98 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 147 insertions(+), 20 deletions(-)
 create mode 100644 shared/pom.xml

diff --git a/NOTICE.txt b/NOTICE.txt
index 7a1e855f6a33..cc4e3c58b39f 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Ozone
-Copyright 2022 The Apache Software Foundation
+Copyright 2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index a863fe3ef5d1..b6e0d5c9f834 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -247,6 +247,30 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <configuration>
+          <resourceBundles>
+            <resourceBundle>org.apache.ozone:ozone-shared-resources:${ozone.version}</resourceBundle>
+          </resourceBundles>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.ozone</groupId>
+            <artifactId>ozone-shared-resources</artifactId>
+            <version>${ozone.version}</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index e262895664fc..94c9983bba3c 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -342,6 +342,29 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <configuration>
+          <resourceBundles>
+            <resourceBundle>org.apache.ozone:ozone-shared-resources:${ozone.version}</resourceBundle>
+          </resourceBundles>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.ozone</groupId>
+            <artifactId>ozone-shared-resources</artifactId>
+            <version>${ozone.version}</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index 4a8cac1bb50f..c4a53dd4e4c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <packaging>pom</packaging>
 
   <modules>
+    <module>shared</module>
     <module>hadoop-hdds</module>
     <module>hadoop-ozone</module>
   </modules>
@@ -1708,25 +1709,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-remote-resources-plugin</artifactId>
         <version>${maven-remote-resources-plugin.version}</version>
-        <configuration>
-          <resourceBundles>
-            <resourceBundle>org.apache.hadoop:hadoop-build-tools:${hadoop.version}</resourceBundle>
-          </resourceBundles>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-build-tools</artifactId>
-            <version>${hadoop.version}</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/shared/pom.xml b/shared/pom.xml
new file mode 100644
index 000000000000..fafcb35aa025
--- /dev/null
+++ b/shared/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed 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. See accompanying LICENSE file.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>ozone-main</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <version>1.5.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>ozone-shared-resources</artifactId>
+  <description>Apache Ozone Shared Resources</description>
+  <name>Apache Ozone Shared Resources</name>
+
+  <properties>
+    <failIfNoTests>false</failIfNoTests>
+  </properties>
+  <build>
+    <resources>
+      <resource>
+        <directory>${project.build.directory}/extra-resources</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE.txt</include>
+          <include>NOTICE.txt</include>
+        </includes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <!-- copy L&N files to target/extra-resources -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/extra-resources</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>../</directory>
+                  <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- add entries for L&N files to remote-resources.xml in jar file -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>bundle</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <resourcesDirectory>${project.build.outputDirectory}</resourcesDirectory>
+          <includes>
+            <include>META-INF/LICENSE.txt</include>
+            <include>META-INF/NOTICE.txt</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

From 70323dabbe15e0abf410dae8a2ee6a808e008ba9 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Mon, 26 Aug 2024 14:47:46 +0200
Subject: [PATCH 2/2] use dev-support as the helper module

---
 {shared => dev-support}/pom.xml                     | 6 +++---
 hadoop-hdds/pom.xml                                 | 4 ++--
 hadoop-ozone/dist/src/main/assemblies/ozone-src.xml | 7 +++++++
 hadoop-ozone/pom.xml                                | 4 ++--
 pom.xml                                             | 2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)
 rename {shared => dev-support}/pom.xml (95%)

diff --git a/shared/pom.xml b/dev-support/pom.xml
similarity index 95%
rename from shared/pom.xml
rename to dev-support/pom.xml
index fafcb35aa025..e11e3b32ee44 100644
--- a/shared/pom.xml
+++ b/dev-support/pom.xml
@@ -21,9 +21,9 @@
     <version>1.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>ozone-shared-resources</artifactId>
-  <description>Apache Ozone Shared Resources</description>
-  <name>Apache Ozone Shared Resources</name>
+  <artifactId>ozone-dev-support</artifactId>
+  <description>Helper module for sharing resources among projects</description>
+  <name>Apache Ozone Dev Support</name>
 
   <properties>
     <failIfNoTests>false</failIfNoTests>
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index b6e0d5c9f834..87d761583014 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -253,13 +253,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
         <artifactId>maven-remote-resources-plugin</artifactId>
         <configuration>
           <resourceBundles>
-            <resourceBundle>org.apache.ozone:ozone-shared-resources:${ozone.version}</resourceBundle>
+            <resourceBundle>org.apache.ozone:ozone-dev-support:${ozone.version}</resourceBundle>
           </resourceBundles>
         </configuration>
         <dependencies>
           <dependency>
             <groupId>org.apache.ozone</groupId>
-            <artifactId>ozone-shared-resources</artifactId>
+            <artifactId>ozone-dev-support</artifactId>
             <version>${ozone.version}</version>
           </dependency>
         </dependencies>
diff --git a/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml b/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
index 3c97d3add766..3450b3873937 100644
--- a/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
+++ b/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
@@ -67,6 +67,13 @@
     <fileSet>
       <directory>dev-support</directory>
       <useDefaultExcludes>true</useDefaultExcludes>
+      <excludes>
+        <exclude>**/.classpath</exclude>
+        <exclude>**/.project</exclude>
+        <exclude>**/.settings</exclude>
+        <exclude>**/*.iml</exclude>
+        <exclude>**/target/**</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <directory>hadoop-hdds</directory>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 94c9983bba3c..d91d488c4345 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -347,13 +347,13 @@
         <artifactId>maven-remote-resources-plugin</artifactId>
         <configuration>
           <resourceBundles>
-            <resourceBundle>org.apache.ozone:ozone-shared-resources:${ozone.version}</resourceBundle>
+            <resourceBundle>org.apache.ozone:ozone-dev-support:${ozone.version}</resourceBundle>
           </resourceBundles>
         </configuration>
         <dependencies>
           <dependency>
             <groupId>org.apache.ozone</groupId>
-            <artifactId>ozone-shared-resources</artifactId>
+            <artifactId>ozone-dev-support</artifactId>
             <version>${ozone.version}</version>
           </dependency>
         </dependencies>
diff --git a/pom.xml b/pom.xml
index c4a53dd4e4c9..264cd993b804 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <packaging>pom</packaging>
 
   <modules>
-    <module>shared</module>
+    <module>dev-support</module>
     <module>hadoop-hdds</module>
     <module>hadoop-ozone</module>
   </modules>