[hotfix] Add project root path to files to facilitate compiling modul…

…es in child dirs (#3063)
apache · Mar 21, 2024 · 617bff2 · 617bff2
1 parent 9a2f0ba
commit 617bff2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.mvn/readme.txt b/.mvn/readme.txt
@@ -0,0 +1,4 @@
+The .mvn directory is needed to be able to use the ${maven.multiModuleProjectDirectory} property, since git cannot
+commit an empty directory, add this file.
+
+Once we do not use ${maven.multiModuleProjectDirectory}, we can remove this file and .mvn directory.
diff --git a/pom.xml b/pom.xml
@@ -831,18 +831,19 @@ under the License.
                             </importOrder>
 
                             <licenseHeader>
-                                <file>copyright.txt</file>
+                                <!-- replace it with ${project.rootDirectory} after maven 4.0.0, see MNG-7038 -->
+                                <file>${maven.multiModuleProjectDirectory}/copyright.txt</file>
                                 <delimiter>${spotless.delimiter}</delimiter>
                             </licenseHeader>
                         </java>
                         <scala>
                             <scalafmt>
                                 <version>3.4.3</version>
-                                <file>.scalafmt.conf</file>
+                                <file>${maven.multiModuleProjectDirectory}/.scalafmt.conf</file>
                             </scalafmt>
 
                             <licenseHeader>
-                                <file>copyright.txt</file>
+                                <file>${maven.multiModuleProjectDirectory}/copyright.txt</file>
                                 <delimiter>${spotless.delimiter}</delimiter>
                             </licenseHeader>
                         </scala>