Fix artifact groupid name (#51)

Co-authored-by: Jayant Jain <[email protected]> Co-authored-by: Jayant Jain <[email protected]>
GoogleCloudDataproc · Dec 4, 2023 · 3c6a8b5 · 3c6a8b5
1 parent 22e5a48
commit 3c6a8b5
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 72 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -9,4 +9,4 @@ github:
     - connector
   autolink_jira: FLINK
   collaborators:
-    - flinkbot
+    - prodriguezdefino
diff --git a/cloudbuild/presubmit.sh b/cloudbuild/presubmit.sh
@@ -36,7 +36,7 @@ case $STEP in
 
   # Run unit & integration tests
   tests)
-    $MVN clean clover:setup verify clover:aggregate clover:clover -Pclover -pl flink-connector-bigquery
+    $MVN clean clover:setup verify clover:aggregate clover:clover -Pclover
     ;;
 
   *)
@@ -45,5 +45,9 @@ case $STEP in
     ;;
 esac
 
+pushd flink-connector-bigquery
+
 # Upload test coverage report to Codecov
 bash <(curl -s https://codecov.io/bash) -K -F "${STEP}"
+
+popd
diff --git a/flink-connector-bigquery-examples/pom.xml b/flink-connector-bigquery-examples/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.flink</groupId>
+        <groupId>com.google.cloud.flink</groupId>
         <artifactId>flink-connector-bigquery-parent</artifactId>
         <version>1.1-SNAPSHOT</version>
     </parent>
@@ -37,7 +37,7 @@ under the License.
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.flink</groupId>
+            <groupId>com.google.cloud.flink</groupId>
             <artifactId>flink-connector-bigquery</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -78,19 +78,14 @@ under the License.
                             </resources>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.apache.flink.examples.gcp.bigquery.BigQueryExample</mainClass>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
-                                    <resource>log4j2-bqexample.properties</resource>
-                                    <file>src/main/resources/log4j2-bqexample.properties</file>
+                                    <mainClass>com.google.cloud.flink.bigquery.examples.BigQueryExample</mainClass>
                                 </transformer>
                             </transformers>
                             <artifactSet>
                                 <includes>
                                     <include>org.apache.flink:flink-connector-bigquery</include>
                                     <include>org.apache.flink:flink-avro</include>
                                     <include>org.apache.flink:flink-metrics-dropwizard</include>
-                                    <include>com.google.cloud:google-cloud-bigquerystorage</include>
                                     <include>com.google.*:*</include>
                                     <include>commons-codec:commons-codec</include>    
                                     <include>dev.failsafe:*</include>                                
@@ -110,15 +105,18 @@ under the License.
                             <relocations>
                                 <relocation>
                                     <pattern>com.google</pattern>
-                                    <shadedPattern>org.apache.flink.examples.gcp.bigquery.shaded.com.google</shadedPattern>
+                                    <shadedPattern>com.google.cloud.flink.bigquery.examples.shaded.com.google</shadedPattern>
+                                    <excludes>
+                                        <exclude>com.google.cloud.flink.bigquery.**</exclude>
+                                    </excludes>
                                 </relocation>
                             </relocations>
 
                             <filters>
                                 <filter>
                                     <artifact>org.apache.flink:flink-connector-bigquery-examples*</artifact>
                                     <includes>
-                                        <include>org/apache/flink/examples/gcp/bigquery/**</include>
+                                        <include>com/google/cloud/flink/bigquery/examples/**</include>
                                     </includes>
                                 </filter>
                             </filters>

diff --git a/...xamples/gcp/bigquery/BigQueryExample.java → ...nk/bigquery/examples/BigQueryExample.java b/...xamples/gcp/bigquery/BigQueryExample.java → ...nk/bigquery/examples/BigQueryExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.examples.gcp.bigquery;
+package com.google.cloud.flink.bigquery.examples;
 
 import org.apache.flink.api.common.eventtime.WatermarkStrategy;
 import org.apache.flink.api.common.functions.FlatMapFunction;

diff --git a/flink-connector-bigquery/pom.xml b/flink-connector-bigquery/pom.xml
@@ -22,8 +22,8 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
+        <groupId>com.google.cloud.flink</groupId>
         <artifactId>flink-connector-bigquery-parent</artifactId>
-        <groupId>org.apache.flink</groupId>
         <version>1.1-SNAPSHOT</version>
     </parent>
 

diff --git a/flink-sql-connector-bigquery/pom.xml b/flink-sql-connector-bigquery/pom.xml
@@ -16,65 +16,65 @@ specific language governing permissions and limitations
 under the License.
 -->
 <project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	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"
+    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<artifactId>flink-connector-bigquery-parent</artifactId>
-		<groupId>org.apache.flink</groupId>
-		<version>1.1-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>com.google.cloud.flink</groupId>
+        <artifactId>flink-connector-bigquery-parent</artifactId>
+        <version>1.1-SNAPSHOT</version>
+    </parent>
 
-	<artifactId>flink-sql-connector-bigquery</artifactId>
-	<name>Flink : Connectors : SQL : Google BigQuery</name>
+    <artifactId>flink-sql-connector-bigquery</artifactId>
+    <name>Flink : Connectors : SQL : Google BigQuery</name>
 
-	<packaging>jar</packaging>
+    <packaging>jar</packaging>
 
-	<properties>
-		<japicmp.skip>true</japicmp.skip>
-	</properties>
+    <properties>
+        <japicmp.skip>true</japicmp.skip>
+    </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-connector-bigquery</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>com.google.cloud.flink</groupId>
+            <artifactId>flink-connector-bigquery</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>shade-flink</id>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<shadedArtifactAttached>false</shadedArtifactAttached>
-							<createDependencyReducedPom>false</createDependencyReducedPom>
-							<artifactSet>
-								<includes>
-									<include>*:*</include>
-								</includes>
-							</artifactSet>
-							<relocations>
-								<relocation>
-									<pattern>com.google</pattern>
-									<shadedPattern>org.apache.flink.connector.bigquery.shaded.com.google</shadedPattern>
-								</relocation>
-							</relocations>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>shade-flink</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <artifactSet>
+                                <includes>
+                                    <include>*:*</include>
+                                </includes>
+                            </artifactSet>
+                            <relocations>
+                                <relocation>
+                                    <pattern>com.google</pattern>
+                                    <shadedPattern>com.google.cloud.flink.bigquery.shaded.com.google</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@ under the License.
         <version>1.0.0</version>
     </parent>
 
-    <groupId>org.apache.flink</groupId>
+    <groupId>com.google.cloud.flink</groupId>
     <artifactId>flink-connector-bigquery-parent</artifactId>
     <version>1.1-SNAPSHOT</version>
 
@@ -62,7 +62,7 @@ under the License.
         <log4j.version>2.17.2</log4j.version>
 
         <flink.parent.artifactId>flink-connector-bigquery-parent</flink.parent.artifactId>
-        <surefire.and.failsafe.report.dir>target/test-report</surefire.and.failsafe.report.dir>
+        <surefire.report.dir>${maven.multiModuleProjectDirectory}/target/test-report</surefire.report.dir>
     </properties>
 
     <modules>
@@ -398,10 +398,25 @@ under the License.
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
             </plugin>
-
             <plugin>
                 <groupId>org.commonjava.maven.plugins</groupId>
                 <artifactId>directory-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>directories</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>directory-of</goal>
+                        </goals>
+                        <configuration>
+                            <property>rootDir</property>
+                            <project>
+                                <groupId>com.google.cloud.flink</groupId>
+                                <artifactId>flink-connector-bigquery-parent</artifactId>
+                            </project>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
@@ -424,14 +439,15 @@ under the License.
                                 <exclude>**/com/google/cloud/flink/bigquery/services/**Impl.*</exclude>
                                 <exclude>**/com/google/cloud/flink/bigquery/source/config/*</exclude>
                                 <exclude>**/com/google/cloud/flink/bigquery/table/config/BigQueryConnectorOptions.*</exclude>
+                                <exclude>**/com/google/cloud/flink/bigquery/examples/**</exclude>
                             </excludes>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <reportsDirectory>${surefire.and.failsafe.report.dir}</reportsDirectory>
+                            <reportsDirectory>${surefire.report.dir}</reportsDirectory>
                         </configuration>
                     </plugin>
                 </plugins>

diff --git a/tools/maven/clover.xml b/tools/maven/clover.xml
@@ -38,7 +38,7 @@ under the License.
                     <include name="**/*TestCase.java"/>
                 </testsources>
                 <!-- Tell Clover to get test results directory as defined in pom.xml. They will be listed on "Results" tab -->
-                <testresults dir="target/test-report" includes="TEST-*.xml"/>
+                <testresults dir="${maven.multiModuleProjectDirectory}/target/test-report" includes="TEST-*.xml"/>
             </current>
         </clover-report>
     </target>