use libraries-bom in pom.xml (#3583)

Author: elharo

plugins/com.google.cloud.tools.eclipse.appengine.libraries.test/src/com/google/cloud/tools/eclipse/appengine/libraries/Bug3380Test.java

@@ -105,7 +105,7 @@ public void testBug3380() throws CoreException, XPathExpressionException {
     Assert.assertTrue(pom.dependencyManaged("com.google.cloud", "google-cloud-automl"));
 
     Element bomElement = (Element) xpath.evaluate(
-        "//m:dependencyManagement/m:dependencies/m:dependency[m:groupId='com.google.cloud'][m:artifactId='google-cloud-bom']",
+        "//m:dependencyManagement/m:dependencies/m:dependency[m:groupId='com.google.cloud'][m:artifactId='libraries-bom']",
         pom.document.getDocumentElement(), XPathConstants.NODE);
     Assert.assertNotNull(bomElement); // Make sure BOM element added
 

plugins/com.google.cloud.tools.eclipse.appengine.libraries/src/com/google/cloud/tools/eclipse/appengine/libraries/Pom.java

@@ -287,7 +287,7 @@ private void handleDependencyManaged(LibraryFile artifact, Element dependency) {
   private void createBOMIfNeeded(XPath xpath) throws CoreException {
     try {
       Element bomElement = (Element) xpath.evaluate(
-          "//m:dependencyManagement/m:dependencies/m:dependency[m:groupId='com.google.cloud'][m:artifactId='google-cloud-bom']",
+          "//m:dependencyManagement/m:dependencies/m:dependency[m:groupId='com.google.cloud'][m:artifactId='libraries-bom']",
           document.getDocumentElement(), XPathConstants.NODE);
       if (bomElement == null) {
         Element dependencies = null;
@@ -312,12 +312,12 @@ private void createBOMIfNeeded(XPath xpath) throws CoreException {
         Element dependency =
             document.createElementNS("http://maven.apache.org/POM/4.0.0", "dependency");
         dependency.appendChild(createChild("groupId", "com.google.cloud"));
-        dependency.appendChild(createChild("artifactId", "google-cloud-bom"));
+        dependency.appendChild(createChild("artifactId", "libraries-bom"));
         dependency.appendChild(createChild("type", "pom"));
         dependency.appendChild(createChild("scope", "import"));
-        String version = getBestVersion("com.google.cloud", "google-cloud-bom");
+        String version = getBestVersion("com.google.cloud", "libraries-bom");
         dependency.appendChild(createChild("version", version));
-        Bom bom = Bom.loadBom("com.google.cloud", "google-cloud-bom", version, null);
+        Bom bom = Bom.loadBom("com.google.cloud", "libraries-bom", version, null);
         if (bom != null) {
           boms.add(bom);
         }

plugins/com.google.cloud.tools.eclipse.appengine.newproject.test/src/com/google/cloud/tools/eclipse/appengine/newproject/CodeTemplatesTest.java

@@ -432,7 +432,7 @@ private Element validatePom() throws ParserConfigurationException, SAXException,
         "string(./m:dependencyManagement/m:dependencies/m:dependency/m:artifactId)",
         root,
         XPathConstants.STRING);
-    Assert.assertEquals("google-cloud-bom", bomArtifactId);
+    Assert.assertEquals("libraries-bom", bomArtifactId);
 
     DefaultArtifactVersion bomVersion = new DefaultArtifactVersion((String) xpath.evaluate(
         "string(./m:dependencyManagement/m:dependencies/m:dependency/m:version)",

plugins/com.google.cloud.tools.eclipse.appengine.newproject/src/com/google/cloud/tools/eclipse/appengine/newproject/CodeTemplates.java

@@ -238,14 +238,14 @@ private static void createPomXml(IProject project, AppEngineProjectConfig config
 
     String bomVersion = getCurrentVersion(
         "com.google.cloud", //$NON-NLS-1$
-        "google-cloud-bom", //$NON-NLS-1$
-        "0.91.0-alpha"); //$NON-NLS-1$
+        "libraries-bom", //$NON-NLS-1$
+        "3.1.0"); //$NON-NLS-1$
     properties.put("googleCloudJavaBomVersion", bomVersion); //$NON-NLS-1$
 
     String mavenPluginVersion = getCurrentVersion(
         "com.google.cloud.tools", //$NON-NLS-1$
         "appengine-maven-plugin", //$NON-NLS-1$
-        "2.0.0"); //$NON-NLS-1$
+        "2.2.0"); //$NON-NLS-1$
     properties.put("mavenPluginVersion", mavenPluginVersion); //$NON-NLS-1$
 
     if (isServlet25Selected(config)) {

plugins/com.google.cloud.tools.eclipse.util/templates/appengine/pom.xml.ftl

@@ -23,7 +23,7 @@
     <dependencies>
       <dependency>
         <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-bom</artifactId>
+        <artifactId>libraries-bom</artifactId>
         <version>${googleCloudJavaBomVersion}</version>
         <type>pom</type>
         <scope>import</scope>