From eb0d82c4c9a305f625a83fd134746c46c5766f33 Mon Sep 17 00:00:00 2001
From: David Rabinowitz <davidrab@google.com>
Date: Thu, 7 Sep 2023 21:21:15 -0700
Subject: [PATCH 1/4] mvn tidy:pom was applied

---
 bigquery-connector-common/pom.xml             | 12 ++++++---
 pom.xml                                       | 27 +++++++++----------
 spark-bigquery-connector-common/pom.xml       |  8 ++++--
 spark-bigquery-dsv1/pom.xml                   | 10 ++++---
 .../spark-bigquery-dsv1-parent/pom.xml        | 24 ++++++++++-------
 .../pom.xml                                   |  8 +++---
 .../pom.xml                                   |  8 +++---
 .../pom.xml                                   | 12 ++++++---
 .../pom.xml                                   | 19 +++++++------
 .../pom.xml                                   | 20 ++++++++------
 .../pom.xml                                   | 18 ++++++++-----
 .../spark-bigquery_2.11/pom.xml               | 17 +++++++-----
 .../spark-bigquery_2.12/pom.xml               | 17 +++++++-----
 .../spark-bigquery_2.13/pom.xml               | 17 +++++++-----
 spark-bigquery-dsv2/pom.xml                   | 10 ++++---
 .../spark-2.4-bigquery/pom.xml                | 19 +++++++------
 .../spark-3.1-bigquery-lib/pom.xml            | 17 +++++++-----
 .../spark-3.1-bigquery/pom.xml                | 17 +++++++-----
 .../spark-3.2-bigquery-lib/pom.xml            | 17 +++++++-----
 .../spark-3.2-bigquery/pom.xml                | 17 +++++++-----
 .../spark-3.3-bigquery-lib/pom.xml            | 17 +++++++-----
 .../spark-3.3-bigquery/pom.xml                | 17 +++++++-----
 .../spark-3.4-bigquery-lib/pom.xml            | 17 +++++++-----
 .../spark-3.4-bigquery/pom.xml                | 17 +++++++-----
 .../spark-bigquery-dsv2-common/pom.xml        | 16 ++++++-----
 .../spark-bigquery-dsv2-parent/pom.xml        | 18 ++++++++-----
 .../spark-bigquery-metrics/pom.xml            | 17 +++++++-----
 spark-bigquery-parent/pom.xml                 | 14 +++++-----
 spark-bigquery-pushdown/pom.xml               | 13 +++++----
 .../spark-2.4-bigquery-pushdown_2.11/pom.xml  | 10 +++----
 .../spark-2.4-bigquery-pushdown_2.12/pom.xml  |  9 +++----
 .../spark-3.1-bigquery-pushdown_2.12/pom.xml  |  9 +++----
 .../spark-3.2-bigquery-pushdown_2.12/pom.xml  | 10 +++----
 .../spark-3.2-bigquery-pushdown_2.13/pom.xml  | 10 +++----
 .../spark-3.3-bigquery-pushdown_2.12/pom.xml  |  8 +++---
 .../spark-3.3-bigquery-pushdown_2.13/pom.xml  |  8 +++---
 .../pom.xml                                   | 11 ++++----
 .../pom.xml                                   |  9 +++----
 .../pom.xml                                   |  9 +++----
 .../spark-bigquery-pushdown-parent/pom.xml    | 26 +++++++++---------
 spark-bigquery-python-lib/pom.xml             | 12 ++++-----
 spark-bigquery-scala-212-support/pom.xml      |  7 +++--
 spark-bigquery-tests/pom.xml                  |  8 +++---
 43 files changed, 343 insertions(+), 263 deletions(-)

diff --git a/bigquery-connector-common/pom.xml b/bigquery-connector-common/pom.xml
index c27b6aede..55b99cba9 100644
--- a/bigquery-connector-common/pom.xml
+++ b/bigquery-connector-common/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
@@ -10,6 +10,7 @@
   </parent>
 
   <artifactId>bigquery-connector-common</artifactId>
+
   <name>BigQuery Connector Common Library</name>
   <licenses>
     <license>
@@ -18,6 +19,7 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
   <dependencies>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
@@ -47,7 +49,8 @@
           <groupId>com.google.api.grpc</groupId>
           <artifactId>proto-google-cloud-bigquerystorage-v1beta2</artifactId>
         </exclusion>
-      </exclusions>    </dependency>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigquerystorage</artifactId>
@@ -129,6 +132,7 @@
       <version>2.9.1</version>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
diff --git a/pom.xml b/pom.xml
index 9b3480611..9ad79c3f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
@@ -11,8 +11,8 @@
 
   <artifactId>spark-bigquery-reactor</artifactId>
   <packaging>pom</packaging>
-  <name>Spark BigQuery Connector Reactor</name>
 
+  <name>Spark BigQuery Connector Reactor</name>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -28,6 +28,15 @@
     </developer>
   </developers>
 
+  <modules>
+    <module>spark-bigquery-parent</module>
+    <module>bigquery-connector-common</module>
+    <module>spark-bigquery-tests</module>
+    <module>spark-bigquery-scala-212-support</module>
+    <module>spark-bigquery-connector-common</module>
+    <module>spark-bigquery-python-lib</module>
+  </modules>
+
   <scm>
     <connection>
       scm:git:git@github.com:GoogleCloudDataproc/spark-bigquery-connector.git
@@ -37,7 +46,6 @@
     </developerConnection>
     <url>git@github.com:GoogleCloudDataproc/spark-bigquery-connector.git</url>
   </scm>
