Skip to content
This repository was archived by the owner on Dec 11, 2024. It is now read-only.

Commit 4f9a446

Browse files
authored
Merge pull request #158 from Endource/elasticsearch-2.3
Elasticsearch 2.3
2 parents 92a40da + a8d55c7 commit 4f9a446

36 files changed

+580
-401
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ plugin.xml
2727
.project
2828
test/reports
2929
data/
30+
31+
#Elasticserch plugin binaries
32+
src/integration-test/resources/elasticsearch/plugins

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: groovy
22
jdk:
3-
- oraclejdk7
3+
- oraclejdk8
44
before_script:
55
- rm -rf target
66
script: travis_wait 60 ./travis-build.sh

README.asciidoc

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,35 @@ Edit your project's +build.gradle+ file, by adding the plugin's dependency decla
1616
----
1717
dependencies {
1818
...
19-
compile "org.grails.plugins:elasticsearch:1.0.0.2"
19+
compile "org.grails.plugins:elasticsearch:2.3.0"
2020
...
2121
2222
}
2323
----
2424

25+
26+
=== Versioning
27+
28+
|===
29+
|Plugin Version | Grails Version | Elasticsearch Version
30+
31+
|2.3.x
32+
|3.y
33+
|2.3.z
34+
35+
|1.0.0.x
36+
|3.y
37+
|1.6.z
38+
39+
|0.1.0.x
40+
|2.y
41+
|2.1.z
42+
43+
|0.0.4.x
44+
|2.y
45+
|1.6.z
46+
|===
47+
2548
=== Ohs Nos! I'm hitting a +java.lang.Exception: No datastore implementation specified+
2649

2750
This error means that you probably haven't specified your datastore type in your +application.groovy+ or +application.yml+ file.

build.gradle

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ plugins {
1717
id "com.jfrog.bintray" version "1.2"
1818
}
1919

20-
version "1.0.0.2"
20+
version "1.2.0"
2121
group "org.grails.plugins"
2222

2323
apply plugin: 'maven-publish'
@@ -30,11 +30,11 @@ apply plugin: "org.grails.grails-gsp"
3030
ext {
3131
grailsVersion = project.grailsVersion
3232
gradleWrapperVersion = project.gradleWrapperVersion
33-
elasticsearchVersion = "1.0.0.3"
33+
elasticsearchVersion = "2.3.3"
3434
}
3535

36-
sourceCompatibility = 1.7
37-
targetCompatibility = 1.7
36+
sourceCompatibility = 1.8
37+
targetCompatibility = 1.8
3838

3939
repositories {
4040
mavenLocal()
@@ -64,6 +64,8 @@ sourcesJar {
6464
exclude "test/**/**"
6565
}
6666

67+
def elasticsearchVersion = '2.3.3'
68+
6769
dependencies {
6870
provided 'org.springframework.boot:spring-boot-starter-logging'
6971
provided "org.springframework.boot:spring-boot-starter-actuator"
@@ -77,17 +79,16 @@ dependencies {
7779
compile "org.grails.plugins:cache"
7880
compile "org.hibernate:hibernate-ehcache"
7981

80-
testRuntime('org.elasticsearch:elasticsearch-groovy:1.6.0') {
81-
exclude module: 'groovy-all'
82-
}
83-
compile "org.elasticsearch:elasticsearch-mapper-attachments:2.6.0"
82+
compile "org.elasticsearch:elasticsearch:${elasticsearchVersion}"
8483

8584
testRuntime 'com.spatial4j:spatial4j:0.4.1'
8685
testCompile 'com.vividsolutions:jts:1.13'
8786
testCompile 'com.googlecode.json-simple:json-simple:1.1.1'
8887
testCompile "org.grails:grails-plugin-testing"
8988

9089
console "org.grails:grails-console"
90+
91+
compile "org.elasticsearch.plugin:mapper-attachments:${elasticsearchVersion}"
9192
}
9293

9394
task wrapper(type: Wrapper) {

gradle/publish.gradle

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,17 @@ if (bintrayProperties.exists()) {
1515
}
1616
title = "Elasticserach"
1717
desc = "An Elasticsearch plugin for Grails"
18-
developers = [noam: 'Noam Y. Tenne', macrcos: 'Marcos Carceles', puneet: 'Puneet Behl', james: 'James Kleeh']
18+
developers = [noam: 'Noam Y. Tenne', marcos: 'Marcos Carceles', puneet: 'Puneet Behl', james: 'James Kleeh']
19+
}
20+
} else {
21+
grailsPublish {
22+
githubSlug = 'noamt/elasticsearch-grails-plugin'
23+
license {
24+
name = 'Apache-2.0'
25+
}
26+
title = "Elasticserach"
27+
desc = "An Elasticsearch plugin for Grails"
28+
developers = [noam: 'Noam Y. Tenne', marcos: 'Marcos Carceles', puneet: 'Puneet Behl', james: 'James Kleeh']
1929
}
2030
}
2131

gradle/wrapper/gradle-wrapper.jar

2 Bytes
Binary file not shown.

gradlew.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ echo location of your Java installation.
4646
goto fail
4747

4848
:init
49-
@rem Get command-line arguments, handling Windowz variants
49+
@rem Get command-line arguments, handling Windows variants
5050

5151
if not "%OS%" == "Windows_NT" goto win9xME_args
5252
if "%@eval[2+2]" == "4" goto 4NT_args

grails-app/conf/application.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ environments:
9292
transport.sniff: true
9393
datastoreImpl: hibernateDatastore
9494
index:
95-
store.type: memory
95+
store.type: simplefs
9696
analysis:
9797
filter:
9898
replace_synonyms:
@@ -105,7 +105,6 @@ environments:
105105
repl_analyzer:
106106
tokenizer: standard
107107
filter: ['lowercase', 'replace_synonyms']
108-
109108
production:
110109
elasticSearch:
111110
client:

grails-app/conf/plugin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ environments {
102102
test {
103103
elasticSearch {
104104
client.mode = 'local'
105-
index.store.type = 'memory' // store local node in memory and not on disk
105+
index.store.type = 'simplefs' // store local node in memory and not on disk
106106
}
107107
}
108108
production {

grails-app/domain/test/upperCase/UpperCase.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package test.upperCase
22

33
class UpperCase {
4-
def name;
4+
String name
55
static mapping = {
66

77
autoImport(false)

0 commit comments

Comments
 (0)