You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2021/10/10 18:48:46 UTC

[maven] 01/05: [MNG-6914] rename .mvn hidden directory in source to mvn

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch MNG-6914_2
in repository https://gitbox.apache.org/repos/asf/maven.git

commit b304c0c6139eeddcc2f0f8768ccc155d91605ab9
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Oct 10 20:04:58 2021 +0200

    [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 ++-----
 .../shared/{.mvn => mvn}/wrapper/maven-wrapper.properties  |  0
 apache-maven/src/assembly/wrapper/source.xml               | 14 ++++----------
 .../{.mvn => mvn}/wrapper/MavenWrapperDownloader.java      |  0
 5 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/apache-maven/src/assembly/wrapper/bin.xml b/apache-maven/src/assembly/wrapper/bin.xml
index d6f5281..a8b63db 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 b01eece..0edba13 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 f3e79c0..3d4e138 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