fix maven BOM template version (#3198)

* fix maven BOM template version * add import
GoogleCloudPlatform · Jul 3, 2018 · 0927af2 · 0927af2
1 parent aef7885
commit 0927af2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/...y.test/src/com/google/cloud/tools/eclipse/appengine/deploy/CloudSdkStagingHelperTest.java b/...y.test/src/com/google/cloud/tools/eclipse/appengine/deploy/CloudSdkStagingHelperTest.java
@@ -69,20 +69,22 @@ public class CloudSdkStagingHelperTest {
 
   @Mock private IProgressMonitor monitor;
 
+  private IPath sourceDirectory;
   private IPath stagingDirectory;
   private IProject project;
 
   @Before
   public void setUp() {
     project = projectCreator.getProject();
     stagingDirectory = new Path(tempFolder.getRoot().toString());
+    sourceDirectory = new Path(tempFolder.getRoot().toString());
   }
 
   @Test
   public void testStage_cancelled() throws AppEngineException {
     when(monitor.isCanceled()).thenReturn(true);
     try {
-      CloudSdkStagingHelper.stageStandard(null, null, null, monitor);
+      CloudSdkStagingHelper.stageStandard(null, stagingDirectory, null, monitor);
     } catch (OperationCanceledException ex) {
       assertEquals("canceled early", ex.getMessage());
     }

diff --git a/...oject.test/src/com/google/cloud/tools/eclipse/appengine/newproject/CodeTemplatesTest.java b/...oject.test/src/com/google/cloud/tools/eclipse/appengine/newproject/CodeTemplatesTest.java
@@ -408,7 +408,7 @@ private Element validatePom() throws ParserConfigurationException, SAXException,
         root,
         XPathConstants.STRING));
     Assert.assertTrue(
-        bomVersion.compareTo(new DefaultArtifactVersion("0.42.0-alpha")) >= 0);
+        bomVersion.compareTo(new DefaultArtifactVersion("0.53.0-alpha")) >= 0);
 
     String scope = (String) xpath.evaluate(
         "string(./m:dependencyManagement/m:dependencies/m:dependency/m:scope)",

diff --git a/...ine.newproject/src/com/google/cloud/tools/eclipse/appengine/newproject/CodeTemplates.java b/...ine.newproject/src/com/google/cloud/tools/eclipse/appengine/newproject/CodeTemplates.java
@@ -230,8 +230,8 @@ private static void createPomXml(IProject project, AppEngineProjectConfig config
 
     String bomVersion = getCurrentVersion(
         "com.google.cloud", //$NON-NLS-1$
-        "google-cloud", //$NON-NLS-1$
-        "0.47.0-alpha"); //$NON-NLS-1$
+        "google-cloud-bom", //$NON-NLS-1$
+        "0.53.0-alpha"); //$NON-NLS-1$
     properties.put("googleCloudJavaBomVersion", bomVersion); //$NON-NLS-1$
 
     String mavenPluginVersion = getCurrentVersion(

diff --git a/plugins/com.google.cloud.tools.eclipse.sdk.ui/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.sdk.ui/META-INF/MANIFEST.MF
@@ -9,13 +9,14 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
- com.google.cloud.tools.appengine;bundle-version="0.6.3",
  org.eclipse.equinox.preferences;bundle-version="3.5.300",
  org.eclipse.equinox.common;bundle-version="3.7.0",
  org.eclipse.e4.core.contexts;bundle-version="1.4.0",
  com.google.cloud.tools.eclipse.sdk,
- com.google.cloud.tools.eclipse.preferences
-Import-Package: com.google.cloud.tools.eclipse.ui.util,
+ com.google.cloud.tools.eclipse.preferences,
+ com.google.cloud.tools.appengine
+Import-Package: com.google.cloud.tools.appengine;bundle-version="0.6.3",
+ com.google.cloud.tools.eclipse.ui.util,
  com.google.cloud.tools.eclipse.ui.util.images,
  com.google.common.annotations;version="[21.0.0,22.0.0)",
  com.google.common.base;version="[21.0.0,22.0.0)",