Skip to content

Commit 0f5f57d

Browse files
committed
Revert change made with #32.
Fix missing lib in assembly. relative to #29. Closes #33.
1 parent b515a1d commit 0f5f57d

File tree

4 files changed

+57
-5
lines changed

4 files changed

+57
-5
lines changed

pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>com.amazonaws</groupId>
5454
<artifactId>aws-java-sdk</artifactId>
55-
<version>1.5.3</version>
55+
<version>1.3.32</version>
5656
<scope>compile</scope>
5757
<exclusions>
5858
<!-- We need to exclude httpclient, since it pulls the wrong version -->
@@ -88,9 +88,9 @@
8888
</dependency>
8989

9090
<dependency>
91-
<groupId>org.testng</groupId>
92-
<artifactId>testng</artifactId>
93-
<version>6.3.1</version>
91+
<groupId>junit</groupId>
92+
<artifactId>junit</artifactId>
93+
<version>4.11</version>
9494
<scope>test</scope>
9595
</dependency>
9696

src/main/assemblies/plugin.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
<includes>
2222
<include>com.amazonaws:aws-java-sdk</include>
2323
<include>org.apache.httpcomponents:httpclient</include>
24+
<include>commons-codec:commons-codec</include>
2425
</includes>
2526
</dependencySet>
2627
</dependencySets>
27-
</assembly>
28+
</assembly>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Licensed to Elasticsearch (the "Author") under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. Author licenses this
6+
* file to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package org.elasticsearch.discovery.ec2;
21+
22+
23+
import org.elasticsearch.node.NodeBuilder;
24+
import org.junit.Ignore;
25+
import org.junit.Test;
26+
27+
/**
28+
* Just an empty Node Start test to check eveything if fine when
29+
* starting.
30+
* This test is marked as ignored.
31+
* If you want to run your own test, please modify first test/resources/elasticsearch.yml file
32+
* with your own AWS credentials
33+
*/
34+
public class Ec2DiscoveryITest {
35+
36+
@Test @Ignore
37+
public void testStart() {
38+
NodeBuilder.nodeBuilder().node();
39+
}
40+
41+
}

src/test/resources/elasticsearch.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Replace this access_key / secret_key with your own if you want
2+
# to run tests
3+
cloud:
4+
aws:
5+
access_key: AKVAIQBF2RECL7FJWGJQ
6+
secret_key: vExyMThREXeRMm/b/LRzEB8jWwvzQeXgjqMX+6br
7+
8+
discovery:
9+
type: ec2
10+

0 commit comments

Comments
 (0)