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

jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/master by this push:
     new 3fbd096ff [MINOR] Put mvn config files together (#2891)
3fbd096ff is described below

commit 3fbd096ffd5c675689083ac2ceb2ec2ebca7368d
Author: daragu <[email protected]>
AuthorDate: Wed Jun 5 14:05:53 2024 +0800

    [MINOR] Put mvn config files together (#2891)
    
    * [MINOR] Put mvn config files together
    
    * fix bug
    
    * fix bug
---
 pom.xml                                     | 8 ++++----
 copyright.txt => tools/maven/copyright.txt  | 0
 .rat-excludes => tools/maven/rat-excludes   | 4 +++-
 .scalafmt.conf => tools/maven/scalafmt.conf | 0
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index beb8b79fa..312664513 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1002,16 +1002,16 @@
                                 <order>,javax,java,\\#</order>
                             </importOrder>
                             <licenseHeader>
-                                <file>copyright.txt</file>
+                                <file>tools/maven/copyright.txt</file>
                             </licenseHeader>
                         </java>
                         <scala>
                             <scalafmt>
                                 <scalaMajorVersion>2.12</scalaMajorVersion>
-                                <file>.scalafmt.conf</file>
+                                <file>tools/maven/scalafmt.conf</file>
                             </scalafmt>
                             <licenseHeader>
-                                <file>copyright.txt</file>
+                                <file>tools/maven/copyright.txt</file>
                             </licenseHeader>
                         </scala>
                     </configuration>
@@ -1030,7 +1030,7 @@
                                 <familyName>Apache License 2.0</familyName>
                             </licenseFamily>
                         </licenseFamilies>
-                        <excludesFile>.rat-excludes</excludesFile>
+                        <excludesFile>tools/maven/rat-excludes</excludesFile>
                     </configuration>
                     <executions>
                         <execution>
diff --git a/copyright.txt b/tools/maven/copyright.txt
similarity index 100%
rename from copyright.txt
rename to tools/maven/copyright.txt
diff --git a/.rat-excludes b/tools/maven/rat-excludes
similarity index 81%
rename from .rat-excludes
rename to tools/maven/rat-excludes
index bf50c10c3..2adde9ed7 100644
--- a/.rat-excludes
+++ b/tools/maven/rat-excludes
@@ -17,4 +17,6 @@ docs/**
 **/node_modules/**
 **/pnpm-lock.yaml
 **/ams-dashboard/dist/**
-**/components.d.ts
\ No newline at end of file
+**/components.d.ts
+tools/maven/rat-excludes
+tools/maven/scalafmt.conf
diff --git a/.scalafmt.conf b/tools/maven/scalafmt.conf
similarity index 100%
rename from .scalafmt.conf
rename to tools/maven/scalafmt.conf

Reply via email to