From fecf7b713eb91b4570067fbb4155fee8979134b0 Mon Sep 17 00:00:00 2001 From: Michael Basnight Date: Wed, 25 Apr 2018 07:38:55 -0500 Subject: [PATCH] Remove licenses missed by the migration A few of the old style license got kept around because their comment string did not start with a space. This caused the license check to not see it as a license and skip it. This commit cleans it up. --- .../mapper/ExpressionRoleMappingTests.java | 17 ----------------- .../expression/UnresolvedAttributeTests.java | 17 ----------------- .../function/UnresolvedFunctionTests.java | 17 ----------------- .../integration-tests.xml | 16 ---------------- 4 files changed, 67 deletions(-) diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/support/mapper/ExpressionRoleMappingTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/support/mapper/ExpressionRoleMappingTests.java index 510540468a464..2ac82c8d7c063 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/support/mapper/ExpressionRoleMappingTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/support/mapper/ExpressionRoleMappingTests.java @@ -3,23 +3,6 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -/* -* ELASTICSEARCH CONFIDENTIAL -* __________________ -* -* [2017] Elasticsearch Incorporated. All Rights Reserved. -* -* NOTICE: All information contained herein is, and remains -* the property of Elasticsearch Incorporated and its suppliers, -* if any. The intellectual and technical concepts contained -* herein are proprietary to Elasticsearch Incorporated -* and its suppliers and may be covered by U.S. and Foreign Patents, -* patents in process, and are protected by trade secret or copyright law. -* Dissemination of this information or reproduction of this material -* is strictly forbidden unless prior written permission is obtained -* from Elasticsearch Incorporated. -*/ - package org.elasticsearch.xpack.security.authc.support.mapper; import org.elasticsearch.common.ParsingException; diff --git a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/UnresolvedAttributeTests.java b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/UnresolvedAttributeTests.java index 4eb5d15741b9d..51a16c14a8889 100644 --- a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/UnresolvedAttributeTests.java +++ b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/UnresolvedAttributeTests.java @@ -3,23 +3,6 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -/* -* ELASTICSEARCH CONFIDENTIAL -* __________________ -* -* [2017] Elasticsearch Incorporated. All Rights Reserved. -* -* NOTICE: All information contained herein is, and remains -* the property of Elasticsearch Incorporated and its suppliers, -* if any. The intellectual and technical concepts contained -* herein are proprietary to Elasticsearch Incorporated -* and its suppliers and may be covered by U.S. and Foreign Patents, -* patents in process, and are protected by trade secret or copyright law. -* Dissemination of this information or reproduction of this material -* is strictly forbidden unless prior written permission is obtained -* from Elasticsearch Incorporated. -*/ - package org.elasticsearch.xpack.sql.expression; import org.elasticsearch.xpack.sql.tree.AbstractNodeTestCase; diff --git a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/UnresolvedFunctionTests.java b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/UnresolvedFunctionTests.java index b050d37062542..1e58a1a5dc277 100644 --- a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/UnresolvedFunctionTests.java +++ b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/UnresolvedFunctionTests.java @@ -3,23 +3,6 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -/* -* ELASTICSEARCH CONFIDENTIAL -* __________________ -* -* [2017] Elasticsearch Incorporated. All Rights Reserved. -* -* NOTICE: All information contained herein is, and remains -* the property of Elasticsearch Incorporated and its suppliers, -* if any. The intellectual and technical concepts contained -* herein are proprietary to Elasticsearch Incorporated -* and its suppliers and may be covered by U.S. and Foreign Patents, -* patents in process, and are protected by trade secret or copyright law. -* Dissemination of this information or reproduction of this material -* is strictly forbidden unless prior written permission is obtained -* from Elasticsearch Incorporated. -*/ - package org.elasticsearch.xpack.sql.expression.function; import org.elasticsearch.xpack.sql.expression.Expression; diff --git a/x-pack/qa/tribe-node-tests-with-security/integration-tests.xml b/x-pack/qa/tribe-node-tests-with-security/integration-tests.xml index 8256617fffe73..8f58dcb971784 100644 --- a/x-pack/qa/tribe-node-tests-with-security/integration-tests.xml +++ b/x-pack/qa/tribe-node-tests-with-security/integration-tests.xml @@ -1,20 +1,4 @@ -