-
   <issueManagement>
     <system>GitHub Issues</system>
     <url>
@@ -45,15 +53,6 @@
     </url>
   </issueManagement>
 
-  <modules>
-    <module>spark-bigquery-parent</module>
-    <module>bigquery-connector-common</module>
-    <module>spark-bigquery-tests</module>
-    <module>spark-bigquery-scala-212-support</module>
-    <module>spark-bigquery-connector-common</module>
-    <module>spark-bigquery-python-lib</module>
-  </modules>
-
   <profiles>
     <profile>
       <id>all</id>
diff --git a/spark-bigquery-connector-common/pom.xml b/spark-bigquery-connector-common/pom.xml
index a611d712b..1bfa1b3d3 100644
--- a/spark-bigquery-connector-common/pom.xml
+++ b/spark-bigquery-connector-common/pom.xml
@@ -1,6 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>com.google.cloud.spark</groupId>
         <artifactId>spark-bigquery-parent</artifactId>
@@ -9,6 +10,7 @@
     </parent>
 
     <artifactId>spark-bigquery-connector-common</artifactId>
+
     <name>Spark BigQuery Connector Common Library</name>
     <licenses>
         <license>
@@ -17,6 +19,7 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -81,6 +84,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
diff --git a/spark-bigquery-dsv1/pom.xml b/spark-bigquery-dsv1/pom.xml
index 76eadf15c..b3c66231d 100644
--- a/spark-bigquery-dsv1/pom.xml
+++ b/spark-bigquery-dsv1/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
@@ -10,8 +10,10 @@
   </parent>
 
   <artifactId>spark-bigquery-dsv1</artifactId>
-  <name>BigQuery DataSource v1 implementation</name>
   <packaging>pom</packaging>
+
+  <name>BigQuery DataSource v1 implementation</name>
+
   <modules>
     <module>spark-bigquery-dsv1-spark2-support</module>
     <module>spark-bigquery-dsv1-spark3-support</module>
diff --git a/spark-bigquery-dsv1/spark-bigquery-dsv1-parent/pom.xml b/spark-bigquery-dsv1/spark-bigquery-dsv1-parent/pom.xml
index 920099b3e..261090a01 100644
--- a/spark-bigquery-dsv1/spark-bigquery-dsv1-parent/pom.xml
+++ b/spark-bigquery-dsv1/spark-bigquery-dsv1-parent/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
@@ -10,12 +10,9 @@
   </parent>
 
   <artifactId>spark-bigquery-dsv1-parent</artifactId>
-  <name>BigQuery DataSource v1 implementation common settings</name>
   <packaging>pom</packaging>
-  <properties>
-    <scala.binary.version>2.11</scala.binary.version>
-    <spark.version>2.4.0</spark.version>
-  </properties>
+
+  <name>BigQuery DataSource v1 implementation common settings</name>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -23,6 +20,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <scala.binary.version>2.11</scala.binary.version>
+    <spark.version>2.4.0</spark.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -85,15 +88,15 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>bigquery-connector-common</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
       <classifier>tests</classifier>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>spark-bigquery-connector-common</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
       <classifier>tests</classifier>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -102,6 +105,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
     <sourceDirectory>src/main/scala</sourceDirectory>
     <plugins>
diff --git a/spark-bigquery-dsv1/spark-bigquery-dsv1-spark2-support/pom.xml b/spark-bigquery-dsv1/spark-bigquery-dsv1-spark2-support/pom.xml
index 4789126b7..b2f860f7f 100644
--- a/spark-bigquery-dsv1/spark-bigquery-dsv1-spark2-support/pom.xml
+++ b/spark-bigquery-dsv1/spark-bigquery-dsv1-spark2-support/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
@@ -10,6 +10,7 @@
   </parent>
 
   <artifactId>spark-bigquery-dsv1-spark2-support</artifactId>
+
   <name>Spark BigQuery Connector Spark 2 Support</name>
   <licenses>
     <license>
@@ -18,6 +19,7 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/spark-bigquery-dsv1/spark-bigquery-dsv1-spark3-support/pom.xml b/spark-bigquery-dsv1/spark-bigquery-dsv1-spark3-support/pom.xml
index b90c502fd..bf451556c 100644
--- a/spark-bigquery-dsv1/spark-bigquery-dsv1-spark3-support/pom.xml
+++ b/spark-bigquery-dsv1/spark-bigquery-dsv1-spark3-support/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
@@ -10,6 +10,7 @@
   </parent>
 
   <artifactId>spark-bigquery-dsv1-spark3-support</artifactId>
+
   <name>Spark BigQuery Connector Spark 3 Support</name>
   <licenses>
     <license>
@@ -18,6 +19,7 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/spark-bigquery-dsv1/spark-bigquery-with-dependencies-parent/pom.xml b/spark-bigquery-dsv1/spark-bigquery-with-dependencies-parent/pom.xml
index a2702bb1d..3d71b8367 100644
--- a/spark-bigquery-dsv1/spark-bigquery-with-dependencies-parent/pom.xml
+++ b/spark-bigquery-dsv1/spark-bigquery-with-dependencies-parent/pom.xml
@@ -1,16 +1,18 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../../spark-bigquery-parent</relativePath>
   </parent>
+
   <artifactId>spark-bigquery-with-dependencies-parent</artifactId>
-  <name>BigQuery DataSource v1 shaded distributable common settings</name>
   <packaging>pom</packaging>
