From 2682c219284549a56b1c8d3fc03a58c57a933ed7 Mon Sep 17 00:00:00 2001 From: Benedikt Labrenz Date: Tue, 2 Sep 2025 12:10:07 +0200 Subject: [PATCH 1/2] deactivate opensearch formatting plugin --- ...0004-stop-applying-formatting-plugin.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 opensearch/stackable/patches/3.1.0/0004-stop-applying-formatting-plugin.patch diff --git a/opensearch/stackable/patches/3.1.0/0004-stop-applying-formatting-plugin.patch b/opensearch/stackable/patches/3.1.0/0004-stop-applying-formatting-plugin.patch new file mode 100644 index 000000000..31f265008 --- /dev/null +++ b/opensearch/stackable/patches/3.1.0/0004-stop-applying-formatting-plugin.patch @@ -0,0 +1,60 @@ +From b324a8fc96417870fd34009f2e3c4a43a8b9139e Mon Sep 17 00:00:00 2001 +From: Benedikt Labrenz +Date: Tue, 2 Sep 2025 12:01:22 +0200 +Subject: stop applying formatting plugin + +--- + benchmarks/build.gradle | 9 --------- + build.gradle | 1 - + plugins/arrow-flight-rpc/build.gradle | 7 ------- + 3 files changed, 17 deletions(-) + +diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle +index 732e77934b4..47a7c1b1066 100644 +--- a/benchmarks/build.gradle ++++ b/benchmarks/build.gradle +@@ -76,14 +76,5 @@ thirdPartyAudit.ignoreViolations( + 'org.openjdk.jmh.util.Utils' + ) + +-spotless { +- java { +- // IDEs can sometimes run annotation processors that leave files in +- // here, causing Spotless to complain. Even though this path ought not +- // to exist, exclude it anyway in order to avoid spurious failures. +- targetExclude 'src/main/generated/**/*.java' +- } +-} +- + // Add support for incubator modules on supported Java versions. + run.jvmArgs += ['--add-modules=jdk.incubator.vector'] +diff --git a/build.gradle b/build.gradle +index 4c2f2374a99..99ffd8b743c 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -65,7 +65,6 @@ apply from: 'gradle/build-complete.gradle' + apply from: 'gradle/runtime-jdk-provision.gradle' + apply from: 'gradle/ide.gradle' + apply from: 'gradle/forbidden-dependencies.gradle' +-apply from: 'gradle/formatting.gradle' + apply from: 'gradle/local-distribution.gradle' + apply from: 'gradle/run.gradle' + apply from: 'gradle/missing-javadoc.gradle' +diff --git a/plugins/arrow-flight-rpc/build.gradle b/plugins/arrow-flight-rpc/build.gradle +index 1d05464d0ee..0659d0a3369 100644 +--- a/plugins/arrow-flight-rpc/build.gradle ++++ b/plugins/arrow-flight-rpc/build.gradle +@@ -93,13 +93,6 @@ internalClusterTest { + jvmArgs += ["--add-opens", "java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"] + } + +-spotless { +- java { +- // Files to exclude from formatting +- targetExclude 'src/main/java/org/apache/arrow/flight/**/*.java' +- } +-} +- + + tasks.named("dependencyLicenses").configure { + mapping from: /netty-.*/, to: 'netty' From 42fe372bd9ca619be770ddd6036ab479616dec27 Mon Sep 17 00:00:00 2001 From: Benedikt Labrenz Date: Tue, 2 Sep 2025 12:15:47 +0200 Subject: [PATCH 2/2] add changelog entry --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dadd71fd..90bc01491 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,10 @@ All notable changes to this project will be documented in this file. - all: Use our build-repo to cache NPM dependencies ([#1219]) - java: Use a more recent Maven version for all Java based products ([#1220]) +### Removed + +- opensearch: stop applying formatting plugin ([#1230]). + [#1207]: https://github.com/stackabletech/docker-images/pull/1207 [#1215]: https://github.com/stackabletech/docker-images/pull/1215 [#1219]: https://github.com/stackabletech/docker-images/pull/1219 @@ -24,6 +28,7 @@ All notable changes to this project will be documented in this file. [#1222]: https://github.com/stackabletech/docker-images/pull/1222 [#1223]: https://github.com/stackabletech/docker-images/pull/1223 [#1225]: https://github.com/stackabletech/docker-images/pull/1225 +[#1230]: https://github.com/stackabletech/docker-images/pull/1230 ## [25.7.0] - 2025-07-23