Skip to content

Commit 6ae4e3f

Browse files
adoroszlaiadoroszlai
committed
HDDS-11365. Fix the NOTICE file (apache#7120)
(cherry picked from commit 2236041)
1 parent 9a02d16 commit 6ae4e3f

6 files changed

Lines changed: 154 additions & 20 deletions

File tree

‎NOTICE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache Ozone
2-
Copyright 2022 The Apache Software Foundation
2+
Copyright 2024 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).

‎dev-support/pom.xml‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License. See accompanying LICENSE file.
14+
-->
15+
<project xmlns="http://maven.apache.org/POM/4.0.0"
16+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
18+
<parent>
19+
<artifactId>ozone-main</artifactId>
20+
<groupId>org.apache.ozone</groupId>
21+
<version>1.5.0-SNAPSHOT</version>
22+
</parent>
23+
<modelVersion>4.0.0</modelVersion>
24+
<artifactId>ozone-dev-support</artifactId>
25+
<description>Helper module for sharing resources among projects</description>
26+
<name>Apache Ozone Dev Support</name>
27+
28+
<properties>
29+
<failIfNoTests>false</failIfNoTests>
30+
</properties>
31+
<build>
32+
<resources>
33+
<resource>
34+
<directory>${project.build.directory}/extra-resources</directory>
35+
<targetPath>META-INF</targetPath>
36+
<includes>
37+
<include>LICENSE.txt</include>
38+
<include>NOTICE.txt</include>
39+
</includes>
40+
</resource>
41+
</resources>
42+
<plugins>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-site-plugin</artifactId>
46+
<configuration>
47+
<skip>true</skip>
48+
</configuration>
49+
</plugin>
50+
<!-- copy L&N files to target/extra-resources -->
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-resources-plugin</artifactId>
54+
<executions>
55+
<execution>
56+
<id>copy-resources</id>
57+
<phase>validate</phase>
58+
<goals>
59+
<goal>copy-resources</goal>
60+
</goals>
61+
<configuration>
62+
<outputDirectory>${project.build.directory}/extra-resources</outputDirectory>
63+
<resources>
64+
<resource>
65+
<directory>../</directory>
66+
<includes>
67+
<include>LICENSE.txt</include>
68+
<include>NOTICE.txt</include>
69+
</includes>
70+
</resource>
71+
</resources>
72+
</configuration>
73+
</execution>
74+
</executions>
75+
</plugin>
76+
<!-- add entries for L&N files to remote-resources.xml in jar file -->
77+
<plugin>
78+
<groupId>org.apache.maven.plugins</groupId>
79+
<artifactId>maven-remote-resources-plugin</artifactId>
80+
<executions>
81+
<execution>
82+
<phase>process-resources</phase>
83+
<goals>
84+
<goal>bundle</goal>
85+
</goals>
86+
</execution>
87+
</executions>
88+
<configuration>
89+
<resourcesDirectory>${project.build.outputDirectory}</resourcesDirectory>
90+
<includes>
91+
<include>META-INF/LICENSE.txt</include>
92+
<include>META-INF/NOTICE.txt</include>
93+
</includes>
94+
</configuration>
95+
</plugin>
96+
</plugins>
97+
</build>
98+
</project>

‎hadoop-hdds/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,30 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
290290
</execution>
291291
</executions>
292292
</plugin>
293+
294+
<plugin>
295+
<groupId>org.apache.maven.plugins</groupId>
296+
<artifactId>maven-remote-resources-plugin</artifactId>
297+
<configuration>
298+
<resourceBundles>
299+
<resourceBundle>org.apache.ozone:ozone-dev-support:${ozone.version}</resourceBundle>
300+
</resourceBundles>
301+
</configuration>
302+
<dependencies>
303+
<dependency>
304+
<groupId>org.apache.ozone</groupId>
305+
<artifactId>ozone-dev-support</artifactId>
306+
<version>${ozone.version}</version>
307+
</dependency>
308+
</dependencies>
309+
<executions>
310+
<execution>
311+
<goals>
312+
<goal>process</goal>
313+
</goals>
314+
</execution>
315+
</executions>
316+
</plugin>
293317
</plugins>
294318
</build>
295319

‎hadoop-ozone/dist/src/main/assemblies/ozone-src.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,13 @@
6767
<fileSet>
6868
<directory>dev-support</directory>
6969
<useDefaultExcludes>true</useDefaultExcludes>
70+
<excludes>
71+
<exclude>**/.classpath</exclude>
72+
<exclude>**/.project</exclude>
73+
<exclude>**/.settings</exclude>
74+
<exclude>**/*.iml</exclude>
75+
<exclude>**/target/**</exclude>
76+
</excludes>
7077
</fileSet>
7178
<fileSet>
7279
<directory>hadoop-hdds</directory>

‎hadoop-ozone/pom.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,29 @@
382382
</execution>
383383
</executions>
384384
</plugin>
385+
<plugin>
386+
<groupId>org.apache.maven.plugins</groupId>
387+
<artifactId>maven-remote-resources-plugin</artifactId>
388+
<configuration>
389+
<resourceBundles>
390+
<resourceBundle>org.apache.ozone:ozone-dev-support:${ozone.version}</resourceBundle>
391+
</resourceBundles>
392+
</configuration>
393+
<dependencies>
394+
<dependency>
395+
<groupId>org.apache.ozone</groupId>
396+
<artifactId>ozone-dev-support</artifactId>
397+
<version>${ozone.version}</version>
398+
</dependency>
399+
</dependencies>
400+
<executions>
401+
<execution>
402+
<goals>
403+
<goal>process</goal>
404+
</goals>
405+
</execution>
406+
</executions>
407+
</plugin>
385408
</plugins>
386409
</build>
387410

‎pom.xml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
2424
<packaging>pom</packaging>
2525

2626
<modules>
27+
<module>dev-support</module>
2728
<module>hadoop-hdds</module>
2829
<module>hadoop-ozone</module>
2930
</modules>
@@ -1944,25 +1945,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
19441945
<groupId>org.apache.maven.plugins</groupId>
19451946
<artifactId>maven-remote-resources-plugin</artifactId>
19461947
<version>${maven-remote-resources-plugin.version}</version>
1947-
<configuration>
1948-
<resourceBundles>
1949-
<resourceBundle>org.apache.hadoop:hadoop-build-tools:${hadoop.version}</resourceBundle>
1950-
</resourceBundles>
1951-
</configuration>
1952-
<dependencies>
1953-
<dependency>
1954-
<groupId>org.apache.hadoop</groupId>
1955-
<artifactId>hadoop-build-tools</artifactId>
1956-
<version>${hadoop.version}</version>
1957-
</dependency>
1958-
</dependencies>
1959-
<executions>
1960-
<execution>
1961-
<goals>
1962-
<goal>process</goal>
1963-
</goals>
1964-
</execution>
1965-
</executions>
19661948
</plugin>
19671949
<plugin>
19681950
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)