+
+  <name>BigQuery DataSource v1 shaded distributable common settings</name>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -18,6 +20,7 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -26,6 +29,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <!-- generating empty javadoc jar, for Maven Central publishing -->
diff --git a/spark-bigquery-dsv1/spark-bigquery-with-dependencies_2.11/pom.xml b/spark-bigquery-dsv1/spark-bigquery-with-dependencies_2.11/pom.xml
index 67be1720a..4e1ad8396 100644
--- a/spark-bigquery-dsv1/spark-bigquery-with-dependencies_2.11/pom.xml
+++ b/spark-bigquery-dsv1/spark-bigquery-with-dependencies_2.11/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-with-dependencies-parent</artifactId>
@@ -10,11 +10,8 @@
   </parent>
 
   <artifactId>spark-bigquery-with-dependencies_2.11</artifactId>
+
   <name>BigQuery DataSource v1 shaded distributable for Scala 2.11</name>
-  <properties>
-    <scala.binary.version>2.11</scala.binary.version>
-    <shade.skip>false</shade.skip>
-  </properties>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -22,6 +19,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <scala.binary.version>2.11</scala.binary.version>
+    <shade.skip>false</shade.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -29,4 +32,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/spark-bigquery-dsv1/spark-bigquery-with-dependencies_2.12/pom.xml b/spark-bigquery-dsv1/spark-bigquery-with-dependencies_2.12/pom.xml
index 8f08e7277..e170f0a0d 100644
--- a/spark-bigquery-dsv1/spark-bigquery-with-dependencies_2.12/pom.xml
+++ b/spark-bigquery-dsv1/spark-bigquery-with-dependencies_2.12/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>com.google.cloud.spark</groupId>
         <artifactId>spark-bigquery-with-dependencies-parent</artifactId>
@@ -10,11 +10,8 @@
     </parent>
 
     <artifactId>spark-bigquery-with-dependencies_2.12</artifactId>
+
     <name>BigQuery DataSource v1 shaded distributable for Scala 2.12</name>
-    <properties>
-        <scala.binary.version>2.12</scala.binary.version>
-        <shade.skip>false</shade.skip>
-    </properties>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -22,6 +19,12 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
+
+    <properties>
+        <scala.binary.version>2.12</scala.binary.version>
+        <shade.skip>false</shade.skip>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -29,6 +32,7 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -51,4 +55,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/spark-bigquery-dsv1/spark-bigquery-with-dependencies_2.13/pom.xml b/spark-bigquery-dsv1/spark-bigquery-with-dependencies_2.13/pom.xml
index 09b954cae..59963a1f7 100644
--- a/spark-bigquery-dsv1/spark-bigquery-with-dependencies_2.13/pom.xml
+++ b/spark-bigquery-dsv1/spark-bigquery-with-dependencies_2.13/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>com.google.cloud.spark</groupId>
         <artifactId>spark-bigquery-with-dependencies-parent</artifactId>
@@ -10,11 +10,8 @@
     </parent>
 
     <artifactId>spark-bigquery-with-dependencies_2.13</artifactId>
+
     <name>BigQuery DataSource v1 shaded distributable for Scala 2.13</name>
-    <properties>
-        <scala.binary.version>2.13</scala.binary.version>
-        <shade.skip>false</shade.skip>
-    </properties>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -22,6 +19,12 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
+
+    <properties>
+        <scala.binary.version>2.13</scala.binary.version>
+        <shade.skip>false</shade.skip>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -29,6 +32,7 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
diff --git a/spark-bigquery-dsv1/spark-bigquery_2.11/pom.xml b/spark-bigquery-dsv1/spark-bigquery_2.11/pom.xml
index 8505f75a8..eb8f4da9c 100644
--- a/spark-bigquery-dsv1/spark-bigquery_2.11/pom.xml
+++ b/spark-bigquery-dsv1/spark-bigquery_2.11/pom.xml
@@ -1,6 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-dsv1-parent</artifactId>
@@ -9,11 +10,8 @@
   </parent>
 
   <artifactId>spark-bigquery_2.11</artifactId>
+
   <name>BigQuery DataSource v1 for Scala 2.11</name>
-  <properties>
-    <scala.binary.version>2.11</scala.binary.version>
-    <spark.version>2.4.0</spark.version>
-  </properties>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -21,6 +19,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <scala.binary.version>2.11</scala.binary.version>
+    <spark.version>2.4.0</spark.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -29,6 +33,7 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <!-- make sure we don't have any _2.10 or _2.12 dependencies when building
diff --git a/spark-bigquery-dsv1/spark-bigquery_2.12/pom.xml b/spark-bigquery-dsv1/spark-bigquery_2.12/pom.xml
index 082fe5f0f..0473fa350 100644
--- a/spark-bigquery-dsv1/spark-bigquery_2.12/pom.xml
+++ b/spark-bigquery-dsv1/spark-bigquery_2.12/pom.xml
@@ -1,6 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-dsv1-parent</artifactId>
@@ -9,11 +10,8 @@
   </parent>
 
   <artifactId>spark-bigquery_2.12</artifactId>
+
   <name>BigQuery DataSource v1 for Scala 2.12</name>
