Skip to content

Commit 7cece53

Browse files
committed
Force inclusion of Joda 2.8.2
Follow up for discussion elastic#234 We need to pull in Joda 2.8.2 and don't rely of the version declared by elasticsearch which is currently 2.7. It will fix issues seen with recent Java versions. See also aws/aws-sdk-java#444 Closes elastic#239. (cherry picked from commit 0db449a)
1 parent 9781068 commit 7cece53

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@
5252
<groupId>org.elasticsearch</groupId>
5353
<artifactId>elasticsearch</artifactId>
5454
<scope>provided</scope>
55+
<exclusions>
56+
<exclusion>
57+
<groupId>joda-time</groupId>
58+
<artifactId>joda-time</artifactId>
59+
</exclusion>
60+
</exclusions>
5561
</dependency>
5662

5763
<dependency>
@@ -73,6 +79,15 @@
7379
<version>${amazonaws.version}</version>
7480
</dependency>
7581

82+
<!-- JODA Version available in elasticsearch 1.7 is buggy (2.7)-->
83+
<!-- we need to pull 2.8.2 -->
84+
<dependency>
85+
<groupId>joda-time</groupId>
86+
<artifactId>joda-time</artifactId>
87+
<version>2.8.2</version>
88+
<scope>compile</scope>
89+
</dependency>
90+
7691
<!-- We need to explicitly set the common codec version since aws-java-sdk pulls the wrong version -->
7792
<!-- See https://github.com/elasticsearch/elasticsearch-cloud-aws/issues/29 -->
7893
<dependency>

src/main/assemblies/plugin.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<useTransitiveFiltering>true</useTransitiveFiltering>
2121
<includes>
2222
<include>com.amazonaws:aws-java-sdk</include>
23+
<include>joda-time:joda-time</include>
2324
<include>commons-codec:commons-codec</include>
2425
</includes>
2526
</dependencySet>

0 commit comments

Comments
 (0)