Skip to content

Commit f0e5caf

Browse files
author
Clément Tourrière
committed
Migrate to 6.4.3
Small changes on configuration
1 parent 70e0742 commit f0e5caf

File tree

4 files changed

+12
-19
lines changed

4 files changed

+12
-19
lines changed

build.gradle

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,45 @@
1-
Properties props = new Properties()
2-
props.load(project.file('gradle.properties').newDataInputStream())
3-
def elasticVersion = props.getProperty('elasticVersion')
4-
def pluginVersion = props.getProperty('pluginVersion')
5-
61
buildscript {
7-
Properties props = new Properties()
8-
props.load(project.file('gradle.properties').newDataInputStream())
9-
def elasticVersion = props.getProperty('elasticVersion')
102
repositories {
113
mavenLocal()
124
mavenCentral()
135
jcenter()
146
}
157

168
dependencies {
17-
classpath "org.elasticsearch.gradle:build-tools:${elasticVersion}"
9+
classpath "org.elasticsearch.gradle:build-tools:${es_version}"
1810
}
1911
}
2012

2113
group = 'org.elasticsearch.plugin'
22-
version = pluginVersion
14+
version = "${plugin_version}"
2315

2416
apply plugin: 'java'
2517
apply plugin: 'idea'
2618
apply plugin: 'elasticsearch.esplugin'
2719

20+
// license of this project
21+
licenseFile = rootProject.file('LICENSE')
22+
noticeFile = rootProject.file('README.md')
23+
24+
2825
esplugin {
2926
name 'pathhierarchy-aggregation'
3027
description 'Return a path hierarchy aggregation'
3128
classname 'org.opendatasoft.elasticsearch.plugin.PathHierarchyAggregation'
3229
licenseFile = rootProject.file('LICENSE')
30+
noticeFile = rootProject.file('README.md')
3331
}
3432

3533
dependencies {
36-
compile "org.elasticsearch:elasticsearch:${elasticVersion}"
37-
testCompile "org.elasticsearch.test:framework:${elasticVersion}"
34+
compile "org.elasticsearch:elasticsearch:${es_version}"
3835
}
3936

40-
test.enabled = true
41-
4237
// Skip license headers check
4338
licenseHeaders.enabled = false
4439

4540
// Use elasticsearch checkstyle rules
4641
checkstyleTest.enabled = true
4742

48-
licenseFile = rootProject.file('LICENSE')
49-
noticeFile = rootProject.file('README.md')
5043
dependencyLicenses.enabled = true
5144

5245
thirdPartyAudit.enabled = true

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
elasticVersion = 6.4.2
2-
pluginVersion = 6.4.2.0
1+
es_version = 6.4.3
2+
plugin_version = 6.4.3.0

gradle/wrapper/gradle-wrapper.jar

1.72 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)