From 49779a154904556b2a02a5a46171c22285899fd8 Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Tue, 30 Aug 2016 16:52:00 -0700 Subject: [PATCH 1/2] Fixed test case. Original commit: elastic/x-pack-elasticsearch@6177c03d32e494e771b2a07f9fee3333b83db45f --- .../rest-api-spec/test/watcher_groovy/50_script_condition.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/50_script_condition.yaml b/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/50_script_condition.yaml index 3a876f98531..02b91ebbfb1 100644 --- a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/50_script_condition.yaml +++ b/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/50_script_condition.yaml @@ -13,6 +13,8 @@ { "status": "green", "@timestamp": "2005-01-01T00:00:55" } - do: + warnings: + - Groovy scripts are deprecated. Use Painless scripts instead. xpack.watcher.put_watch: id: "watch_with_groovy_closure" body: > From 31c9d258c7f469ed810623e0874519f806e8eaf9 Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Wed, 31 Aug 2016 15:57:09 -0700 Subject: [PATCH 2/2] Made deprecation of Groovy, Javascript, and Python more explicit. Original commit: elastic/x-pack-elasticsearch@04d725e9c1e219daa998e5d19f51e405b735ac20 --- .../test/watcher_groovy/50_script_condition.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/50_script_condition.yaml b/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/50_script_condition.yaml index 02b91ebbfb1..d8ee955f1ab 100644 --- a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/50_script_condition.yaml +++ b/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/50_script_condition.yaml @@ -13,8 +13,6 @@ { "status": "green", "@timestamp": "2005-01-01T00:00:55" } - do: - warnings: - - Groovy scripts are deprecated. Use Painless scripts instead. xpack.watcher.put_watch: id: "watch_with_groovy_closure" body: > @@ -72,6 +70,8 @@ - match: { _id: "watch_with_groovy_closure" } - do: + warnings: + - '[groovy] scripts are deprecated, use [painless] scripts instead' xpack.watcher.execute_watch: id: "watch_with_groovy_closure" body: > @@ -120,6 +120,8 @@ { "status": "red", "@timestamp": "2005-01-01T00:01:55" } - do: + warnings: + - '[groovy] scripts are deprecated, use [painless] scripts instead' xpack.watcher.execute_watch: id: "watch_with_groovy_closure" body: >