From bb0fed9f40d16303c51ff050b64270da80d391b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Sun, 10 Oct 2021 20:04:58 +0200
Subject: [PATCH] [MNG-6914] rename .mvn hidden directory in source to mvn

---
 apache-maven/src/assembly/wrapper/bin.xml          |  7 ++-----
 apache-maven/src/assembly/wrapper/script.xml       |  7 ++-----
 .../{.mvn => mvn}/wrapper/maven-wrapper.properties |  0
 apache-maven/src/assembly/wrapper/source.xml       | 14 ++++----------
 .../wrapper/MavenWrapperDownloader.java            |  0
 5 files changed, 8 insertions(+), 20 deletions(-)
 rename apache-maven/src/assembly/wrapper/shared/{.mvn => mvn}/wrapper/maven-wrapper.properties (100%)
 rename apache-maven/src/assembly/wrapper/source/{.mvn => mvn}/wrapper/MavenWrapperDownloader.java (100%)

diff --git a/apache-maven/src/assembly/wrapper/bin.xml b/apache-maven/src/assembly/wrapper/bin.xml
index d6f5281a59..a8b63db904 100644
--- a/apache-maven/src/assembly/wrapper/bin.xml
+++ b/apache-maven/src/assembly/wrapper/bin.xml
@@ -78,11 +78,8 @@ under the License.
   </files>
   <fileSets>
     <fileSet>
-      <directory>src/assembly/wrapper/shared</directory>
-      <outputDirectory>.</outputDirectory>
-      <includes>
-        <include>.mvn/**</include>
-      </includes>
+      <directory>src/assembly/wrapper/shared/mvn</directory>
+      <outputDirectory>.mvn</outputDirectory>
       <filtered>true</filtered>
     </fileSet>
   </fileSets>
diff --git a/apache-maven/src/assembly/wrapper/script.xml b/apache-maven/src/assembly/wrapper/script.xml
index b01eece6c1..0edba13437 100644
--- a/apache-maven/src/assembly/wrapper/script.xml
+++ b/apache-maven/src/assembly/wrapper/script.xml
@@ -70,11 +70,8 @@ under the License.
   </files>
   <fileSets>
     <fileSet>
-      <directory>src/assembly/wrapper/shared</directory>
-      <outputDirectory>.</outputDirectory>
-      <includes>
-        <include>.mvn/**</include>
-      </includes>
+      <directory>src/assembly/wrapper/shared/mvn</directory>
+      <outputDirectory>.mvn</outputDirectory>
       <filtered>true</filtered>
     </fileSet>
   </fileSets>
diff --git a/apache-maven/src/assembly/wrapper/shared/.mvn/wrapper/maven-wrapper.properties b/apache-maven/src/assembly/wrapper/shared/mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from apache-maven/src/assembly/wrapper/shared/.mvn/wrapper/maven-wrapper.properties
rename to apache-maven/src/assembly/wrapper/shared/mvn/wrapper/maven-wrapper.properties
diff --git a/apache-maven/src/assembly/wrapper/source.xml b/apache-maven/src/assembly/wrapper/source.xml
index f3e79c054f..3d4e1381e5 100644
--- a/apache-maven/src/assembly/wrapper/source.xml
+++ b/apache-maven/src/assembly/wrapper/source.xml
@@ -70,19 +70,13 @@ under the License.
   </files>
   <fileSets>
     <fileSet>
-      <directory>src/assembly/wrapper/shared</directory>
-      <outputDirectory>.</outputDirectory>
-      <includes>
-        <include>.mvn/**</include>
-      </includes>
+      <directory>src/assembly/wrapper/shared/mvn</directory>
+      <outputDirectory>.mvn</outputDirectory>
       <filtered>true</filtered>
     </fileSet>
     <fileSet>
-      <directory>src/assembly/wrapper/source</directory>
-      <outputDirectory>.</outputDirectory>
-      <includes>
-        <include>.mvn/**</include>
-      </includes>
+      <directory>src/assembly/wrapper/source/mvn</directory>
+      <outputDirectory>.mvn</outputDirectory>
       <filtered>true</filtered>
     </fileSet>
   </fileSets>
diff --git a/apache-maven/src/assembly/wrapper/source/.mvn/wrapper/MavenWrapperDownloader.java b/apache-maven/src/assembly/wrapper/source/mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from apache-maven/src/assembly/wrapper/source/.mvn/wrapper/MavenWrapperDownloader.java
rename to apache-maven/src/assembly/wrapper/source/mvn/wrapper/MavenWrapperDownloader.java