SONAR-12686 update elasticsearch-patch and packaging exclusions for 7.X

sonar-application/build.gradle

@@ -73,38 +73,24 @@ task zip(type: Zip, dependsOn: [configurations.compile]) {
       exclude 'elasticsearch-patch'
       // elasticsearch script will be replaced by patched version below
       exclude 'elasticsearch/bin/elasticsearch'
-      exclude 'elasticsearch/bin/elasticsearch.bat'
-      exclude 'elasticsearch/bin/elasticsearch-env.bat'
-      exclude 'elasticsearch/bin/elasticsearch-service.bat'
-      exclude 'elasticsearch/bin/elasticsearch-service-*.exe'
-      exclude 'elasticsearch/bin/elasticsearch-certgen*'
-      exclude 'elasticsearch/bin/elasticsearch-certutil*'
-      exclude 'elasticsearch/bin/elasticsearch-cli*'
-      exclude 'elasticsearch/bin/elasticsearch-croneval*'
-      exclude 'elasticsearch/bin/elasticsearch-keystore*'
-      exclude 'elasticsearch/bin/elasticsearch-migrate*'
-      exclude 'elasticsearch/bin/elasticsearch-plugin*'
-      exclude 'elasticsearch/bin/elasticsearch-saml-metadata*'
-      exclude 'elasticsearch/bin/elasticsearch-setup-passwords*'
-      exclude 'elasticsearch/bin/elasticsearch-shard*'
-      exclude 'elasticsearch/bin/elasticsearch-sql-cli*'
-      exclude 'elasticsearch/bin/elasticsearch-syskeygen*'
-      exclude 'elasticsearch/bin/elasticsearch-translog*'
-      exclude 'elasticsearch/bin/elasticsearch-users*'
-      exclude 'elasticsearch/bin/x-pack/**'
-      exclude 'elasticsearch/bin/x-pack*'
+      exclude 'elasticsearch/bin/elasticsearch-cli'
+      exclude 'elasticsearch/bin/elasticsearch-keystore'
+      exclude 'elasticsearch/bin/elasticsearch-node'
+      exclude 'elasticsearch/bin/elasticsearch-shard'
       exclude 'elasticsearch/lib/tools/**'
       exclude 'elasticsearch/modules/aggs-matrix-stats/**'
+      exclude 'elasticsearch/modules/geo/**'
       exclude 'elasticsearch/modules/ingest-common/**'
       exclude 'elasticsearch/modules/ingest-geoip/**'
       exclude 'elasticsearch/modules/ingest-user-agent/**'
+      exclude 'elasticsearch/modules/kibana/**'
       exclude 'elasticsearch/modules/lang-expression/**'
-      exclude 'elasticsearch/modules/lang-groovy/**'
       exclude 'elasticsearch/modules/lang-mustache/**'
+      exclude 'elasticsearch/modules/mapper-extras/**'
       exclude 'elasticsearch/modules/rank-eval/**'
       exclude 'elasticsearch/modules/reindex/**'
-      exclude 'elasticsearch/modules/tribe/**'
-      exclude 'elasticsearch/modules/x-pack-*/**'
+      exclude 'elasticsearch/modules/repository-url/**'
+      exclude 'elasticsearch/modules/tasks/**'
   }
 
   into("${archiveDir}/conf/") {

sonar-application/src/main/assembly/elasticsearch-patch/bin/elasticsearch

@@ -49,6 +49,7 @@ if ! echo $* | grep -E '(^-d |-d$| -d |--daemonize$|--daemonize )' > /dev/null;
     -Des.path.conf="$ES_PATH_CONF" \
     -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
     -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
+    -Des.bundled_jdk="false" \
     -cp "$ES_CLASSPATH" \
     org.elasticsearch.bootstrap.Elasticsearch \
     "$@"
@@ -60,6 +61,7 @@ else
     -Des.path.conf="$ES_PATH_CONF" \
     -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
     -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
+    -Des.bundled_jdk="false" \
     -cp "$ES_CLASSPATH" \
     org.elasticsearch.bootstrap.Elasticsearch \
     "$@" \