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 2236041f3a HDDS-11365. Fix the NOTICE file (#7120)
2236041f3a is described below
commit 2236041f3aa4742917a98e99c54d079e0c243e8d
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Aug 27 16:48:47 2024 +0200
HDDS-11365. Fix the NOTICE file (#7120)
---
NOTICE.txt | 2 +-
dev-support/pom.xml | 98 ++++++++++++++++++++++
hadoop-hdds/pom.xml | 24 ++++++
.../dist/src/main/assemblies/ozone-src.xml | 7 ++
hadoop-ozone/pom.xml | 23 +++++
pom.xml | 20 +----
6 files changed, 154 insertions(+), 20 deletions(-)
diff --git a/NOTICE.txt b/NOTICE.txt
index 7a1e855f6a..cc4e3c58b3 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/dev-support/pom.xml b/dev-support/pom.xml
new file mode 100644
index 0000000000..e11e3b32ee
--- /dev/null
+++ b/dev-support/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-dev-support</artifactId>
+ <description>Helper module for sharing resources among projects</description>
+ <name>Apache Ozone Dev Support</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>
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index a863fe3ef5..87d7615830 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-dev-support:${ozone.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-dev-support</artifactId>
+ <version>${ozone.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
b/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
index 3c97d3add7..3450b38739 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 e262895664..d91d488c43 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-dev-support:${ozone.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-dev-support</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 4a8cac1bb5..264cd993b8 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>dev-support</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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
