Merge pull request #169 from pantheon-systems/BUGS-6240

[BUGS-6240] Revert 17f5321, apply 3262003-7.patch

config/install/search_api.server.pantheon_solr8.yml

@@ -24,13 +24,13 @@ backend_config:
     index_timeout: 5
     optimize_timeout: 10
     finalize_timeout: 30
+    skip_schema_check: true
     solr_version: '8'
     http_method: AUTO
     commit_within: 1000
     jmx: false
     jts: false
     solr_install_dir: ''
-    skip_schema_check: true
   disabled_field_types: {  }
   disabled_caches: {  }
   disabled_request_handlers:

config/schema/search_api_pantheon.connector.pantheon.schema.yml

@@ -1,51 +1,4 @@
 plugin.plugin_configuration.search_api_solr_connector.pantheon:
-  type: config_object
+  type: plugin.plugin_configuration.search_api_solr_connector.standard
   label: 'Search API Solr Pantheon connector settings'
-  mapping:
-    timeout:
-      type: integer
-      label: 'Timeout for search queries'
-    index_timeout:
-      type: integer
-      label: 'Timeout for indexing requests'
-    optimize_timeout:
-      type: integer
-      label: 'Timeout for optimize requests'
-    finalize_timeout:
-      type: integer
-      label: 'Timeout for finalize requests'
-    commit_within:
-      type: integer
-      label: 'Time until a soft commit has to happen'
-    workarounds:
-      type: mapping
-      mapping:
-        solr_version:
-          type: string
-          label: 'Solr version override'
-        http_method:
-          type: string
-          label: 'The HTTP method to use for sending queries'
-        skip_schema_check:
-          type: integer
-          label: 'Do not validate if the schema is correct'
-    advanced:
-      type: mapping
-      mapping:
-        jmx:
-          type: integer
-          label: 'Enable JMX'
-        solr_install_dir:
-          type: string
-          label: 'solr.install.dir property'
-    jmx:
-      type: boolean
-      label: 'Enable JMX'
-    skip_schema_check:
-      type: boolean
-      label: 'Do not validate if the schema is correct'
-    endpoint:
-      type: sequence
-      label: 'Endpoints'
-      sequence:
-        type: string
+