From bae4213de1fb7e823b44ae95d1339d94df3de783 Mon Sep 17 00:00:00 2001 From: LinMingQiang <1356469429@qq.com> Date: Fri, 9 Aug 2024 10:05:51 +0800 Subject: [PATCH] Revert "[hotfix] Add project root path to files to facilitate compiling modules in child dirs (#3063)" This reverts commit 617bff2eb359dfc2e3746f49e3dfd39f473a1ba2. --- .mvn/readme.txt | 4 ---- pom.xml | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 .mvn/readme.txt diff --git a/.mvn/readme.txt b/.mvn/readme.txt deleted file mode 100644 index a1333a41d229..000000000000 --- a/.mvn/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -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. \ No newline at end of file diff --git a/pom.xml b/pom.xml index 75a7cd098a95..5abc4896ac20 100644 --- a/pom.xml +++ b/pom.xml @@ -828,19 +828,18 @@ under the License. - - ${maven.multiModuleProjectDirectory}/copyright.txt + copyright.txt ${spotless.delimiter} 3.4.3 - ${maven.multiModuleProjectDirectory}/.scalafmt.conf + .scalafmt.conf - ${maven.multiModuleProjectDirectory}/copyright.txt + copyright.txt ${spotless.delimiter}