This is an automated email from the ASF dual-hosted git repository. ppkarwasz pushed a commit to branch feat/spotless-2 in repository https://gitbox.apache.org/repos/asf/logging-flume.git
commit 43695f2fd85e4ec95a1bb63a49424b32942a0c23 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Fri Jun 5 17:06:51 2026 +0200 Copies spotless configuration from `logging-parent` --- build-support/pom.xml | 6 ++ flume-parent/pom.xml | 183 ++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 384 insertions(+) diff --git a/build-support/pom.xml b/build-support/pom.xml index b14795219..2771d4488 100644 --- a/build-support/pom.xml +++ b/build-support/pom.xml @@ -20,6 +20,12 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.flume</groupId> + <artifactId>flume-project</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> + <groupId>org.apache.flume</groupId> <artifactId>build-support</artifactId> <version>2.0.0-SNAPSHOT</version> diff --git a/flume-parent/pom.xml b/flume-parent/pom.xml index a238afe3d..eb82d0ef1 100644 --- a/flume-parent/pom.xml +++ b/flume-parent/pom.xml @@ -127,6 +127,9 @@ limitations under the License. <os.maven.version>1.5.0.Final</os.maven.version> <redirectTestOutput>true</redirectTestOutput> <checkstyle.skip>true</checkstyle.skip> + + <spotless-maven-plugin.version>3.4.0</spotless-maven-plugin.version> + <palantir-java-format.version>2.90.0</palantir-java-format.version> </properties> <profiles> @@ -410,6 +413,179 @@ limitations under the License. <groupId>com.github.spotbugs</groupId> <artifactId>spotbugs-maven-plugin</artifactId> </plugin> + + <!-- Configuration here must match the one in `.editorconfig`! --> + <plugin> + <groupId>com.diffplug.spotless</groupId> + <artifactId>spotless-maven-plugin</artifactId> + <configuration> + <java> + <licenseHeader> + <!-- https://www.apache.org/legal/src-headers.html#headers --> + <content>/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */</content> + </licenseHeader> + <palantirJavaFormat> + <version>${palantir-java-format.version}</version> + </palantirJavaFormat> + </java> + <pom> + <licenseHeader> + <!-- https://www.apache.org/legal/src-headers.html#headers --> + <content><?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to you under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --></content> + <delimiter><project</delimiter> + </licenseHeader> + <sortPom> + <expandEmptyElements>false</expandEmptyElements> + <!-- Maven Release plugin uses this style --> + <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement> + </sortPom> + </pom> + <formats> + <format> + <includes> + <include>src/**/*.xml</include> + </includes> + <excludes> + <!-- The license header in changelog entry files causing Git to match irrelevant files. + This is eventually causing merge conflicts. + Hence, we avoid enforcing license headers there. --> + <exclude>src/changelog/**/*.xml</exclude> + </excludes> + <licenseHeader> + <!-- https://www.apache.org/legal/src-headers.html#headers --> + <content><?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to you under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --></content> + <delimiter><(!DOCTYPE|\w)</delimiter> + </licenseHeader> + <endWithNewline /> + <trimTrailingWhitespace /> + </format> + <format> + <includes> + <include>src/**/*.properties</include> + </includes> + <licenseHeader> + <!-- https://www.apache.org/legal/src-headers.html#headers --> + <content># +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to you under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#</content> + <delimiter>(##|[^#])</delimiter> + </licenseHeader> + <endWithNewline /> + </format> + </formats> + <yaml> + <includes> + <include>.asf.yaml</include> + <include>.github/**/*.yaml</include> + <include>.github/**/*.yml</include> + <include>src/**/*.yaml</include> + <include>src/**/*.yml</include> + </includes> + <licenseHeader> + <!-- https://www.apache.org/legal/src-headers.html#headers --> + <content># +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to you under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#</content> + <delimiter>(##|[^#])</delimiter> + </licenseHeader> + <endWithNewline /> + <trimTrailingWhitespace /> + </yaml> + <lineEndings>UNIX</lineEndings> + </configuration> + <dependencies> + <!-- `com.palantir.javaformat:palantir-java-format` is a fake dependency to receive updates from `dependabot`, `maven-versions-plugin`, etc. + This dependency is not needed to be defined here, it is implied by `<palantirJavaFormat>` element above. --> + <dependency> + <groupId>com.palantir.javaformat</groupId> + <artifactId>palantir-java-format</artifactId> + <version>${palantir-java-format.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>default-spotless</id> + <goals> + <goal>check</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> @@ -603,6 +779,12 @@ limitations under the License. </configuration> </plugin> + <plugin> + <groupId>com.diffplug.spotless</groupId> + <artifactId>spotless-maven-plugin</artifactId> + <version>${spotless-maven-plugin.version}</version> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> @@ -1394,6 +1576,7 @@ limitations under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> </plugin> + </plugins> </reporting> diff --git a/pom.xml b/pom.xml index 051f63a6b..159bf084a 100644 --- a/pom.xml +++ b/pom.xml @@ -53,4 +53,199 @@ limitations under the License. <module>build-support</module> </modules> + <properties> + <spotless-maven-plugin.version>3.4.0</spotless-maven-plugin.version> + <palantir-java-format.version>2.90.0</palantir-java-format.version> + </properties> + + <build> + <pluginManagement> + <plugins> + + <plugin> + <groupId>com.diffplug.spotless</groupId> + <artifactId>spotless-maven-plugin</artifactId> + <version>${spotless-maven-plugin.version}</version> + </plugin> + + </plugins> + </pluginManagement> + + <plugins> + + <!-- Configuration here must match the one in `.editorconfig`! --> + <plugin> + <groupId>com.diffplug.spotless</groupId> + <artifactId>spotless-maven-plugin</artifactId> + <configuration> + <java> + <licenseHeader> + <!-- https://www.apache.org/legal/src-headers.html#headers --> + <content>/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */</content> + </licenseHeader> + <palantirJavaFormat> + <version>${palantir-java-format.version}</version> + </palantirJavaFormat> + </java> + <pom> + <licenseHeader> + <!-- https://www.apache.org/legal/src-headers.html#headers --> + <content><?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to you under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --></content> + <delimiter><project</delimiter> + </licenseHeader> + <sortPom> + <expandEmptyElements>false</expandEmptyElements> + <!-- Maven Release plugin uses this style --> + <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement> + </sortPom> + </pom> + <formats> + <format> + <includes> + <include>src/**/*.xml</include> + </includes> + <excludes> + <!-- The license header in changelog entry files causing Git to match irrelevant files. + This is eventually causing merge conflicts. + Hence, we avoid enforcing license headers there. --> + <exclude>src/changelog/**/*.xml</exclude> + </excludes> + <licenseHeader> + <!-- https://www.apache.org/legal/src-headers.html#headers --> + <content><?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to you under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --></content> + <delimiter><(!DOCTYPE|\w)</delimiter> + </licenseHeader> + <endWithNewline /> + <trimTrailingWhitespace /> + </format> + <format> + <includes> + <include>src/**/*.properties</include> + </includes> + <licenseHeader> + <!-- https://www.apache.org/legal/src-headers.html#headers --> + <content># +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to you under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#</content> + <delimiter>(##|[^#])</delimiter> + </licenseHeader> + <endWithNewline /> + </format> + </formats> + <yaml> + <includes> + <include>.asf.yaml</include> + <include>.github/**/*.yaml</include> + <include>.github/**/*.yml</include> + <include>src/**/*.yaml</include> + <include>src/**/*.yml</include> + </includes> + <licenseHeader> + <!-- https://www.apache.org/legal/src-headers.html#headers --> + <content># +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to you under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#</content> + <delimiter>(##|[^#])</delimiter> + </licenseHeader> + <endWithNewline /> + <trimTrailingWhitespace /> + </yaml> + <lineEndings>UNIX</lineEndings> + </configuration> + <dependencies> + <!-- `com.palantir.javaformat:palantir-java-format` is a fake dependency to receive updates from `dependabot`, `maven-versions-plugin`, etc. + This dependency is not needed to be defined here, it is implied by `<palantirJavaFormat>` element above. --> + <dependency> + <groupId>com.palantir.javaformat</groupId> + <artifactId>palantir-java-format</artifactId> + <version>${palantir-java-format.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>default-spotless</id> + <goals> + <goal>check</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </project>
