Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Support Elasticsearch 7.10.2 #86

Merged
merged 6 commits into from
Jan 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

buildscript {
ext {
es_version = System.getProperty("es.version", "7.10.0")
es_version = System.getProperty("es.version", "7.10.2")
}

repositories {
Expand Down Expand Up @@ -131,13 +131,27 @@ afterEvaluate {

buildRpm {
arch = 'NOARCH'
archiveName "${packageName}-${version}.rpm"
dependsOn 'assemble'
finalizedBy 'renameRpm'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i thought you already added this in another pr

Copy link

@ftianli-amzn ftianli-amzn Jan 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think fetch and rebase are needed to make the dev branch have the latest code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh that is good to know for next time. Wasn't sure why it was showing up again.

task renameRpm(type: Copy) {
from("$buildDir/distributions")
into("$buildDir/distributions")
include archiveName
rename archiveName, "${packageName}-${version}.rpm"
doLast { delete file("$buildDir/distributions/$archiveName") }
}
}

buildDeb {
arch = 'amd64'
archiveName "${packageName}-${version}.deb"
arch = 'all'
dependsOn 'assemble'
finalizedBy 'renameDeb'
task renameDeb(type: Copy) {
from("$buildDir/distributions")
into("$buildDir/distributions")
include archiveName
rename archiveName, "${packageName}-${version}.deb"
doLast { delete file("$buildDir/distributions/$archiveName") }
}
}
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# permissions and limitations under the License.
#

version = 1.12.0
version = 1.13.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
## 2021-01-26 Version 1.13.0.0

Compatible with Elasticsearch 7.10.2

### Maintenance
* Support Elasticsearch 7.10.2 ([#86](https://github.com/opendistro-for-elasticsearch/job-scheduler/pull/86))

### Infrastructure
* Update release-workflow.yml ([#83](https://github.com/opendistro-for-elasticsearch/job-scheduler/pull/83))
* Rename plugin artifacts for more consistent naming convention ([#85](https://github.com/opendistro-for-elasticsearch/job-scheduler/pull/85))
2 changes: 1 addition & 1 deletion spi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ check.dependsOn jacocoTestReport

dependencies {
compileOnly "org.elasticsearch:elasticsearch:${es_version}"
compile "com.cronutils:cron-utils:7.0.5"
compile "com.cronutils:cron-utils:9.1.3"

testImplementation "org.elasticsearch.test:framework:${es_version}"
testImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}"
Expand Down