chore: fix artifact names (#10)

* chore: fix artifact names artifact names in pom.xml files should not contain cloud- * chore: fix dependency test
googleapis · Jul 23, 2020 · 35adf87 · 35adf87
1 parent 83cb5b3
commit 35adf87
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/google-analytics-admin-bom/pom.xml b/google-analytics-admin-bom/pom.xml
@@ -2,8 +2,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">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
-  <artifactId>google-cloud-analytics-admin-bom</artifactId>
-  <version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-analytics-admin:current} -->
+  <artifactId>google-analytics-admin-bom</artifactId>
+  <version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-analytics-admin:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>

diff --git a/google-analytics-admin/pom.xml b/google-analytics-admin/pom.xml
@@ -10,7 +10,7 @@
   <description>allows you to manage Google Analytics accounts and properties.</description>
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-analytics-admin-parent</artifactId>
+    <artifactId>google-analytics-admin-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-analytics-admin:current} -->
   </parent>
   <properties>

diff --git a/grpc-google-analytics-admin-v1alpha/pom.xml b/grpc-google-analytics-admin-v1alpha/pom.xml
@@ -9,8 +9,8 @@
   <description>GRPC library for grpc-google-analytics-admin-v1alpha</description>
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-analytics-admin-parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-analytics-admin:current} -->
+    <artifactId>google-analytics-admin-parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-analytics-admin:current} -->
   </parent>
   <dependencies>
     <dependency>
@@ -31,7 +31,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
-      <artifactId>proto-google-cloud-analytics-admin-v1alpha</artifactId>
+      <artifactId>proto-google-analytics-admin-v1alpha</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

diff --git a/pom.xml b/pom.xml
@@ -2,9 +2,9 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
-  <artifactId>google-cloud-analytics-admin-parent</artifactId>
+  <artifactId>google-analytics-admin-parent</artifactId>
   <packaging>pom</packaging>
-  <version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-analytics-admin:current} -->
+  <version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-analytics-admin:current} -->
   <name>Google Analytics Admin Parent</name>
   <url>https://github.com/googleapis/java-analytics-admin</url>
   <description>
@@ -62,7 +62,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
-    <site.installationModule>google-cloud-analytics-admin-parent</site.installationModule>
+    <site.installationModule>google-analytics-admin-parent</site.installationModule>
   </properties>
 
   <dependencyManagement>
@@ -100,7 +100,10 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
           <configuration>
-            <ignoredUnusedDeclaredDependencies>org.objenesis:objenesis</ignoredUnusedDeclaredDependencies>
+            <ignoredUnusedDeclaredDependencies>
+              <ignoredUnusedDeclaredDependency>org.objenesis:objenesis</ignoredUnusedDeclaredDependency>
+              <ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
+            </ignoredUnusedDeclaredDependencies>
           </configuration>
         </plugin>
       </plugins>
@@ -111,7 +114,7 @@
     <module>google-analytics-admin</module>
     <module>proto-google-analytics-admin-v1alpha</module>
     <module>grpc-google-analytics-admin-v1alpha</module>
-    <module>google-cloud-analytics-admin-bom</module>
+    <module>google-analytics-admin-bom</module>
   </modules>
 
   <reporting>

diff --git a/proto-google-analytics-admin-v1alpha/pom.xml b/proto-google-analytics-admin-v1alpha/pom.xml
@@ -9,8 +9,8 @@
   <description>PROTO library for proto-google-analytics-admin-v1alpha</description>
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-analytics-admin-parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-analytics-admin:current} -->
+    <artifactId>google-analytics-admin-parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-analytics-admin:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/samples/pom.xml b/samples/pom.xml
@@ -2,7 +2,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">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
-  <artifactId>google-cloud-analytics-admin-samples</artifactId>
+  <artifactId>google-analytics-admin-samples</artifactId>
   <version>0.0.1-SNAPSHOT</version><!-- This artifact should not be released -->
   <packaging>pom</packaging>
   <name>Google Analytics Admin Samples Parent</name>