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/dev-support/pom.xml b/dev-support/pom.xml new file mode 100644 index 000000000000..71f76628a6fa --- /dev/null +++ b/dev-support/pom.xml @@ -0,0 +1,98 @@ + + + + + ozone-main + org.apache.ozone + 1.4.1 + + 4.0.0 + ozone-dev-support + Helper module for sharing resources among projects + Apache Ozone Dev Support + + + false + + + + + ${project.build.directory}/extra-resources + META-INF + + LICENSE.txt + NOTICE.txt + + + + + + org.apache.maven.plugins + maven-site-plugin + + true + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + validate + + copy-resources + + + ${project.build.directory}/extra-resources + + + ../ + + LICENSE.txt + NOTICE.txt + + + + + + + + + + org.apache.maven.plugins + maven-remote-resources-plugin + + + process-resources + + bundle + + + + + ${project.build.outputDirectory} + + META-INF/LICENSE.txt + META-INF/NOTICE.txt + + + + + + diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index c07cf30da7fd..4db9ea9191ff 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -290,6 +290,30 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + + org.apache.maven.plugins + maven-remote-resources-plugin + + + org.apache.ozone:ozone-dev-support:${ozone.version} + + + + + org.apache.ozone + ozone-dev-support + ${ozone.version} + + + + + + process + + + + 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 @@ dev-support true + + **/.classpath + **/.project + **/.settings + **/*.iml + **/target/** + hadoop-hdds diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index bb107b08da0a..b71156b22047 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -382,6 +382,29 @@ + + org.apache.maven.plugins + maven-remote-resources-plugin + + + org.apache.ozone:ozone-dev-support:${ozone.version} + + + + + org.apache.ozone + ozone-dev-support + ${ozone.version} + + + + + + process + + + + diff --git a/pom.xml b/pom.xml index 11649c51a5de..9e065ed56698 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 pom + dev-support hadoop-hdds hadoop-ozone @@ -1944,25 +1945,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.apache.maven.plugins maven-remote-resources-plugin ${maven-remote-resources-plugin.version} - - - org.apache.hadoop:hadoop-build-tools:${hadoop.version} - - - - - org.apache.hadoop - hadoop-build-tools - ${hadoop.version} - - - - - - process - - - org.apache.maven.plugins