GoogleCloudDataproc · davidrabinowitz · Sep 8, 2023 · Sep 8, 2023 · Sep 8, 2023 · Sep 22, 2023
diff --git a/.github/workflows/tidy.yaml 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
diff --git 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/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>
-
diff --git 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,23 +46,13 @@
  </developerConnection>
  <url>git@github.com:GoogleCloudDataproc/spark-bigquery-connector.git</url>
  </scm>
-
  <issueManagement>
  <system>GitHub Issues</system>
  <url>
  https://github.com/GoogleCloudDataproc/spark-bigquery-connector/issues
  </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
@@ -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
@@ -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
@@ -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,19 +10,22 @@
  </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>
  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
  <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>
@@ -200,6 +204,6 @@
  </execution>
  </executions>
  </plugin>
- </plugins>
+  </plugins>
  </build>
 </project>
diff --git 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
@@ -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
@@ -1,23 +1,26 @@
-<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>
  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
  <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 -->