Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andrew Gaul 2014-04-13 21:46:31 -07:00
parent 6a5306b5f1
commit 82e9e9e42f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
View File

@ -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);

2
core/pom.xml
View File

@ -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>

2
providers/softlayer/src/test/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptionsTest.java
View File

@ -68,6 +68,6 @@ public class SoftLayerTemplateOptionsTest {
@Test(expectedExceptions = IllegalArgumentException.class)
public void testDomainNameIsInvalidThrowsIllegalArgument() {
new SoftLayerTemplateOptions().domainName("foo");
new SoftLayerTemplateOptions().domainName("notapublicsuffix");
}
}