Skip to content

Commit

Permalink
Rename rootProject.name (opendistro-for-elasticsearch#114)
Browse files Browse the repository at this point in the history
  • Loading branch information
qreshi authored Nov 22, 2019
1 parent 1cbc714 commit 641b130
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build-tools/pkgbuild.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ apply plugin: 'nebula.ospackage'
// This is afterEvaluate because the bundlePlugin ZIP task is updated afterEvaluate and changes the ZIP name to match the plugin name
afterEvaluate {
ospackage {
packageName = "opendistro-${name}"
packageName = "${name}"
release = isSnapshot ? "0.1" : '1'
version = "${project.version}" - "-SNAPSHOT"

Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -154,20 +154,20 @@ run {
}

afterEvaluate {
project.tasks.getByName("run#installOpendistroForElasticsearchIndexManagementPlugin").dependsOn("run#installPlugin")
project.tasks.getByName("run#installPlugin").dependsOn.remove(project.tasks.getByName("run#installOpendistroForElasticsearchIndexManagementPlugin"))
project.tasks.getByName("run#installOpendistroIndexManagementPlugin").dependsOn("run#installPlugin")
project.tasks.getByName("run#installPlugin").dependsOn.remove(project.tasks.getByName("run#installOpendistroIndexManagementPlugin"))
project.tasks.getByName("run#installPlugin").dependsOn("run#copyPlugins")
project.tasks.getByName("run#start").dependsOn.remove(project.tasks.getByName("run#installPlugin"))
project.tasks.getByName("run#start").dependsOn("run#installOpendistroForElasticsearchIndexManagementPlugin")
project.tasks.getByName("run#start").dependsOn("run#installOpendistroIndexManagementPlugin")
}

tasks.whenTaskAdded { task ->
if (task.name == "integTestCluster#wait") {
project.tasks.getByName("integTestCluster#installOpendistroForElasticsearchIndexManagementPlugin").dependsOn("integTestCluster#installPlugin")
project.tasks.getByName("integTestCluster#installPlugin").dependsOn.remove(project.tasks.getByName("integTestCluster#installOpendistroForElasticsearchIndexManagementPlugin"))
project.tasks.getByName("integTestCluster#installOpendistroIndexManagementPlugin").dependsOn("integTestCluster#installPlugin")
project.tasks.getByName("integTestCluster#installPlugin").dependsOn.remove(project.tasks.getByName("integTestCluster#installOpendistroIndexManagementPlugin"))
project.tasks.getByName("integTestCluster#installPlugin").dependsOn("integTestCluster#copyPlugins")
project.tasks.getByName("integTestCluster#start").dependsOn.remove(project.tasks.getByName("integTestCluster#installPlugin"))
project.tasks.getByName("integTestCluster#start").dependsOn("integTestCluster#installOpendistroForElasticsearchIndexManagementPlugin")
project.tasks.getByName("integTestCluster#start").dependsOn("integTestCluster#installOpendistroIndexManagementPlugin")
}
}

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
* permissions and limitations under the License.
*/

rootProject.name = 'opendistro-for-elasticsearch-index-management'
rootProject.name = 'opendistro-index-management'

0 comments on commit 641b130

Please sign in to comment.