-  <properties>
-    <scala.binary.version>2.12</scala.binary.version>
-    <spark.version>2.4.0</spark.version>
-  </properties>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -21,6 +19,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <scala.binary.version>2.12</scala.binary.version>
+    <spark.version>2.4.0</spark.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -41,6 +45,7 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <!-- make sure we don't have any _2.10 or _2.11 dependencies when building
diff --git a/spark-bigquery-dsv1/spark-bigquery_2.13/pom.xml b/spark-bigquery-dsv1/spark-bigquery_2.13/pom.xml
index b08af96cd..e2f13f33a 100644
--- a/spark-bigquery-dsv1/spark-bigquery_2.13/pom.xml
+++ b/spark-bigquery-dsv1/spark-bigquery_2.13/pom.xml
@@ -1,6 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-dsv1-parent</artifactId>
@@ -9,11 +10,8 @@
   </parent>
 
   <artifactId>spark-bigquery_2.13</artifactId>
+
   <name>BigQuery DataSource v1 for Scala 2.13</name>
-  <properties>
-    <scala.binary.version>2.13</scala.binary.version>
-    <spark.version>3.2.0</spark.version>
-  </properties>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -21,6 +19,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <scala.binary.version>2.13</scala.binary.version>
+    <spark.version>3.2.0</spark.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -35,6 +39,7 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <!-- make sure we don't have any _2.10 or _2.11 dependencies when building
diff --git a/spark-bigquery-dsv2/pom.xml b/spark-bigquery-dsv2/pom.xml
index 0aebe405e..44591ce25 100644
--- a/spark-bigquery-dsv2/pom.xml
+++ b/spark-bigquery-dsv2/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
@@ -10,8 +10,10 @@
   </parent>
 
   <artifactId>spark-bigquery-dsv2</artifactId>
-  <name>BigQuery DataSource v2 implementation</name>
   <packaging>pom</packaging>
+
+  <name>BigQuery DataSource v2 implementation</name>
+
   <modules>
     <module>spark-bigquery-dsv2-common</module>
     <module>spark-bigquery-dsv2-parent</module>
diff --git a/spark-bigquery-dsv2/spark-2.4-bigquery/pom.xml b/spark-bigquery-dsv2/spark-2.4-bigquery/pom.xml
index 25d644c96..0641a5563 100644
--- a/spark-bigquery-dsv2/spark-2.4-bigquery/pom.xml
+++ b/spark-bigquery-dsv2/spark-2.4-bigquery/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>com.google.cloud.spark</groupId>
         <artifactId>spark-bigquery-dsv2-parent</artifactId>
@@ -11,11 +11,8 @@
 
     <artifactId>spark-2.4-bigquery</artifactId>
     <version>${revision}</version>
+
     <name>BigQuery DataSource v2 for Spark 2.4</name>
-    <properties>
-        <spark.version>2.4.0</spark.version>
-        <shade.skip>false</shade.skip>
-    </properties>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -23,6 +20,12 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
+
+    <properties>
+        <spark.version>2.4.0</spark.version>
+        <shade.skip>false</shade.skip>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -37,4 +40,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/spark-bigquery-dsv2/spark-3.1-bigquery-lib/pom.xml b/spark-bigquery-dsv2/spark-3.1-bigquery-lib/pom.xml
index f35fc9dba..4ff12cb21 100644
--- a/spark-bigquery-dsv2/spark-3.1-bigquery-lib/pom.xml
+++ b/spark-bigquery-dsv2/spark-3.1-bigquery-lib/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-dsv2-parent</artifactId>
@@ -11,11 +11,8 @@
 
   <artifactId>spark-3.1-bigquery-lib</artifactId>
   <version>${revision}</version>
+
   <name>Connector code for BigQuery DataSource v2 for Spark 3.1</name>
-  <properties>
-    <spark.version>3.1.0</spark.version>
-    <shade.skip>true</shade.skip>
-  </properties>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -23,6 +20,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <spark.version>3.1.0</spark.version>
+    <shade.skip>true</shade.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.spark</groupId>
diff --git a/spark-bigquery-dsv2/spark-3.1-bigquery/pom.xml b/spark-bigquery-dsv2/spark-3.1-bigquery/pom.xml
index 15181b57f..a47d89ec0 100644
--- a/spark-bigquery-dsv2/spark-3.1-bigquery/pom.xml
+++ b/spark-bigquery-dsv2/spark-3.1-bigquery/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-dsv2-parent</artifactId>
@@ -11,11 +11,8 @@
 
   <artifactId>spark-3.1-bigquery</artifactId>
   <version>${revision}</version>
+
   <name>BigQuery DataSource v2 for Spark 3.1</name>
-  <properties>
-    <spark.version>3.1.0</spark.version>
-    <shade.skip>false</shade.skip>
-  </properties>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -23,6 +20,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <spark.version>3.1.0</spark.version>
+    <shade.skip>false</shade.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/spark-bigquery-dsv2/spark-3.2-bigquery-lib/pom.xml b/spark-bigquery-dsv2/spark-3.2-bigquery-lib/pom.xml
index 6ffd2b232..699aa1540 100644
--- a/spark-bigquery-dsv2/spark-3.2-bigquery-lib/pom.xml
+++ b/spark-bigquery-dsv2/spark-3.2-bigquery-lib/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-dsv2-parent</artifactId>
@@ -11,11 +11,8 @@
 
   <artifactId>spark-3.2-bigquery-lib</artifactId>
   <version>${revision}</version>
+
   <name>Connector code for BigQuery DataSource v2 for Spark 3.2</name>
