|
| 1 | +From b324a8fc96417870fd34009f2e3c4a43a8b9139e Mon Sep 17 00:00:00 2001 |
| 2 | +From: Benedikt Labrenz < [email protected]> |
| 3 | +Date: Tue, 2 Sep 2025 12:01:22 +0200 |
| 4 | +Subject: stop applying formatting plugin |
| 5 | + |
| 6 | +--- |
| 7 | + benchmarks/build.gradle | 9 --------- |
| 8 | + build.gradle | 1 - |
| 9 | + plugins/arrow-flight-rpc/build.gradle | 7 ------- |
| 10 | + 3 files changed, 17 deletions(-) |
| 11 | + |
| 12 | +diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle |
| 13 | +index 732e77934b4..47a7c1b1066 100644 |
| 14 | +--- a/benchmarks/build.gradle |
| 15 | ++++ b/benchmarks/build.gradle |
| 16 | +@@ -76,14 +76,5 @@ thirdPartyAudit.ignoreViolations( |
| 17 | + 'org.openjdk.jmh.util.Utils' |
| 18 | + ) |
| 19 | + |
| 20 | +-spotless { |
| 21 | +- java { |
| 22 | +- // IDEs can sometimes run annotation processors that leave files in |
| 23 | +- // here, causing Spotless to complain. Even though this path ought not |
| 24 | +- // to exist, exclude it anyway in order to avoid spurious failures. |
| 25 | +- targetExclude 'src/main/generated/**/*.java' |
| 26 | +- } |
| 27 | +-} |
| 28 | +- |
| 29 | + // Add support for incubator modules on supported Java versions. |
| 30 | + run.jvmArgs += ['--add-modules=jdk.incubator.vector'] |
| 31 | +diff --git a/build.gradle b/build.gradle |
| 32 | +index 4c2f2374a99..99ffd8b743c 100644 |
| 33 | +--- a/build.gradle |
| 34 | ++++ b/build.gradle |
| 35 | +@@ -65,7 +65,6 @@ apply from: 'gradle/build-complete.gradle' |
| 36 | + apply from: 'gradle/runtime-jdk-provision.gradle' |
| 37 | + apply from: 'gradle/ide.gradle' |
| 38 | + apply from: 'gradle/forbidden-dependencies.gradle' |
| 39 | +-apply from: 'gradle/formatting.gradle' |
| 40 | + apply from: 'gradle/local-distribution.gradle' |
| 41 | + apply from: 'gradle/run.gradle' |
| 42 | + apply from: 'gradle/missing-javadoc.gradle' |
| 43 | +diff --git a/plugins/arrow-flight-rpc/build.gradle b/plugins/arrow-flight-rpc/build.gradle |
| 44 | +index 1d05464d0ee..0659d0a3369 100644 |
| 45 | +--- a/plugins/arrow-flight-rpc/build.gradle |
| 46 | ++++ b/plugins/arrow-flight-rpc/build.gradle |
| 47 | +@@ -93,13 +93,6 @@ internalClusterTest { |
| 48 | + jvmArgs += ["--add-opens", "java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"] |
| 49 | + } |
| 50 | + |
| 51 | +-spotless { |
| 52 | +- java { |
| 53 | +- // Files to exclude from formatting |
| 54 | +- targetExclude 'src/main/java/org/apache/arrow/flight/**/*.java' |
| 55 | +- } |
| 56 | +-} |
| 57 | +- |
| 58 | + |
| 59 | + tasks.named("dependencyLicenses").configure { |
| 60 | + mapping from: /netty-.*/, to: 'netty' |
0 commit comments