Commit 896fbbe
committed
DATAES-289 - Upgraded to Elasticsearch 2.4.
Upgraded to Elasticsearch 2.4 as version before that are not compatiblewith Jackson 2.8 [0].
Removed the now unsupported Groovy plugin registration way and added groovy-lang as test scope dependency but had to disable the only Groovy related test as it seems to be unclear how to activate the Groovy plugin in an embedded Elasticsearch server [1].
[0] elastic/elasticsearch#20089
[1] https://discuss.elastic.co/t/after-upgrade-from-es-2-1-1-to-es-2-2-0-groovy-scripting-is-broken/409771 parent 7a95cb6 commit 896fbbe
File tree
7 files changed
+11
-141
lines changed- src/test
- java/org/springframework/data/elasticsearch/core
- resources/test-home-dir/modules/lang-groovy
7 files changed
+11
-141
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | | - | |
| 26 | + | |
28 | 27 | | |
29 | 28 | | |
30 | 29 | | |
| |||
88 | 87 | | |
89 | 88 | | |
90 | 89 | | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
91 | 98 | | |
92 | 99 | | |
93 | 100 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
472 | 472 | | |
473 | 473 | | |
474 | 474 | | |
| 475 | + | |
475 | 476 | | |
476 | 477 | | |
477 | 478 | | |
| |||
Binary file not shown.
Binary file not shown.
Lines changed: 0 additions & 80 deletions
This file was deleted.
Lines changed: 0 additions & 58 deletions
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
0 commit comments