-  <properties>
-    <spark.version>3.2.0</spark.version>
-    <shade.skip>true</shade.skip>
-  </properties>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -23,6 +20,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <spark.version>3.2.0</spark.version>
+    <shade.skip>true</shade.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/spark-bigquery-dsv2/spark-3.2-bigquery/pom.xml b/spark-bigquery-dsv2/spark-3.2-bigquery/pom.xml
index 06dea7732..16a388492 100644
--- a/spark-bigquery-dsv2/spark-3.2-bigquery/pom.xml
+++ b/spark-bigquery-dsv2/spark-3.2-bigquery/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-dsv2-parent</artifactId>
@@ -11,11 +11,8 @@
 
   <artifactId>spark-3.2-bigquery</artifactId>
   <version>${revision}</version>
+
   <name>BigQuery DataSource v2 for Spark 3.2</name>
-  <properties>
-    <spark.version>3.2.0</spark.version>
-    <shade.skip>false</shade.skip>
-  </properties>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -23,6 +20,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <spark.version>3.2.0</spark.version>
+    <shade.skip>false</shade.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/spark-bigquery-dsv2/spark-3.3-bigquery-lib/pom.xml b/spark-bigquery-dsv2/spark-3.3-bigquery-lib/pom.xml
index 0a7d33d4d..3bdada143 100644
--- a/spark-bigquery-dsv2/spark-3.3-bigquery-lib/pom.xml
+++ b/spark-bigquery-dsv2/spark-3.3-bigquery-lib/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-dsv2-parent</artifactId>
@@ -11,11 +11,8 @@
 
   <artifactId>spark-3.3-bigquery-lib</artifactId>
   <version>${revision}</version>
+
   <name>Connector code for BigQuery DataSource v2 for Spark 3.3</name>
-  <properties>
-    <spark.version>3.3.0</spark.version>
-    <shade.skip>true</shade.skip>
-  </properties>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -23,6 +20,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <spark.version>3.3.0</spark.version>
+    <shade.skip>true</shade.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/spark-bigquery-dsv2/spark-3.3-bigquery/pom.xml b/spark-bigquery-dsv2/spark-3.3-bigquery/pom.xml
index 33c200d5e..d8d60d2d5 100644
--- a/spark-bigquery-dsv2/spark-3.3-bigquery/pom.xml
+++ b/spark-bigquery-dsv2/spark-3.3-bigquery/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-dsv2-parent</artifactId>
@@ -11,11 +11,8 @@
 
   <artifactId>spark-3.3-bigquery</artifactId>
   <version>${revision}</version>
+
   <name>BigQuery DataSource v2 for Spark 3.3</name>
-  <properties>
-    <spark.version>3.3.0</spark.version>
-    <shade.skip>false</shade.skip>
-  </properties>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -23,6 +20,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <spark.version>3.3.0</spark.version>
+    <shade.skip>false</shade.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/spark-bigquery-dsv2/spark-3.4-bigquery-lib/pom.xml b/spark-bigquery-dsv2/spark-3.4-bigquery-lib/pom.xml
index 39bb6c111..d2f80d176 100644
--- a/spark-bigquery-dsv2/spark-3.4-bigquery-lib/pom.xml
+++ b/spark-bigquery-dsv2/spark-3.4-bigquery-lib/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-dsv2-parent</artifactId>
@@ -11,11 +11,8 @@
 
   <artifactId>spark-3.4-bigquery-lib</artifactId>
   <version>${revision}</version>
+
   <name>Connector code for BigQuery DataSource v2 for Spark 3.3</name>
-  <properties>
-    <spark.version>3.4.0</spark.version>
-    <shade.skip>true</shade.skip>
-  </properties>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -23,6 +20,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <spark.version>3.4.0</spark.version>
+    <shade.skip>true</shade.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/spark-bigquery-dsv2/spark-3.4-bigquery/pom.xml b/spark-bigquery-dsv2/spark-3.4-bigquery/pom.xml
index ea34f9700..8bf4e2a79 100644
--- a/spark-bigquery-dsv2/spark-3.4-bigquery/pom.xml
+++ b/spark-bigquery-dsv2/spark-3.4-bigquery/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-dsv2-parent</artifactId>
@@ -11,11 +11,8 @@
 
   <artifactId>spark-3.4-bigquery</artifactId>
   <version>${revision}</version>
+
   <name>BigQuery DataSource v2 for Spark 3.4</name>
-  <properties>
-    <spark.version>3.4.0</spark.version>
-    <shade.skip>false</shade.skip>
-  </properties>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -23,6 +20,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <spark.version>3.4.0</spark.version>
+    <shade.skip>false</shade.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/spark-bigquery-dsv2/spark-bigquery-dsv2-common/pom.xml b/spark-bigquery-dsv2/spark-bigquery-dsv2-common/pom.xml
index e89b5c862..67e7af294 100644
--- a/spark-bigquery-dsv2/spark-bigquery-dsv2-common/pom.xml
+++ b/spark-bigquery-dsv2/spark-bigquery-dsv2-common/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>com.google.cloud.spark</groupId>
         <artifactId>spark-bigquery-parent</artifactId>
@@ -10,10 +10,8 @@
     </parent>
 
     <artifactId>spark-bigquery-dsv2-common</artifactId>
+
     <name>BigQuery DataSource v2 implementation common implementation</name>
