Revert change made with #32.

Fix missing lib in assembly. relative to #29.
Closes #33.
This commit is contained in:
David Pilato 2013-08-09 18:29:53 +02:00
parent b515a1d38f
commit 0f5f57d1de
4 changed files with 57 additions and 5 deletions

View File

@ -52,7 +52,7 @@
<dependency> <dependency>
<groupId>com.amazonaws</groupId> <groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId> <artifactId>aws-java-sdk</artifactId>
<version>1.5.3</version> <version>1.3.32</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions> <exclusions>
<!-- We need to exclude httpclient, since it pulls the wrong version --> <!-- We need to exclude httpclient, since it pulls the wrong version -->
@ -88,9 +88,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>junit</groupId>
<artifactId>testng</artifactId> <artifactId>junit</artifactId>
<version>6.3.1</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

View File

@ -21,6 +21,7 @@
<includes> <includes>
<include>com.amazonaws:aws-java-sdk</include> <include>com.amazonaws:aws-java-sdk</include>
<include>org.apache.httpcomponents:httpclient</include> <include>org.apache.httpcomponents:httpclient</include>
<include>commons-codec:commons-codec</include>
</includes> </includes>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>

View File

@ -0,0 +1,41 @@
/*
* Licensed to Elasticsearch (the "Author") under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Author licenses this
* file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.discovery.ec2;
import org.elasticsearch.node.NodeBuilder;
import org.junit.Ignore;
import org.junit.Test;
/**
* Just an empty Node Start test to check eveything if fine when
* starting.
* This test is marked as ignored.
* If you want to run your own test, please modify first test/resources/elasticsearch.yml file
* with your own AWS credentials
*/
public class Ec2DiscoveryITest {
@Test @Ignore
public void testStart() {
NodeBuilder.nodeBuilder().node();
}
}

View File

@ -0,0 +1,10 @@
# Replace this access_key / secret_key with your own if you want
# to run tests
cloud:
aws:
access_key: AKVAIQBF2RECL7FJWGJQ
secret_key: vExyMThREXeRMm/b/LRzEB8jWwvzQeXgjqMX+6br
discovery:
type: ec2