Skip to content

Commit 617bff2

Browse files
authored
[hotfix] Add project root path to files to facilitate compiling modules in child dirs (apache#3063)
1 parent 9a2f0ba commit 617bff2

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.mvn/readme.txt

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
The .mvn directory is needed to be able to use the ${maven.multiModuleProjectDirectory} property, since git cannot
2+
commit an empty directory, add this file.
3+
4+
Once we do not use ${maven.multiModuleProjectDirectory}, we can remove this file and .mvn directory.

pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -831,18 +831,19 @@ under the License.
831831
</importOrder>
832832

833833
<licenseHeader>
834-
<file>copyright.txt</file>
834+
<!-- replace it with ${project.rootDirectory} after maven 4.0.0, see MNG-7038 -->
835+
<file>${maven.multiModuleProjectDirectory}/copyright.txt</file>
835836
<delimiter>${spotless.delimiter}</delimiter>
836837
</licenseHeader>
837838
</java>
838839
<scala>
839840
<scalafmt>
840841
<version>3.4.3</version>
841-
<file>.scalafmt.conf</file>
842+
<file>${maven.multiModuleProjectDirectory}/.scalafmt.conf</file>
842843
</scalafmt>
843844

844845
<licenseHeader>
845-
<file>copyright.txt</file>
846+
<file>${maven.multiModuleProjectDirectory}/copyright.txt</file>
846847
<delimiter>${spotless.delimiter}</delimiter>
847848
</licenseHeader>
848849
</scala>

0 commit comments

Comments
 (0)