From 33c6b806d5fe39ab29d46f24736a418f7ed1da2a Mon Sep 17 00:00:00 2001 From: John Bampton Date: Thu, 27 Nov 2025 03:24:18 +1000 Subject: [PATCH] Standardize and indent XML files with spaces Add xml file type to the EditorConfig. Clean up XML files converting tabs to spaces. We should use one format for indents in XML. There are less line changes when coverting the tabs to spaces --- .editorconfig | 3 ++ examples/java-spark-sql/pom.xml | 36 +++++++++---------- spark/common/pom.xml | 14 ++++---- .../test/resources/shapefiles/polygon/map.xml | 8 ++--- .../resources/shapefiles/polygon/map1.xml | 8 ++--- spark/spark-3.4/pom.xml | 14 ++++---- spark/spark-3.5/pom.xml | 14 ++++---- spark/spark-4.0/pom.xml | 14 ++++---- 8 files changed, 57 insertions(+), 54 deletions(-) diff --git a/.editorconfig b/.editorconfig index 0b0862caf6..14a8252742 100644 --- a/.editorconfig +++ b/.editorconfig @@ -28,5 +28,8 @@ charset = utf-8 insert_final_newline = true trim_trailing_whitespace = true +[*.xml] +indent_style = space + [Makefile] indent_style = tab diff --git a/examples/java-spark-sql/pom.xml b/examples/java-spark-sql/pom.xml index 787e8d911b..6e03cd101a 100644 --- a/examples/java-spark-sql/pom.xml +++ b/examples/java-spark-sql/pom.xml @@ -18,16 +18,16 @@ --> - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.apache.sedona - sedona-java-spark-example - 1.8.0 - Sedona : Examples : Java Spark SQL - Example project for Apache Sedona with Java and Spark. + org.apache.sedona + sedona-java-spark-example + 1.8.0 + Sedona : Examples : Java Spark SQL + Example project for Apache Sedona with Java and Spark. - + provided test @@ -57,13 +57,13 @@ --add-opens=java.base/sun.util.calendar=ALL-UNNAMED -Djdk.reflect.useDirectMethodHandle=false - + - + - org.datasyslab - geotools-wrapper - ${geotools.version} + org.datasyslab + geotools-wrapper + ${geotools.version} org.apache.sedona @@ -94,9 +94,9 @@ test - - - + + + org.apache.maven.plugins maven-surefire-plugin @@ -179,6 +179,6 @@ - - + + diff --git a/spark/common/pom.xml b/spark/common/pom.xml index 1119af4f3a..8b0f505799 100644 --- a/spark/common/pom.xml +++ b/spark/common/pom.xml @@ -18,19 +18,19 @@ --> - 4.0.0 + 4.0.0 org.apache.sedona sedona-spark-parent-${spark.compat.version}_${scala.compat.version} 1.8.1-SNAPSHOT ../pom.xml - sedona-spark-common-${spark.compat.version}_${scala.compat.version} + sedona-spark-common-${spark.compat.version}_${scala.compat.version} - ${project.groupId}:${project.artifactId} - A cluster computing system for processing large-scale spatial data: Common SQL API. + ${project.groupId}:${project.artifactId} + A cluster computing system for processing large-scale spatial data: Common SQL API. http://sedona.apache.org/ - jar + jar false @@ -293,7 +293,7 @@ test - + src/main/java @@ -336,7 +336,7 @@ scalastyle-maven-plugin - + sedona-spark-4.0 diff --git a/spark/common/src/test/resources/shapefiles/polygon/map.xml b/spark/common/src/test/resources/shapefiles/polygon/map.xml index d2604b2b6a..2bb68ec2c9 100644 --- a/spark/common/src/test/resources/shapefiles/polygon/map.xml +++ b/spark/common/src/test/resources/shapefiles/polygon/map.xml @@ -1,5 +1,5 @@ - testReadToGeometryRDD - map - additional file - \ No newline at end of file + testReadToGeometryRDD + map + additional file + diff --git a/spark/common/src/test/resources/shapefiles/polygon/map1.xml b/spark/common/src/test/resources/shapefiles/polygon/map1.xml index dacd217187..daef26af1b 100644 --- a/spark/common/src/test/resources/shapefiles/polygon/map1.xml +++ b/spark/common/src/test/resources/shapefiles/polygon/map1.xml @@ -1,5 +1,5 @@ - testReadToGeometryRDD - map1 - additional file - \ No newline at end of file + testReadToGeometryRDD + map1 + additional file + diff --git a/spark/spark-3.4/pom.xml b/spark/spark-3.4/pom.xml index b25ba3bb5c..73bd8f9fbb 100644 --- a/spark/spark-3.4/pom.xml +++ b/spark/spark-3.4/pom.xml @@ -18,19 +18,19 @@ --> - 4.0.0 + 4.0.0 org.apache.sedona sedona-spark-parent-${spark.compat.version}_${scala.compat.version} 1.8.1-SNAPSHOT ../pom.xml - sedona-spark-3.4_${scala.compat.version} + sedona-spark-3.4_${scala.compat.version} - ${project.groupId}:${project.artifactId} - A cluster computing system for processing large-scale spatial data: SQL API for Spark 3.4. + ${project.groupId}:${project.artifactId} + A cluster computing system for processing large-scale spatial data: SQL API for Spark 3.4. http://sedona.apache.org/ - jar + jar false @@ -165,7 +165,7 @@ test - + src/main/scala @@ -181,5 +181,5 @@ scalastyle-maven-plugin - + diff --git a/spark/spark-3.5/pom.xml b/spark/spark-3.5/pom.xml index 26a9da3ba3..83e9181fa1 100644 --- a/spark/spark-3.5/pom.xml +++ b/spark/spark-3.5/pom.xml @@ -18,19 +18,19 @@ --> - 4.0.0 + 4.0.0 org.apache.sedona sedona-spark-parent-${spark.compat.version}_${scala.compat.version} 1.8.1-SNAPSHOT ../pom.xml - sedona-spark-3.5_${scala.compat.version} + sedona-spark-3.5_${scala.compat.version} - ${project.groupId}:${project.artifactId} - A cluster computing system for processing large-scale spatial data: SQL API for Spark 3.5. + ${project.groupId}:${project.artifactId} + A cluster computing system for processing large-scale spatial data: SQL API for Spark 3.5. http://sedona.apache.org/ - jar + jar false @@ -165,7 +165,7 @@ test - + src/main/scala @@ -181,5 +181,5 @@ scalastyle-maven-plugin - + diff --git a/spark/spark-4.0/pom.xml b/spark/spark-4.0/pom.xml index ac58282770..be42c9c055 100644 --- a/spark/spark-4.0/pom.xml +++ b/spark/spark-4.0/pom.xml @@ -18,19 +18,19 @@ --> - 4.0.0 + 4.0.0 org.apache.sedona sedona-spark-parent-${spark.compat.version}_${scala.compat.version} 1.8.1-SNAPSHOT ../pom.xml - sedona-spark-4.0_${scala.compat.version} + sedona-spark-4.0_${scala.compat.version} - ${project.groupId}:${project.artifactId} - A cluster computing system for processing large-scale spatial data: SQL API for Spark 4.0. + ${project.groupId}:${project.artifactId} + A cluster computing system for processing large-scale spatial data: SQL API for Spark 4.0. http://sedona.apache.org/ - jar + jar false @@ -165,7 +165,7 @@ test - + src/main/scala @@ -181,5 +181,5 @@ scalastyle-maven-plugin - +