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

Rename sql release artifacts #1007

Merged
merged 2 commits into from
Jan 26, 2021
Merged

Rename sql release artifacts #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fa861e
Rename sql artifacts
joshuali925 Jan 25, 2021
79cf1f3
Update sql plugin name in odbc
joshuali925 Jan 26, 2021
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 plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repositories {
}

esplugin {
name 'opendistro_sql'
name 'opendistro-sql'
description 'Open Distro for Elasticsearch SQL'
classname 'com.amazon.opendistroforelasticsearch.sql.plugin.SQLPlugin'
licenseFile rootProject.file("LICENSE.txt")
Expand Down Expand Up @@ -121,13 +121,27 @@ afterEvaluate {

buildRpm {
arch = 'NOARCH'
archiveName "${packageName}-${version}.rpm"
dependsOn 'assemble'
finalizedBy 'renameRpm'
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 sql-odbc/src/odfesqlodbc/es_communication.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static const std::string SQL_ENDPOINT_FORMAT_JDBC =
static const std::string SQL_ENDPOINT_CLOSE_CURSOR = "/_opendistro/_sql/close";
static const std::string PLUGIN_ENDPOINT_FORMAT_JSON =
"/_cat/plugins?format=json";
static const std::string OPENDISTRO_SQL_PLUGIN_NAME = "opendistro_sql";
static const std::string OPENDISTRO_SQL_PLUGIN_NAME = "opendistro-sql";
static const std::string ALLOCATION_TAG = "AWS_SIGV4_AUTH";
static const std::string SERVICE_NAME = "es";
static const std::string ESODBC_PROFILE_NAME = "elasticsearchodbc";
Expand Down