-    <properties>
-        <spark.version>2.4.0</spark.version>
-    </properties>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -21,6 +19,11 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
+
+    <properties>
+        <spark.version>2.4.0</spark.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -58,6 +61,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
diff --git a/spark-bigquery-dsv2/spark-bigquery-dsv2-parent/pom.xml b/spark-bigquery-dsv2/spark-bigquery-dsv2-parent/pom.xml
index 5abfa6e19..71e230463 100644
--- a/spark-bigquery-dsv2/spark-bigquery-dsv2-parent/pom.xml
+++ b/spark-bigquery-dsv2/spark-bigquery-dsv2-parent/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
@@ -10,11 +10,9 @@
   </parent>
 
   <artifactId>spark-bigquery-dsv2-parent</artifactId>
-  <name>BigQuery DataSource v2 implementation common settings</name>
   <packaging>pom</packaging>
-  <properties>
-    <spark.version>2.4.0</spark.version>
-  </properties>
+
+  <name>BigQuery DataSource v2 implementation common settings</name>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -22,6 +20,11 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <spark.version>2.4.0</spark.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -59,6 +62,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
diff --git a/spark-bigquery-dsv2/spark-bigquery-metrics/pom.xml b/spark-bigquery-dsv2/spark-bigquery-metrics/pom.xml
index 7e3bdea98..5f3c62fed 100644
--- a/spark-bigquery-dsv2/spark-bigquery-metrics/pom.xml
+++ b/spark-bigquery-dsv2/spark-bigquery-metrics/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>com.google.cloud.spark</groupId>
         <artifactId>spark-bigquery-dsv2-parent</artifactId>
@@ -11,11 +11,8 @@
 
     <artifactId>spark-bigquery-metrics</artifactId>
     <version>${revision}</version>
+
     <name>Custom Metrics code for BigQuery DataSource v2 for Spark 3.2</name>
-    <properties>
-        <spark.version>3.2.0</spark.version>
-        <shade.skip>true</shade.skip>
-    </properties>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -23,6 +20,12 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
+
+    <properties>
+        <spark.version>3.2.0</spark.version>
+        <shade.skip>true</shade.skip>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.spark</groupId>
diff --git a/spark-bigquery-parent/pom.xml b/spark-bigquery-parent/pom.xml
index c6cdc0360..15baa6290 100644
--- a/spark-bigquery-parent/pom.xml
+++ b/spark-bigquery-parent/pom.xml
@@ -1,16 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>
+
     <name>Spark BigQuery Connector Build Parent</name>
     <description>Parent project for all the Spark BigQuery Connector artifacts
     </description>
     <url>https://github.com/GoogleCloudDataproc/spark-bigquery-connector</url>
-
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -35,7 +35,6 @@
         </developerConnection>
         <url>git@github.com:GoogleCloudDataproc/spark-bigquery-connector.git</url>
     </scm>
-
     <distributionManagement>
         <snapshotRepository>
             <id>ossrh</id>
@@ -73,6 +72,7 @@
         <checkstyle.header.file>${reactor.project.basedir}/java.header</checkstyle.header.file>
         -->
     </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -85,8 +85,8 @@
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
                 <version>${jackson.version}</version>
-                <scope>import</scope>
                 <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
@@ -303,6 +303,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -662,6 +663,7 @@
             </plugin>
         </plugins>
     </build>
+
     <reporting>
         <plugins>
             <plugin>
diff --git a/spark-bigquery-pushdown/pom.xml b/spark-bigquery-pushdown/pom.xml
index cd2b2fa04..973a336dc 100644
--- a/spark-bigquery-pushdown/pom.xml
+++ b/spark-bigquery-pushdown/pom.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>spark-bigquery-parent</artifactId>
     <groupId>com.google.cloud.spark</groupId>
+    <artifactId>spark-bigquery-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../spark-bigquery-parent</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>spark-bigquery-pushdown</artifactId>
-  <name>Spark BigQuery Predicate Pushdown Implementation</name>
   <packaging>pom</packaging>
 
+  <name>Spark BigQuery Predicate Pushdown Implementation</name>
+
   <modules>
     <module>spark-bigquery-pushdown-parent</module>
     <module>spark-2.4-bigquery-pushdown_2.11</module>
@@ -27,5 +27,4 @@
     <module>spark-bigquery-pushdown-common_2.12</module>
     <module>spark-bigquery-pushdown-common_2.13</module>
   </modules>
-
 </project>
diff --git a/spark-bigquery-pushdown/spark-2.4-bigquery-pushdown_2.11/pom.xml b/spark-bigquery-pushdown/spark-2.4-bigquery-pushdown_2.11/pom.xml
index 5735182e9..62f53e295 100644
--- a/spark-bigquery-pushdown/spark-2.4-bigquery-pushdown_2.11/pom.xml
+++ b/spark-bigquery-pushdown/spark-2.4-bigquery-pushdown_2.11/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <groupId>com.google.cloud.spark</groupId>
+    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../spark-bigquery-pushdown-parent</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>spark-2.4-bigquery-pushdown_2.11</artifactId>
 
@@ -31,5 +30,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/spark-bigquery-pushdown/spark-2.4-bigquery-pushdown_2.12/pom.xml b/spark-bigquery-pushdown/spark-2.4-bigquery-pushdown_2.12/pom.xml
index d250bf1e7..02cc348e0 100644
--- a/spark-bigquery-pushdown/spark-2.4-bigquery-pushdown_2.12/pom.xml
+++ b/spark-bigquery-pushdown/spark-2.4-bigquery-pushdown_2.12/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <groupId>com.google.cloud.spark</groupId>
+    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../spark-bigquery-pushdown-parent</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>spark-2.4-bigquery-pushdown_2.12</artifactId>
 
