diff --git a/docs/source/developers/java/development.rst b/docs/source/developers/java/development.rst index 275702968622b..3010156af0476 100644 --- a/docs/source/developers/java/development.rst +++ b/docs/source/developers/java/development.rst @@ -123,8 +123,8 @@ that changes adhere to the style guide. Automatically fixing code style issues -------------------------------------- -- You can also just check the style without building the project with `mvn spotless:check`. -- The Java code style can be corrected from the command line by using the following commands: `mvn spotless:apply`. +- You can also just check the style without building the project with ``mvn spotless:check``. +- The Java code style can be corrected from the command line by using the following commands: ``mvn spotless:apply``. .. code-block:: bash @@ -164,4 +164,4 @@ Checkstyle will be removed once Spotless is fully integrated. .. _Spotless: https://github.com/diffplug/spotless .. _Google Java Style: https://google.github.io/styleguide/javaguide.html .. _Eclipse: https://github.com/google/google-java-format?tab=readme-ov-file#eclipse -.. _IntelliJ: https://github.com/google/google-java-format?tab=readme-ov-file#intellij-android-studio-and-other-jetbrains-ides \ No newline at end of file +.. _IntelliJ: https://github.com/google/google-java-format?tab=readme-ov-file#intellij-android-studio-and-other-jetbrains-ides diff --git a/java/algorithm/pom.xml b/java/algorithm/pom.xml index 54afddfa15a09..dc15dab532f64 100644 --- a/java/algorithm/pom.xml +++ b/java/algorithm/pom.xml @@ -68,7 +68,7 @@ pom.xml - ../spotless/asf-xml.license + ../dev/license/asf-xml.license (<configuration|<project) @@ -78,14 +78,14 @@ **/*.java - ../spotless/asf-java.license + ../dev/license/asf-java.license package - 1.17.0 + 1.7 diff --git a/java/dev/checkstyle/checkstyle.license b/java/dev/checkstyle/checkstyle.license deleted file mode 100644 index 3e7c6c26f5578..0000000000000 --- a/java/dev/checkstyle/checkstyle.license +++ /dev/null @@ -1,16 +0,0 @@ -/* - * 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. - */ diff --git a/java/spotless/asf-java.license b/java/dev/license/asf-java.license similarity index 100% rename from java/spotless/asf-java.license rename to java/dev/license/asf-java.license diff --git a/java/spotless/asf-xml.license b/java/dev/license/asf-xml.license similarity index 100% rename from java/spotless/asf-xml.license rename to java/dev/license/asf-xml.license diff --git a/java/maven/pom.xml b/java/maven/pom.xml index f290ded2e2913..0364463dec77e 100644 --- a/java/maven/pom.xml +++ b/java/maven/pom.xml @@ -251,7 +251,7 @@ 3.1.0 ../dev/checkstyle/checkstyle.xml - ../dev/checkstyle/checkstyle.license + ../dev/license/asf-java.license ../dev/checkstyle/suppressions.xml true UTF-8 diff --git a/java/pom.xml b/java/pom.xml index 289810daba3ac..ba2199ee63c39 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -730,7 +730,7 @@ **/module-info.java dev/checkstyle/checkstyle.xml - dev/checkstyle/checkstyle.license + dev/license/asf-java.license dev/checkstyle/suppressions.xml true UTF-8