Daos 6338 DAOS: Change DAOS license text #6 (#4475)

Updated misc files. Signed-off-by: Hua Kuang <hua.kuang@intel.com>
daos-stack · Feb 1, 2021 · 1270885 · 1270885
1 parent 7ee786c
commit 1270885
Show file tree

Hide file tree

Showing 28 changed files with 47 additions and 669 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # DAOS
 
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](./LICENSE)
+[![License](https://img.shields.io/badge/License-BSD--2--Clause--Patent-blue.svg)](./LICENSE)
 [![Coverity Scan Build Status](https://img.shields.io/coverity/scan/3015.svg)](https://scan.coverity.com/projects/daos-stack-daos)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/4163f52ec65e4ba8991208288a9a15a6)](https://www.codacy.com/app/johann.lombardi/daos?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=daos-stack/daos&amp;utm_campaign=Badge_Grade)
 
@@ -19,7 +19,7 @@ and elastic storage to optimize performance and cost.
 
 ## License
 
-DAOS is licensed under the Apache License Version 2.0.
+DAOS is licensed under the BSD-2-Clause Plus Patent License.
 Please see the [LICENSE](./LICENSE) & [NOTICE](./NOTICE) files for more
 information.
 

diff --git a/doc/man/man8/daos.8 b/doc/man/man8/daos.8
@@ -1,23 +1,6 @@
 .\" (C) Copyright 2015-2021 Intel Corporation.
 .\"
-.\" Licensed 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.
-.\"
-.\" GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE
-.\" The Government's rights to use, modify, reproduce, release, perform, display,
-.\" or disclose this software are subject to the terms of the Apache License as
-.\" provided in Contract No. B609815.
-.\" Any reproduction of computer software, computer software documentation, or
-.\" portions thereof marked with this legend must also reproduce the markings.
+.\" SPDX-License-Identifier: BSD-2-Clause-Patent
 .\"
 .TH daos 8 2019-09-17 "0.0.1" "DAOS Utilities"
 .SH NAME

diff --git a/src/cart/SConscript b/src/cart/SConscript
@@ -1,24 +1,7 @@
 #!python
-# (C) Copyright 2016-2020 Intel Corporation.
+# (C) Copyright 2016-2021 Intel Corporation.
 #
-# Licensed 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.
-#
-# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE
-# The Government's rights to use, modify, reproduce, release, perform, display,
-# or disclose this software are subject to the terms of the Apache License as
-# provided in Contract No. 8F-30005.
-# Any reproduction of computer software, computer software documentation, or
-# portions thereof marked with this legend must also reproduce the markings.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 """Build CaRT components"""
 

diff --git a/src/cart/swim/SConscript b/src/cart/swim/SConscript
@@ -1,24 +1,7 @@
 #!python
-# (C) Copyright 2018-2020 Intel Corporation.
+# (C) Copyright 2018-2021 Intel Corporation.
 #
-# Licensed 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.
-#
-# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE
-# The Government's rights to use, modify, reproduce, release, perform, display,
-# or disclose this software are subject to the terms of the Apache License as
-# provided in Contract No. 8F-30005.
-# Any reproduction of computer software, computer software documentation, or
-# portions thereof marked with this legend must also reproduce the markings.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 """Build swim src"""
 

diff --git a/src/client/java/dev/checkstyle/checkstyle.license b/src/client/java/dev/checkstyle/checkstyle.license
@@ -1,22 +1,5 @@
 /*
- * (C) Copyright 2018-2020 Intel Corporation.
+ * (C) Copyright 2018-2021 Intel Corporation.
  *
- * Licensed 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.
- *
- * GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE
- * The Government's rights to use, modify, reproduce, release, perform, display,
- * or disclose this software are subject to the terms of the Apache License as
- * provided in Contract No. B609815.
- * Any reproduction of computer software, computer software documentation, or
- * portions thereof marked with this legend must also reproduce the markings.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
diff --git a/...ent/java/hadoop-daos/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem b/...ent/java/hadoop-daos/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
@@ -1,22 +1,5 @@
-# (C) Copyright 2018-2020 Intel Corporation.
+# (C) Copyright 2018-2021 Intel Corporation.
 #
-# Licensed 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
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
-#    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.
-#
-# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE
-# The Government's rights to use, modify, reproduce, release, perform, display,
-# or disclose this software are subject to the terms of the Apache License as
-# provided in Contract No. B609815.
-# Any reproduction of computer software, computer software documentation, or
-# portions thereof marked with this legend must also reproduce the markings.
-
-io.daos.fs.hadoop.DaosFileSystem
+io.daos.fs.hadoop.DaosFileSystem
diff --git a/src/client/java/hadoop-daos/src/test/resources/contract/daos.xml b/src/client/java/hadoop-daos/src/test/resources/contract/daos.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF 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.
+  ~  SPDX-License-Identifier: BSD-2-Clause-Patent
   -->
 <configuration>
     <property>

diff --git a/src/client/java/pom.xml b/src/client/java/pom.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF 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. -->
+<!-- SPDX-License-Identifier: BSD-2-Clause-Patent -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>