forked from mstein/elasticsearch-grails-plugin
-
Notifications
You must be signed in to change notification settings - Fork 83
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #138 from puneetbehl/master
Ported to Grails 3
- Loading branch information
Showing
98 changed files
with
1,658 additions
and
1,677 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,29 @@ | ||
.idea | ||
# JetBrains IntelliJ IDEA files | ||
.idea/ | ||
*.iml | ||
out | ||
data | ||
target | ||
.link_to_grails_plugins | ||
web-app | ||
*.iws | ||
.gradle | ||
build/ | ||
|
||
# Log files | ||
*.log | ||
|
||
# Libraries and others | ||
*.zip | ||
.svn | ||
|
||
# Target | ||
target/ | ||
target-eclipse/ | ||
|
||
.DS_Store | ||
|
||
/docs/ | ||
plugin.xml | ||
/docs | ||
.settings | ||
|
||
# Unused grails files | ||
.classpath | ||
.project | ||
test/reports | ||
data/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,10 @@ | ||
language: groovy | ||
script: ./grailsw refresh-dependencies | ||
&& ./grailsw clean | ||
&& ./grailsw compile | ||
&& ./grailsw test-app | ||
branches: | ||
only: | ||
- master | ||
jdk: | ||
- oraclejdk7 | ||
before_script: | ||
- rm -rf target | ||
script: travis_wait 60 ./travis-build.sh | ||
env: | ||
global: | ||
- GIT_NAME="Puneet Behl" | ||
- GIT_EMAIL="puneetbehl@yahoo.com" |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
buildscript { | ||
ext { | ||
grailsVersion = project.grailsVersion | ||
} | ||
repositories { | ||
mavenLocal() | ||
maven { url "https://repo.grails.org/grails/core" } | ||
} | ||
dependencies { | ||
classpath "org.grails:grails-gradle-plugin:$grailsVersion" | ||
} | ||
} | ||
|
||
plugins { | ||
id "com.jfrog.bintray" version "1.2" | ||
} | ||
|
||
version "1.0.0-SNAPSHOT" | ||
group "org.grails.plugins" | ||
|
||
apply plugin: 'maven-publish' | ||
apply plugin: 'eclipse' | ||
apply plugin: 'idea' | ||
apply plugin: "org.grails.grails-plugin" | ||
apply plugin: "org.grails.grails-gsp" | ||
// Used for publishing to central repository, remove if not needed | ||
apply from:'https://raw.githubusercontent.com/grails/grails-profile-repository/master/profiles/plugin/templates/grailsCentralPublishing.gradle' | ||
apply from:'https://raw.githubusercontent.com/grails/grails-profile-repository/master/profiles/plugin/templates/bintrayPublishing.gradle' | ||
|
||
ext { | ||
grailsVersion = project.grailsVersion | ||
gradleWrapperVersion = project.gradleWrapperVersion | ||
} | ||
|
||
sourceCompatibility = 1.7 | ||
targetCompatibility = 1.7 | ||
|
||
repositories { | ||
mavenLocal() | ||
mavenCentral() | ||
maven { url "https://repo.grails.org/grails/core" } | ||
} | ||
|
||
dependencyManagement { | ||
imports { | ||
mavenBom "org.grails:grails-bom:$grailsVersion" | ||
} | ||
applyMavenExclusions false | ||
} | ||
|
||
jar { | ||
exclude "test/**/**" | ||
} | ||
|
||
dependencies { | ||
provided 'org.springframework.boot:spring-boot-starter-logging' | ||
provided "org.springframework.boot:spring-boot-starter-actuator" | ||
provided "org.springframework.boot:spring-boot-autoconfigure" | ||
provided "org.springframework.boot:spring-boot-starter-tomcat" | ||
provided "org.grails:grails-web-boot" | ||
provided "org.grails:grails-dependencies" | ||
|
||
compile "org.grails:grails-core" | ||
compile "org.grails.plugins:hibernate4" | ||
compile "org.grails.plugins:cache" | ||
compile "org.hibernate:hibernate-ehcache" | ||
|
||
testRuntime('org.elasticsearch:elasticsearch-groovy:1.6.0') { | ||
exclude module: 'groovy-all' | ||
} | ||
compile "org.elasticsearch:elasticsearch-mapper-attachments:2.6.0" | ||
|
||
testRuntime 'com.spatial4j:spatial4j:0.4.1' | ||
testCompile 'com.vividsolutions:jts:1.13' | ||
testCompile 'com.googlecode.json-simple:json-simple:1.1.1' | ||
testCompile "org.grails:grails-plugin-testing" | ||
|
||
console "org.grails:grails-console" | ||
} | ||
|
||
task wrapper(type: Wrapper) { | ||
gradleVersion = gradleWrapperVersion | ||
} | ||
|
||
check.doLast { | ||
cleanDataDir.execute() | ||
} | ||
|
||
clean.doLast { | ||
cleanDataDir.execute() | ||
} | ||
|
||
task cleanDataDir(type: Delete) { | ||
delete fileTree(dir: 'data') | ||
} |
Oops, something went wrong.
46811ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi,
Is there any information when this pull request will be released officially?
Iveta
46811ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ivgeorgi This has been released already, please see https://grails.org/plugins.html#plugin/elasticsearch
46811ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the quick answer and sorry to bother you for this.
I commented here by mistake, in fact I'm waiting for the Support for Elasticsearch 2.x.
Thank you,
Iveta
46811ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ivgeorgi No worries, we recently merged a pull request for Elasticsearch 2.x support for Grails 2 version which will be released soon after testing. And for Grails 3, I'll work on upgrading to Elasticsearch 2.x soon.
46811ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great.
This is the only stopper for me to not upgrade to Grails 3.x.