Browse Source

Cleanup xpack build.gradle (#60554)

This commit does three things:
* Removes all Copyright/license headers for the build.gradle files under x-pack. (implicit Apache license)
* Removes evaluationDependsOn(xpackModule('core')) from build.gradle files under x-pack
* Removes a place holder test in favor of disabling the test task (in the async plugin)
Jake Landis 5 years ago
parent
commit
86952d78f4
34 changed files with 4 additions and 157 deletions
  1. 0 2
      x-pack/plugin/analytics/build.gradle
  2. 0 2
      x-pack/plugin/async-search/build.gradle
  3. 4 8
      x-pack/plugin/async/build.gradle
  4. 0 20
      x-pack/plugin/async/src/test/java/org/elasticsearch/xpack/async/AsyncResultsIndexPluginTests.java
  5. 0 3
      x-pack/plugin/autoscaling/build.gradle
  6. 0 2
      x-pack/plugin/ccr/build.gradle
  7. 0 2
      x-pack/plugin/data-streams/build.gradle
  8. 0 2
      x-pack/plugin/enrich/build.gradle
  9. 0 3
      x-pack/plugin/eql/build.gradle
  10. 0 2
      x-pack/plugin/frozen-indices/build.gradle
  11. 0 2
      x-pack/plugin/graph/build.gradle
  12. 0 3
      x-pack/plugin/identity-provider/build.gradle
  13. 0 2
      x-pack/plugin/ilm/build.gradle
  14. 0 2
      x-pack/plugin/logstash/build.gradle
  15. 0 8
      x-pack/plugin/mapper-constant-keyword/build.gradle
  16. 0 8
      x-pack/plugin/mapper-flattened/build.gradle
  17. 0 2
      x-pack/plugin/ml/build.gradle
  18. 0 2
      x-pack/plugin/monitoring/build.gradle
  19. 0 2
      x-pack/plugin/ql/build.gradle
  20. 0 2
      x-pack/plugin/rollup/build.gradle
  21. 0 2
      x-pack/plugin/search-business-rules/build.gradle
  22. 0 3
      x-pack/plugin/searchable-snapshots/build.gradle
  23. 0 18
      x-pack/plugin/searchable-snapshots/qa/azure/build.gradle
  24. 0 18
      x-pack/plugin/searchable-snapshots/qa/gcs/build.gradle
  25. 0 2
      x-pack/plugin/security/build.gradle
  26. 0 2
      x-pack/plugin/spatial/build.gradle
  27. 0 2
      x-pack/plugin/sql/build.gradle
  28. 0 2
      x-pack/plugin/stack/build.gradle
  29. 0 2
      x-pack/plugin/transform/build.gradle
  30. 0 2
      x-pack/plugin/vectors/build.gradle
  31. 0 2
      x-pack/plugin/voting-only-node/build.gradle
  32. 0 2
      x-pack/plugin/watcher/build.gradle
  33. 0 2
      x-pack/plugin/wildcard/build.gradle
  34. 0 19
      x-pack/qa/password-protected-keystore/build.gradle

+ 0 - 2
x-pack/plugin/analytics/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 esplugin {
   name 'x-pack-analytics'

+ 0 - 2
x-pack/plugin/async-search/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {

+ 4 - 8
x-pack/plugin/async/build.gradle

@@ -1,11 +1,3 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 
 esplugin {
@@ -25,5 +17,9 @@ dependencyLicenses {
   ignoreSha 'x-pack-core'
 }
 
+//no tests
+tasks.named("test").configure {
+  enabled = false
+}
 integTest.enabled = false
 

+ 0 - 20
x-pack/plugin/async/src/test/java/org/elasticsearch/xpack/async/AsyncResultsIndexPluginTests.java

@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-package org.elasticsearch.xpack.async;
-
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.test.ESTestCase;
-import org.hamcrest.Matchers;
-
-public class AsyncResultsIndexPluginTests extends ESTestCase {
-
-    public void testDummy() {
-        // This is a dummy test case to satisfy the conventions
-        AsyncResultsIndexPlugin plugin = new AsyncResultsIndexPlugin(Settings.EMPTY);
-        assertThat(plugin.getSystemIndexDescriptors(Settings.EMPTY), Matchers.hasSize(1));
-    }
-}

+ 0 - 3
x-pack/plugin/autoscaling/build.gradle

@@ -1,7 +1,4 @@
 import org.elasticsearch.gradle.info.BuildParams
-
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
 

+ 0 - 2
x-pack/plugin/ccr/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {

+ 0 - 2
x-pack/plugin/data-streams/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {

+ 0 - 2
x-pack/plugin/enrich/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {

+ 0 - 3
x-pack/plugin/eql/build.gradle

@@ -1,7 +1,4 @@
 import org.elasticsearch.gradle.info.BuildParams
-
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {

+ 0 - 2
x-pack/plugin/frozen-indices/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 esplugin {
   name 'frozen-indices'

+ 0 - 2
x-pack/plugin/graph/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 esplugin {
   name 'x-pack-graph'

+ 0 - 3
x-pack/plugin/identity-provider/build.gradle

@@ -1,7 +1,4 @@
 import org.elasticsearch.gradle.info.BuildParams
-
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.publish'
 esplugin {

+ 0 - 2
x-pack/plugin/ilm/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 
 esplugin {

+ 0 - 2
x-pack/plugin/logstash/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 esplugin {
   name 'x-pack-logstash'

+ 0 - 8
x-pack/plugin/mapper-constant-keyword/build.gradle

@@ -1,11 +1,3 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 
 esplugin {

+ 0 - 8
x-pack/plugin/mapper-flattened/build.gradle

@@ -1,11 +1,3 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 
 esplugin {

+ 0 - 2
x-pack/plugin/ml/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {

+ 0 - 2
x-pack/plugin/monitoring/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {

+ 0 - 2
x-pack/plugin/ql/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 esplugin {
   name 'x-pack-ql'

+ 0 - 2
x-pack/plugin/rollup/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 esplugin {
   name 'x-pack-rollup'

+ 0 - 2
x-pack/plugin/search-business-rules/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
 

+ 0 - 3
x-pack/plugin/searchable-snapshots/build.gradle

@@ -1,7 +1,4 @@
 import org.elasticsearch.gradle.info.BuildParams
-
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 esplugin {
   name 'searchable-snapshots'

+ 0 - 18
x-pack/plugin/searchable-snapshots/qa/azure/build.gradle

@@ -1,21 +1,3 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 import org.elasticsearch.gradle.info.BuildParams
 import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE
 

+ 0 - 18
x-pack/plugin/searchable-snapshots/qa/gcs/build.gradle

@@ -1,21 +1,3 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 import org.elasticsearch.gradle.info.BuildParams
 import org.elasticsearch.gradle.MavenFilteringHack
 

+ 0 - 2
x-pack/plugin/security/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.publish'
 esplugin {

+ 0 - 2
x-pack/plugin/spatial/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.rest-resources'
 

+ 0 - 2
x-pack/plugin/sql/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {

+ 0 - 2
x-pack/plugin/stack/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 
 esplugin {

+ 0 - 2
x-pack/plugin/transform/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 esplugin {
   name 'transform'

+ 0 - 2
x-pack/plugin/vectors/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 
 esplugin {

+ 0 - 2
x-pack/plugin/voting-only-node/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 esplugin {
   name 'x-pack-voting-only-node'

+ 0 - 2
x-pack/plugin/watcher/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 esplugin {
   name 'x-pack-watcher'

+ 0 - 2
x-pack/plugin/wildcard/build.gradle

@@ -1,5 +1,3 @@
-evaluationDependsOn(xpackModule('core'))
-
 apply plugin: 'elasticsearch.esplugin'
 
 esplugin {

+ 0 - 19
x-pack/qa/password-protected-keystore/build.gradle

@@ -1,22 +1,3 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 /*
  * Tests that need to run against an Elasticsearch cluster that
  * is using a password protected keystore in its nodes.