Repository: jclouds Updated Branches: refs/heads/master 6a5306b5f -> 82e9e9e42
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 Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/82e9e9e4 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/82e9e9e4 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/82e9e9e4 Branch: refs/heads/master Commit: 82e9e9e42f5dcb4004ce2d7cbd3c139d44d4ebca Parents: 6a5306b Author: Andrew Gaul <[email protected]> Authored: Sun Apr 13 21:46:31 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Apr 14 18:38:15 2014 -0700 ---------------------------------------------------------------------- .../jclouds/compute/domain/internal/TemplateBuilderImplTest.java | 2 +- core/pom.xml | 2 +- .../softlayer/compute/options/SoftLayerTemplateOptionsTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/82e9e9e4/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java ---------------------------------------------------------------------- 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 eb24854..5f44724 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); http://git-wip-us.apache.org/repos/asf/jclouds/blob/82e9e9e4/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index fddbe91..5bff370 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> http://git-wip-us.apache.org/repos/asf/jclouds/blob/82e9e9e4/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptionsTest.java ---------------------------------------------------------------------- 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 c2649e7..3732b95 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"); } }
