File tree Expand file tree Collapse file tree
src/main/java/com/netflix/simianarmy/client/aws Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ dependencies {
2525
2626 compile ' com.sun.jersey:jersey-core:1.11'
2727 compile ' com.sun.jersey:jersey-servlet:1.11'
28- compile ' org.slf4j:slf4j-api:1.6.4 '
28+ compile ' org.slf4j:slf4j-api:1.7.2 '
2929 compile ' org.codehaus.jackson:jackson-core-asl:1.9.2'
3030 compile ' org.codehaus.jackson:jackson-mapper-asl:1.9.2'
3131 compile(' com.netflix.eureka:eureka-client:1.1.22' ) {
@@ -35,8 +35,10 @@ dependencies {
3535 compile ' commons-lang:commons-lang:2.6'
3636 compile ' com.google.guava:guava:11.0.2'
3737 compile ' org.apache.httpcomponents:httpclient:4.3'
38+ compile ' com.google.auto.service:auto-service:1.0-rc2'
3839 compile ' org.apache.jclouds.driver:jclouds-jsch:1.9.0'
39- compile ' org.apache.jclouds.api:ec2:1.9.0'
40+ compile ' org.apache.jclouds.driver:jclouds-slf4j:1.9.0'
41+
4042
4143 testCompile ' org.testng:testng:6.3.1'
4244 testCompile ' org.mockito:mockito-core:1.8.5'
5153}
5254
5355tasks. withType(JavaCompile ) {
54- options. compilerArgs << " -Xlint" << " -Werror "
56+ options. compilerArgs << " -Xlint"
5557}
5658
5759artifacts {
Original file line number Diff line number Diff line change @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33distributionPath =wrapper/dists
44zipStoreBase =GRADLE_USER_HOME
55zipStorePath =wrapper/dists
6- distributionUrl =https\://services.gradle.org/distributions/gradle-2.2.1 -bin.zip
6+ distributionUrl =https\://services.gradle.org/distributions/gradle-2.3 -bin.zip
Original file line number Diff line number Diff line change 8888import org .jclouds .compute .domain .NodeMetadata ;
8989import org .jclouds .compute .domain .NodeMetadataBuilder ;
9090import org .jclouds .domain .LoginCredentials ;
91+ import org .jclouds .ec2 .EC2ApiMetadata ;
9192import org .jclouds .logging .slf4j .config .SLF4JLoggingModule ;
9293import org .jclouds .ssh .SshClient ;
9394import org .jclouds .ssh .jsch .config .JschSshClientModule ;
@@ -725,7 +726,7 @@ public synchronized ComputeService getJcloudsComputeService() {
725726 if (jcloudsComputeService == null ) {
726727 String username = awsCredentialsProvider .getCredentials ().getAWSAccessKeyId ();
727728 String password = awsCredentialsProvider .getCredentials ().getAWSSecretKey ();
728- ComputeServiceContext jcloudsContext = ContextBuilder .newBuilder ("ec2" ).credentials (username , password )
729+ ComputeServiceContext jcloudsContext = ContextBuilder .newBuilder (new EC2ApiMetadata () ).credentials (username , password )
729730 .modules (ImmutableSet .<Module >of (new SLF4JLoggingModule (), new JschSshClientModule ()))
730731 .buildView (ComputeServiceContext .class );
731732
You can’t perform that action at this time.
0 commit comments