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
jclouds · Apr 15, 2014 · 82e9e9e · 82e9e9e
1 parent 6a5306b
commit 82e9e9e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 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
@@ -684,7 +684,7 @@ public void testDefaultLocationWithUnmatchedPredicateExceptionMessageAndLocation
          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
@@ -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/...yer/src/test/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptionsTest.java b/...yer/src/test/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptionsTest.java
@@ -68,6 +68,6 @@ public void testDomainNameNullHasDecentMessage() {
 
    @Test(expectedExceptions = IllegalArgumentException.class)
    public void testDomainNameIsInvalidThrowsIllegalArgument() {
-      new SoftLayerTemplateOptions().domainName("foo");
+      new SoftLayerTemplateOptions().domainName("notapublicsuffix");
    }
 }