diff --git a/spark-bigquery-pushdown/spark-3.1-bigquery-pushdown_2.12/pom.xml b/spark-bigquery-pushdown/spark-3.1-bigquery-pushdown_2.12/pom.xml
index f7ded7e64..b4f5b0054 100644
--- a/spark-bigquery-pushdown/spark-3.1-bigquery-pushdown_2.12/pom.xml
+++ b/spark-bigquery-pushdown/spark-3.1-bigquery-pushdown_2.12/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <groupId>com.google.cloud.spark</groupId>
+    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../spark-bigquery-pushdown-parent</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>spark-3.1-bigquery-pushdown_2.12</artifactId>
 
diff --git a/spark-bigquery-pushdown/spark-3.2-bigquery-pushdown_2.12/pom.xml b/spark-bigquery-pushdown/spark-3.2-bigquery-pushdown_2.12/pom.xml
index 75385d92a..7206d8a0a 100644
--- a/spark-bigquery-pushdown/spark-3.2-bigquery-pushdown_2.12/pom.xml
+++ b/spark-bigquery-pushdown/spark-3.2-bigquery-pushdown_2.12/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <groupId>com.google.cloud.spark</groupId>
+    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../spark-bigquery-pushdown-parent</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>spark-3.2-bigquery-pushdown_2.12</artifactId>
 
@@ -31,5 +30,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/spark-bigquery-pushdown/spark-3.2-bigquery-pushdown_2.13/pom.xml b/spark-bigquery-pushdown/spark-3.2-bigquery-pushdown_2.13/pom.xml
index 32e672dae..33d1746d4 100644
--- a/spark-bigquery-pushdown/spark-3.2-bigquery-pushdown_2.13/pom.xml
+++ b/spark-bigquery-pushdown/spark-3.2-bigquery-pushdown_2.13/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <groupId>com.google.cloud.spark</groupId>
+    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../spark-bigquery-pushdown-parent</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>spark-3.2-bigquery-pushdown_2.13</artifactId>
 
@@ -31,5 +30,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.12/pom.xml b/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.12/pom.xml
index ad6be59ba..f9c48b141 100644
--- a/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.12/pom.xml
+++ b/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.12/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <groupId>com.google.cloud.spark</groupId>
+    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../spark-bigquery-pushdown-parent</relativePath>
   </parent>
@@ -31,5 +30,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.13/pom.xml b/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.13/pom.xml
index df7e4aab1..b82368d99 100644
--- a/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.13/pom.xml
+++ b/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.13/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <groupId>com.google.cloud.spark</groupId>
+    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../spark-bigquery-pushdown-parent</relativePath>
   </parent>
@@ -31,5 +30,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/spark-bigquery-pushdown/spark-bigquery-pushdown-common_2.11/pom.xml b/spark-bigquery-pushdown/spark-bigquery-pushdown-common_2.11/pom.xml
index 83f31edce..4292963a0 100644
--- a/spark-bigquery-pushdown/spark-bigquery-pushdown-common_2.11/pom.xml
+++ b/spark-bigquery-pushdown/spark-bigquery-pushdown-common_2.11/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <groupId>com.google.cloud.spark</groupId>
+    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../spark-bigquery-pushdown-parent</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>spark-bigquery-pushdown-common_2.11</artifactId>
+
   <properties>
     <scala.binary.version>2.11</scala.binary.version>
     <spark.version>2.4.0</spark.version>
@@ -45,5 +45,4 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
diff --git a/spark-bigquery-pushdown/spark-bigquery-pushdown-common_2.12/pom.xml b/spark-bigquery-pushdown/spark-bigquery-pushdown-common_2.12/pom.xml
index 072a9cec2..e0d78a1bc 100644
--- a/spark-bigquery-pushdown/spark-bigquery-pushdown-common_2.12/pom.xml
+++ b/spark-bigquery-pushdown/spark-bigquery-pushdown-common_2.12/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <groupId>com.google.cloud.spark</groupId>
+    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../spark-bigquery-pushdown-parent</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>spark-bigquery-pushdown-common_2.12</artifactId>
 
diff --git a/spark-bigquery-pushdown/spark-bigquery-pushdown-common_2.13/pom.xml b/spark-bigquery-pushdown/spark-bigquery-pushdown-common_2.13/pom.xml
index 7a04f0515..f1a0ad8ee 100644
--- a/spark-bigquery-pushdown/spark-bigquery-pushdown-common_2.13/pom.xml
+++ b/spark-bigquery-pushdown/spark-bigquery-pushdown-common_2.13/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <groupId>com.google.cloud.spark</groupId>
+    <artifactId>spark-bigquery-pushdown-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../spark-bigquery-pushdown-parent</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>spark-bigquery-pushdown-common_2.13</artifactId>
 
diff --git a/spark-bigquery-pushdown/spark-bigquery-pushdown-parent/pom.xml b/spark-bigquery-pushdown/spark-bigquery-pushdown-parent/pom.xml
index 61f45cbc8..df96f8428 100644
--- a/spark-bigquery-pushdown/spark-bigquery-pushdown-parent/pom.xml
+++ b/spark-bigquery-pushdown/spark-bigquery-pushdown-parent/pom.xml
@@ -1,23 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>spark-bigquery-parent</artifactId>
     <groupId>com.google.cloud.spark</groupId>
+    <artifactId>spark-bigquery-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../../spark-bigquery-parent</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>spark-bigquery-pushdown-parent</artifactId>
-  <name>Spark BigQuery Predicate Pushdown Implementation common settings</name>
-
   <packaging>pom</packaging>
