From 82e9e9e42f5dcb4004ce2d7cbd3c139d44d4ebca Mon Sep 17 00:00:00 2001
From: Andrew Gaul <gaul@apache.org>
Date: Sun, 13 Apr 2014 21:46:31 -0700
Subject: [PATCH] JCLOUDS-534: Upgrade to Guava 17.0-rc2

This commit accommodates changes to Predicates.and.toString and
PublicSuffixPatterns.EXACT.  Release notes:

https://code.google.com/p/guava-libraries/wiki/Release17
---
 .../compute/domain/internal/TemplateBuilderImplTest.java        | 2 +-
 core/pom.xml                                                    | 2 +-
 .../softlayer/compute/options/SoftLayerTemplateOptionsTest.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java b/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
index eb24854f6f..5f44724432 100644
--- a/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
+++ b/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
@@ -684,7 +684,7 @@ public class TemplateBuilderImplTest {
          fail("Expected NoSuchElementException");
       } catch (NoSuchElementException e) {
          // make sure big data is not in the exception message
-         assertEquals(e.getMessage(), "no image matched predicate: And(nullEqualToIsParentOrIsGrandparentOfCurrentLocation(),imageDescription(notDescription))");
+         assertEquals(e.getMessage(), "no image matched predicate: Predicates.and(nullEqualToIsParentOrIsGrandparentOfCurrentLocation(),imageDescription(notDescription))");
       }
 
       verify(defaultOptions, optionsProvider, templateBuilderProvider);
diff --git a/core/pom.xml b/core/pom.xml
index fddbe919f4..5bff3705e3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>16.0.1</version>
+      <version>17.0-rc2</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptionsTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptionsTest.java
index c2649e7380..3732b95655 100644
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptionsTest.java
+++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptionsTest.java
@@ -68,6 +68,6 @@ public class SoftLayerTemplateOptionsTest {
 
    @Test(expectedExceptions = IllegalArgumentException.class)
    public void testDomainNameIsInvalidThrowsIllegalArgument() {
-      new SoftLayerTemplateOptions().domainName("foo");
+      new SoftLayerTemplateOptions().domainName("notapublicsuffix");
    }
 }