From 2dd416840583bb91ea35c0c907df1955cbb4f34f Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Mon, 16 Nov 2026 10:14:23 +0100 Subject: [PATCH] #2340 Keep the archetype's .gitignore template in the source release The default excludes of the assembly drop every .gitignore, including the template the archetype copies into the projects it generates. It is now added with a fileSet of its own. assembly.xml also builds the zip, which came from the source-release descriptor of the ASF parent, so that both archives have the same content. --- .rat-excludes | 1 + assembly.xml | 11 +++++++++++ pom.xml | 3 +++ 3 files changed, 15 insertions(+) diff --git a/.rat-excludes b/.rat-excludes index fe34c2049..fbca3be2c 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -18,6 +18,7 @@ external/opensearch/dashboards/** external/solr/archetype/src/main/resources/archetype-resources/configsets/** THIRD-PARTY.properties .gitattributes +**/.gitignore .editorconfig .mvn/*.config **/dependency-reduced-pom.xml diff --git a/assembly.xml b/assembly.xml index 8426091e4..428371066 100644 --- a/assembly.xml +++ b/assembly.xml @@ -22,6 +22,7 @@ source-release tar.gz + zip @@ -87,6 +88,16 @@ + + + archetype/src/main/resources/archetype-resources + archetype/src/main/resources/archetype-resources + false + + .gitignore + + ${project.build.directory}/maven-shared-archive-resources/META-INF diff --git a/pom.xml b/pom.xml index 030c1f7dc..2c2865798 100644 --- a/pom.xml +++ b/pom.xml @@ -620,6 +620,9 @@ under the License. assembly.xml + +