You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2022/05/16 12:54:55 UTC
[flink] 03/05: [FLINK-27317][build] Use absolute paths to .scalafmt.conf
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch release-1.15
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 09293d618bb1fafe99acf305c294a4e46a6777e9
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Wed Apr 20 10:59:04 2022 +0200
[FLINK-27317][build] Use absolute paths to .scalafmt.conf
---
flink-connectors/flink-hadoop-compatibility/pom.xml | 2 +-
flink-connectors/flink-hcatalog/pom.xml | 2 +-
flink-end-to-end-tests/flink-end-to-end-tests-scala/pom.xml | 2 +-
flink-end-to-end-tests/flink-quickstart-test/pom.xml | 2 +-
flink-examples/flink-examples-batch/pom.xml | 2 +-
flink-examples/flink-examples-streaming/pom.xml | 2 +-
flink-examples/flink-examples-table/pom.xml | 2 +-
flink-libraries/flink-cep-scala/pom.xml | 2 +-
flink-libraries/flink-gelly-examples/pom.xml | 2 +-
flink-libraries/flink-gelly-scala/pom.xml | 2 +-
flink-scala/pom.xml | 2 +-
flink-streaming-scala/pom.xml | 2 +-
flink-table/flink-table-api-scala-bridge/pom.xml | 2 +-
flink-table/flink-table-api-scala/pom.xml | 2 +-
flink-table/flink-table-planner/pom.xml | 2 +-
flink-tests/pom.xml | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/flink-connectors/flink-hadoop-compatibility/pom.xml b/flink-connectors/flink-hadoop-compatibility/pom.xml
index 9186f05a5f7..976d7b20211 100644
--- a/flink-connectors/flink-hadoop-compatibility/pom.xml
+++ b/flink-connectors/flink-hadoop-compatibility/pom.xml
@@ -107,7 +107,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-connectors/flink-hcatalog/pom.xml b/flink-connectors/flink-hcatalog/pom.xml
index b98817870ee..23aae868c21 100644
--- a/flink-connectors/flink-hcatalog/pom.xml
+++ b/flink-connectors/flink-hcatalog/pom.xml
@@ -104,7 +104,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-end-to-end-tests/flink-end-to-end-tests-scala/pom.xml b/flink-end-to-end-tests/flink-end-to-end-tests-scala/pom.xml
index 2f32bb30b07..7402938ba4b 100644
--- a/flink-end-to-end-tests/flink-end-to-end-tests-scala/pom.xml
+++ b/flink-end-to-end-tests/flink-end-to-end-tests-scala/pom.xml
@@ -89,7 +89,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-end-to-end-tests/flink-quickstart-test/pom.xml b/flink-end-to-end-tests/flink-quickstart-test/pom.xml
index 1a2e8b6af0f..df181c9d12f 100644
--- a/flink-end-to-end-tests/flink-quickstart-test/pom.xml
+++ b/flink-end-to-end-tests/flink-quickstart-test/pom.xml
@@ -70,7 +70,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-examples/flink-examples-batch/pom.xml b/flink-examples/flink-examples-batch/pom.xml
index 10af26aa70f..ff774111d0a 100644
--- a/flink-examples/flink-examples-batch/pom.xml
+++ b/flink-examples/flink-examples-batch/pom.xml
@@ -62,7 +62,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-examples/flink-examples-streaming/pom.xml b/flink-examples/flink-examples-streaming/pom.xml
index aaee6c1efa8..40c1e2ed546 100644
--- a/flink-examples/flink-examples-streaming/pom.xml
+++ b/flink-examples/flink-examples-streaming/pom.xml
@@ -131,7 +131,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-examples/flink-examples-table/pom.xml b/flink-examples/flink-examples-table/pom.xml
index cc126ff93f9..cb424a1cc4f 100644
--- a/flink-examples/flink-examples-table/pom.xml
+++ b/flink-examples/flink-examples-table/pom.xml
@@ -104,7 +104,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-libraries/flink-cep-scala/pom.xml b/flink-libraries/flink-cep-scala/pom.xml
index e35b50f0d69..e25d7332ee4 100644
--- a/flink-libraries/flink-cep-scala/pom.xml
+++ b/flink-libraries/flink-cep-scala/pom.xml
@@ -116,7 +116,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-libraries/flink-gelly-examples/pom.xml b/flink-libraries/flink-gelly-examples/pom.xml
index 72345f9534f..e3cf09be02e 100644
--- a/flink-libraries/flink-gelly-examples/pom.xml
+++ b/flink-libraries/flink-gelly-examples/pom.xml
@@ -128,7 +128,7 @@
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-libraries/flink-gelly-scala/pom.xml b/flink-libraries/flink-gelly-scala/pom.xml
index e930bc4e45e..cf660be8f47 100644
--- a/flink-libraries/flink-gelly-scala/pom.xml
+++ b/flink-libraries/flink-gelly-scala/pom.xml
@@ -103,7 +103,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index 418b33399e7..9412855ef6e 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -146,7 +146,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../.scalafmt.conf</file>
+ <file>${project.basedir}/../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-streaming-scala/pom.xml b/flink-streaming-scala/pom.xml
index 5126519ea7d..eec2636a3e4 100644
--- a/flink-streaming-scala/pom.xml
+++ b/flink-streaming-scala/pom.xml
@@ -142,7 +142,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../.scalafmt.conf</file>
+ <file>${project.basedir}/../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-table/flink-table-api-scala-bridge/pom.xml b/flink-table/flink-table-api-scala-bridge/pom.xml
index 4a31d9f1a94..b6b90487b18 100644
--- a/flink-table/flink-table-api-scala-bridge/pom.xml
+++ b/flink-table/flink-table-api-scala-bridge/pom.xml
@@ -84,7 +84,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-table/flink-table-api-scala/pom.xml b/flink-table/flink-table-api-scala/pom.xml
index b2a9248d651..7933d39ff8a 100644
--- a/flink-table/flink-table-api-scala/pom.xml
+++ b/flink-table/flink-table-api-scala/pom.xml
@@ -95,7 +95,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-table/flink-table-planner/pom.xml b/flink-table/flink-table-planner/pom.xml
index d16df6271df..c613193dc0d 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -287,7 +287,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../../.scalafmt.conf</file>
+ <file>${project.basedir}/../../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index 421ff9113ae..7e802a28d33 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -286,7 +286,7 @@ under the License.
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
- <file>../.scalafmt.conf</file>
+ <file>${project.basedir}/../.scalafmt.conf</file>
</scalafmt>
<licenseHeader>
<content>${spotless.license.header}</content>