Merge branch 'master' into tswast-rmgeo

GoogleCloudPlatform · Nov 10, 2016 · 44c5563 · 44c5563
2 parents 8d5c781 + 43af24b
commit 44c5563
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
           <groupId>com.google.firebase</groupId>
           <artifactId>firebase-server-sdk</artifactId>
-          <version>3.0.1</version>
+          <version>3.0.3</version>
         </dependency>
         <dependency>
           <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/bigquery/pom.xml b/bigquery/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
         <groupId>com.google.apis</groupId>
         <artifactId>google-api-services-bigquery</artifactId>
-        <version>v2-rev328-1.22.0</version>
+        <version>v2-rev329-1.22.0</version>
     </dependency>
     <dependency>
         <groupId>com.google.oauth-client</groupId>

diff --git a/language/analysis/pom.xml b/language/analysis/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-language</artifactId>
-      <version>v1beta1-rev13-1.22.0</version>
+      <version>v1beta1-rev14-1.22.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>

diff --git a/monitoring/v3/pom.xml b/monitoring/v3/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.google.apis</groupId>
             <artifactId>google-api-services-monitoring</artifactId>
-            <version>v3-rev16-1.22.0</version>
+            <version>v3-rev17-1.22.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

diff --git a/pom.xml b/pom.xml
@@ -152,7 +152,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.2.11</version>
+            <version>2.2.15</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/vision/face-detection/pom.xml b/vision/face-detection/pom.xml
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-vision</artifactId>
-      <version>v1-rev27-1.22.0</version>
+      <version>v1-rev29-1.22.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>

diff --git a/vision/label/pom.xml b/vision/label/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-vision</artifactId>
-      <version>v1-rev27-1.22.0</version>
+      <version>v1-rev29-1.22.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>

diff --git a/vision/landmark-detection/pom.xml b/vision/landmark-detection/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-vision</artifactId>
-      <version>v1-rev27-1.22.0</version>
+      <version>v1-rev29-1.22.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>

diff --git a/...ion/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java b/...ion/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java
@@ -60,7 +60,7 @@ public class DetectLandmarkIT {
       appUnderTest.identifyLandmark(LANDMARK_URI + "/nonexistent.jpg", MAX_RESULTS);
       fail("Expected IOException");
     } catch (IOException expected) {
-      assertThat(expected.getMessage()).named("IOException message").contains("OBJECT_NOT_FOUND");
+      assertThat(expected.getMessage()).named("IOException message").contains("file");
     }
   }
 

diff --git a/vision/text/pom.xml b/vision/text/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-vision</artifactId>
-      <version>v1-rev27-1.22.0</version>
+      <version>v1-rev29-1.22.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>