From bf4cc03a004b19595af4de097097c72dcf94f01b Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 21 Jul 2020 19:18:19 -0700
Subject: [PATCH] samples: clean up samples pom.xml files (#179)

* samples: clean up samples pom.xml files

Skip showing the bom installation method until we add google-cloud-game-services
to libraries-bom

* samples: fix version in install without bom until this version is released
---
 samples/install-without-bom/pom.xml | 12 ++++++------
 samples/pom.xml                     |  4 ++--
 samples/snapshot/pom.xml            | 12 ++++++------
 samples/snippets/pom.xml            | 12 +++++-------
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index f4d08d83..b449578d 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -2,10 +2,10 @@
 <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>gameservices-install-without-bom</artifactId>
+  <artifactId>game-servers-install-without-bom</artifactId>
   <packaging>jar</packaging>
   <name>Google Cloud Gaming Install Without Bom</name>
-  <url>https://github.com/googleapis/java-gameservices</url>
+  <url>https://github.com/googleapis/java-game-servers</url>
 
   <!--
     The parent pom defines common style checks and testing strategies for our samples.
@@ -25,13 +25,13 @@
 
 
   <dependencies>
-    <!-- [START gameservices_install_without_bom] -->
+    <!-- [START game_servers_install_without_bom] -->
     <dependency>
       <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud-gameservices</artifactId>
-      <version>0.19.1</version>
+      <artifactId>google-cloud-game-servers</artifactId>
+      <version>0.19.2-SNAPSHOT</version>
     </dependency>
-    <!-- [END gameservices_install_without_bom] -->
+    <!-- [END game_servers_install_without_bom] -->
 
     <dependency>
       <groupId>junit</groupId>
diff --git a/samples/pom.xml b/samples/pom.xml
index 2ef520c1..dc594ee8 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -2,11 +2,11 @@
 <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-gameservices-samples</artifactId>
+  <artifactId>google-cloud-game-servers-samples</artifactId>
   <version>0.0.1-SNAPSHOT</version><!-- This artifact should not be released -->
   <packaging>pom</packaging>
   <name>Google Cloud Gaming Samples Parent</name>
-  <url>https://github.com/googleapis/java-gameservices</url>
+  <url>https://github.com/googleapis/java-game-servers</url>
   <description>
     Java idiomatic client for Google Cloud Platform services.
   </description>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 8bdb9db9..b7da0584 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -2,10 +2,10 @@
 <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>gameservices-snapshot</artifactId>
+  <artifactId>game-servers-snapshot</artifactId>
   <packaging>jar</packaging>
   <name>Google Cloud Gaming Snapshot Samples</name>
-  <url>https://github.com/googleapis/java-gameservices</url>
+  <url>https://github.com/googleapis/java-game-servers</url>
 
   <!--
     The parent pom defines common style checks and testing strategies for our samples.
@@ -23,13 +23,14 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <!-- {x-version-update-start::current} -->
   <dependencies>
+    <!-- {x-version-update-start:google-cloud-game-servers:current} -->
     <dependency>
       <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud-gameservices</artifactId>
-      <version>0.19.1</version>
+      <artifactId>google-cloud-game-servers</artifactId>
+      <version>0.19.2-SNAPSHOT</version>
     </dependency>
+    <!-- {x-version-update-end} -->
 
     <dependency>
       <groupId>junit</groupId>
@@ -44,7 +45,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <!-- {x-version-update-end} -->
 
   <!-- compile and run all snippet tests -->
   <build>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 7adda248..0ed1adef 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -2,10 +2,10 @@
 <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>gameservices-snippets</artifactId>
+  <artifactId>game-servers-snippets</artifactId>
   <packaging>jar</packaging>
   <name>Google Cloud Gaming Snippets</name>
-  <url>https://github.com/googleapis/java-gameservices</url>
+  <url>https://github.com/googleapis/java-game-servers</url>
 
   <!--
     The parent pom defines common style checks and testing strategies for our samples.
@@ -23,8 +23,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-
-  <!-- [START gameservices_install_with_bom] -->
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -38,12 +36,12 @@
   </dependencyManagement>
 
   <dependencies>
+    <!-- TODO: use libraries-bom when google-cloud-game-servers is included -->
     <dependency>
       <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud-gameservices</artifactId>
+      <artifactId>google-cloud-game-servers</artifactId>
+      <version>0.19.2-SNAPSHOT</version>
     </dependency>
-    <!-- [END gameservices_install_with_bom] -->
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>