-  <properties>
-    <scala.binary.version>2.11</scala.binary.version>
-    <spark.version>2.4.0</spark.version>
-  </properties>
+
+  <name>Spark BigQuery Predicate Pushdown Implementation common settings</name>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -25,6 +20,12 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <scala.binary.version>2.11</scala.binary.version>
+    <spark.version>2.4.0</spark.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -82,8 +83,8 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>spark-bigquery-connector-common</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
       <classifier>tests</classifier>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -92,6 +93,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
     <sourceDirectory>src/main/scala</sourceDirectory>
     <plugins>
diff --git a/spark-bigquery-python-lib/pom.xml b/spark-bigquery-python-lib/pom.xml
index 0298762d4..e6078e2c6 100644
--- a/spark-bigquery-python-lib/pom.xml
+++ b/spark-bigquery-python-lib/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
@@ -10,9 +10,10 @@
   </parent>
 
   <artifactId>spark-bigquery-support</artifactId>
-  <name>PySpark-BigQuery support library</name>
   <packaging>pom</packaging>
 
+  <name>PySpark-BigQuery support library</name>
+
   <build>
     <plugins>
       <plugin>
@@ -31,5 +32,4 @@
       </plugin>
     </plugins>
   </build>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/spark-bigquery-scala-212-support/pom.xml b/spark-bigquery-scala-212-support/pom.xml
index 4c7c09a95..b25afd47b 100644
--- a/spark-bigquery-scala-212-support/pom.xml
+++ b/spark-bigquery-scala-212-support/pom.xml
@@ -1,6 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>com.google.cloud.spark</groupId>
         <artifactId>spark-bigquery-parent</artifactId>
@@ -9,6 +10,7 @@
     </parent>
 
     <artifactId>spark-bigquery-scala-212-support</artifactId>
+
     <name>Spark BigQuery Scala 2.12 Support Library</name>
     <licenses>
         <license>
@@ -17,6 +19,7 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/spark-bigquery-tests/pom.xml b/spark-bigquery-tests/pom.xml
index 163322ee6..4c9c56ebf 100644
--- a/spark-bigquery-tests/pom.xml
+++ b/spark-bigquery-tests/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
@@ -10,6 +10,7 @@
   </parent>
 
   <artifactId>spark-bigquery-tests</artifactId>
+
   <name>BigQuery Connector Tests Support</name>
   <licenses>
     <license>
@@ -18,6 +19,7 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>

From e65f9215dcd9e5402199c17d7aea673d7e60eed4 Mon Sep 17 00:00:00 2001
From: David Rabinowitz <davidrab@google.com>
Date: Fri, 8 Sep 2023 15:38:59 -0700
Subject: [PATCH 2/4] Add GitHub Workflow

---
 .github/workflows/tidy.yaml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/tidy.yaml

diff --git a/.github/workflows/tidy.yaml b/.github/workflows/tidy.yaml
new file mode 100644
index 000000000..cce8d9fa5
--- /dev/null
+++ b/.github/workflows/tidy.yaml
@@ -0,0 +1,24 @@
+name: POM Structure Check
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '8'
+          cache: 'maven'
+
+      - name: Checkout coding style
+        run: ./mvnw tidy:check -Pall

From 20bcb2a17ae5f71e4e3757467e4b6c0242df1748 Mon Sep 17 00:00:00 2001
From: David Rabinowitz <davidrab@google.com>
Date: Fri, 8 Sep 2023 15:41:16 -0700
Subject: [PATCH 3/4] adding the tidy maven plugin to the project

---
 .../spark-bigquery-dsv1-parent/pom.xml             |  2 +-
 spark-bigquery-parent/pom.xml                      | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/spark-bigquery-dsv1/spark-bigquery-dsv1-parent/pom.xml b/spark-bigquery-dsv1/spark-bigquery-dsv1-parent/pom.xml
index 261090a01..e98329ad6 100644
--- a/spark-bigquery-dsv1/spark-bigquery-dsv1-parent/pom.xml
+++ b/spark-bigquery-dsv1/spark-bigquery-dsv1-parent/pom.xml
@@ -204,6 +204,6 @@
           </execution>
         </executions>
       </plugin>
-    </plugins>
+     </plugins>
   </build>
 </project>
diff --git a/spark-bigquery-parent/pom.xml b/spark-bigquery-parent/pom.xml
index 15baa6290..da2e3cb05 100644
--- a/spark-bigquery-parent/pom.xml
+++ b/spark-bigquery-parent/pom.xml
@@ -484,6 +484,20 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>tidy-maven-plugin</artifactId>
+                <version>1.2.0</version>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>

From 4261bab9392b1be89503b33afa90abca53a3bf46 Mon Sep 17 00:00:00 2001
From: David Rabinowitz <davidrab@google.com>
Date: Fri, 22 Sep 2023 08:06:58 -0700
Subject: [PATCH 4/4] Fixed the coverage report project POM

---
 coverage/pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/coverage/pom.xml b/coverage/pom.xml
index 752c2947a..5a8962fae 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -1,7 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>com.google.cloud.spark</groupId>
     <artifactId>spark-bigquery-parent</artifactId>
@@ -10,9 +10,10 @@
   </parent>
 
   <artifactId>coverage</artifactId>
-  <name>Coverage Report</name>
   <packaging>pom</packaging>
 
+  <name>Coverage Report</name>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -321,4 +322,3 @@
     </profile>
   </profiles>
 </project>
-