From 483daf4257994d4c5575a76d645ce96c733034cd Mon Sep 17 00:00:00 2001 From: Owais Kazi Date: Thu, 11 Nov 2021 22:57:31 +0000 Subject: [PATCH] Update Copyright headers Signed-off-by: Owais Kazi --- config/opensearch_dashboards.yml | 17 +++++++---------- ...opensearch-dashboards-docker-entrypoint.sh | 17 +++++++---------- .../opensearch_dashboards.yml | 17 +++++++---------- .../opensearch-docker-entrypoint.sh | 15 +-------------- .../opensearch-dashboards.al2.dockerfile | 19 +++---------------- .../dockerfiles/opensearch.al2.dockerfile | 19 +++---------------- .../linux/opensearch-dashboards-tar-build.sh | 2 +- .../legacy/tar/linux/opensearch-tar-build.sh | 2 +- .../tar/linux/opensearch-tar-install.sh | 17 +++++++---------- 9 files changed, 37 insertions(+), 88 deletions(-) diff --git a/config/opensearch_dashboards.yml b/config/opensearch_dashboards.yml index b967c3adf2..fe4099bebc 100644 --- a/config/opensearch_dashboards.yml +++ b/config/opensearch_dashboards.yml @@ -1,15 +1,12 @@ -# Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright OpenSearch Contributors +# SPDX-License-Identifier: Apache-2.0 # -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at +# The OpenSearch Contributors require contributions made to +# this file be licensed under the Apache-2.0 license or a +# compatible open source license. # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# or in the "license" file accompanying this file. This file 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. +# Modifications Copyright OpenSearch Contributors. See +# GitHub history for details. # Description: # Default configuration for OpenSearch Dashboards diff --git a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint.sh b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint.sh index b800d265fe..1fabd00e72 100755 --- a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint.sh +++ b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint.sh @@ -1,17 +1,14 @@ #!/bin/bash -# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright OpenSearch Contributors +# SPDX-License-Identifier: Apache-2.0 # -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at +# The OpenSearch Contributors require contributions made to +# this file be licensed under the Apache-2.0 license or a +# compatible open source license. # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# or in the "license" file accompanying this file. This file 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. +# Modifications Copyright OpenSearch Contributors. See +# GitHub history for details. # # Run OpenSearch-Dashboards, using environment variables to diff --git a/docker/release/config/opensearch-dashboards/opensearch_dashboards.yml b/docker/release/config/opensearch-dashboards/opensearch_dashboards.yml index df505bca27..663786bb3b 100644 --- a/docker/release/config/opensearch-dashboards/opensearch_dashboards.yml +++ b/docker/release/config/opensearch-dashboards/opensearch_dashboards.yml @@ -1,15 +1,12 @@ -# Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright OpenSearch Contributors +# SPDX-License-Identifier: Apache-2.0 # -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at +# The OpenSearch Contributors require contributions made to +# this file be licensed under the Apache-2.0 license or a +# compatible open source license. # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# or in the "license" file accompanying this file. This file 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. +# Modifications Copyright OpenSearch Contributors. See +# GitHub history for details. # Description: # Default configuration for OpenSearch Dashboards diff --git a/docker/release/config/opensearch/opensearch-docker-entrypoint.sh b/docker/release/config/opensearch/opensearch-docker-entrypoint.sh index 84dfd2d293..106c92a524 100755 --- a/docker/release/config/opensearch/opensearch-docker-entrypoint.sh +++ b/docker/release/config/opensearch/opensearch-docker-entrypoint.sh @@ -1,5 +1,6 @@ #!/bin/bash +# Copyright OpenSearch Contributors # SPDX-License-Identifier: Apache-2.0 # # The OpenSearch Contributors require contributions made to @@ -9,20 +10,6 @@ # Modifications Copyright OpenSearch Contributors. See # GitHub history for details. - -# Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# or in the "license" file accompanying this file. This file 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. - # This script specify the entrypoint startup actions for opensearch # It will start both opensearch and performance analyzer plugin cli # If either process failed, the entire docker container will be removed diff --git a/docker/release/dockerfiles/opensearch-dashboards.al2.dockerfile b/docker/release/dockerfiles/opensearch-dashboards.al2.dockerfile index e1ab83c9d1..e504340ea7 100644 --- a/docker/release/dockerfiles/opensearch-dashboards.al2.dockerfile +++ b/docker/release/dockerfiles/opensearch-dashboards.al2.dockerfile @@ -1,25 +1,12 @@ +# Copyright OpenSearch Contributors # SPDX-License-Identifier: Apache-2.0 -# +# # The OpenSearch Contributors require contributions made to # this file be licensed under the Apache-2.0 license or a # compatible open source license. -# +# # Modifications Copyright OpenSearch Contributors. See # GitHub history for details. - - -# Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# or in the "license" file accompanying this file. This file 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. # This dockerfile generates an AmazonLinux-based image containing an OpenSearch-Dashboards installation. diff --git a/docker/release/dockerfiles/opensearch.al2.dockerfile b/docker/release/dockerfiles/opensearch.al2.dockerfile index 1ff3fc3f34..5a1268498b 100644 --- a/docker/release/dockerfiles/opensearch.al2.dockerfile +++ b/docker/release/dockerfiles/opensearch.al2.dockerfile @@ -1,25 +1,12 @@ +# Copyright OpenSearch Contributors # SPDX-License-Identifier: Apache-2.0 -# +# # The OpenSearch Contributors require contributions made to # this file be licensed under the Apache-2.0 license or a # compatible open source license. -# +# # Modifications Copyright OpenSearch Contributors. See # GitHub history for details. - - -# Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# or in the "license" file accompanying this file. This file 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. # This dockerfile generates an AmazonLinux-based image containing an OpenSearch installation. diff --git a/scripts/legacy/tar/linux/opensearch-dashboards-tar-build.sh b/scripts/legacy/tar/linux/opensearch-dashboards-tar-build.sh index 6d630bdc13..6e7d7470b4 100755 --- a/scripts/legacy/tar/linux/opensearch-dashboards-tar-build.sh +++ b/scripts/legacy/tar/linux/opensearch-dashboards-tar-build.sh @@ -1,5 +1,6 @@ #!/bin/bash +# Copyright OpenSearch Contributors # SPDX-License-Identifier: Apache-2.0 # # The OpenSearch Contributors require contributions made to @@ -8,7 +9,6 @@ # # Modifications Copyright OpenSearch Contributors. See # GitHub history for details. -# Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. # diff --git a/scripts/legacy/tar/linux/opensearch-tar-build.sh b/scripts/legacy/tar/linux/opensearch-tar-build.sh index 5f4bfa36fd..4c3830ac7e 100755 --- a/scripts/legacy/tar/linux/opensearch-tar-build.sh +++ b/scripts/legacy/tar/linux/opensearch-tar-build.sh @@ -1,5 +1,6 @@ #!/bin/bash +# Copyright OpenSearch Contributors # SPDX-License-Identifier: Apache-2.0 # # The OpenSearch Contributors require contributions made to @@ -8,7 +9,6 @@ # # Modifications Copyright OpenSearch Contributors. See # GitHub history for details. -# Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. # diff --git a/scripts/legacy/tar/linux/opensearch-tar-install.sh b/scripts/legacy/tar/linux/opensearch-tar-install.sh index 6614e459a5..db0d1d02e5 100755 --- a/scripts/legacy/tar/linux/opensearch-tar-install.sh +++ b/scripts/legacy/tar/linux/opensearch-tar-install.sh @@ -1,17 +1,14 @@ #!/bin/bash -# Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright OpenSearch Contributors +# SPDX-License-Identifier: Apache-2.0 # -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at +# The OpenSearch Contributors require contributions made to +# this file be licensed under the Apache-2.0 license or a +# compatible open source license. # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# or in the "license" file accompanying this file. This file 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. +# Modifications Copyright OpenSearch Contributors. See +# GitHub history for details. OPENSEARCH_HOME=`dirname $(realpath $0)`; cd $OPENSEARCH_HOME KNN_LIB_DIR=$OPENSEARCH_HOME/plugins/opensearch-knn/knnlib