From f06c5ef806a9ef508d17180f8b04a68894b2ddac Mon Sep 17 00:00:00 2001
From: Rob Bavey <rob.bavey@elastic.co>
Date: Mon, 9 Dec 2019 10:37:14 -0500
Subject: [PATCH] Replace references to JDBC plugins with integration plugins

Fixes #11406
---
 lib/pluginmanager/prepare_offline_pack.rb |  2 +-
 rakelib/plugins-metadata.json             | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/pluginmanager/prepare_offline_pack.rb b/lib/pluginmanager/prepare_offline_pack.rb
index 0860c3b60..45197b2b3 100644
--- a/lib/pluginmanager/prepare_offline_pack.rb
+++ b/lib/pluginmanager/prepare_offline_pack.rb
@@ -60,7 +60,7 @@ You need to specify at least one plugin or use a wildcard expression.
 
 Examples:
 bin/logstash-plugin prepare-offline-pack logstash-input-beats
-bin/logstash-plugin prepare-offline-pack logstash-filter-jdbc logstash-input-beats
+bin/logstash-plugin prepare-offline-pack logstash-filter-kv logstash-input-beats
 bin/logstash-plugin prepare-offline-pack logstash-filter-*
 bin/logstash-plugin prepare-offline-pack logstash-filter-* logstash-input-beats
 
diff --git a/rakelib/plugins-metadata.json b/rakelib/plugins-metadata.json
index 25fe9d24d..b8daea5aa 100644
--- a/rakelib/plugins-metadata.json
+++ b/rakelib/plugins-metadata.json
@@ -148,12 +148,12 @@
     "skip-list": true
   },
   "logstash-filter-jdbc_static": {
-    "default-plugins": true,
-    "skip-list": false
+    "default-plugins": false,
+    "skip-list": true
   },
   "logstash-filter-jdbc_streaming": {
-    "default-plugins": true,
-    "skip-list": false
+    "default-plugins": false,
+    "skip-list": true
   },
   "logstash-filter-json": {
     "default-plugins": true,
@@ -317,8 +317,8 @@
     "skip-list": true
   },
   "logstash-input-jdbc": {
-    "default-plugins": true,
-    "skip-list": false
+    "default-plugins": false,
+    "skip-list": true
   },
   "logstash-input-jms": {
     "default-plugins": true,
@@ -402,6 +402,10 @@
     "default-plugins": true,
     "skip-list": false
   },
+  "logstash-integration-jdbc": {
+    "default-plugins": true,
+    "skip-list": false
+  },
   "logstash-integration-kafka": {
     "default-plugins": true,
     "skip-list": false