[incubator-sdap-nexusproto] branch master updated: SDAP-460 - Updated legal stuff (#15)

[nc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nchung pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexusproto.git


The following commit(s) were added to refs/heads/master by this push:
     new 619e195  SDAP-460 - Updated legal stuff (#15)
619e195 is described below

commit 619e195752a8bc7320f2ffba69fa782d8c8b11a4
Author: Riley Kuttruff <72...@users.noreply.github.com>
AuthorDate: Wed Jul 5 11:47:36 2023 -0700

    SDAP-460 - Updated legal stuff (#15)
    
    - Moving to full DISCLAIMER
    - Removed Appendix text from license
    
    Co-authored-by: rileykk <ri...@jpl.nasa.gov>
---
 DISCLAIMER     |  6 ++++++
 DISCLAIMER-WIP | 19 -------------------
 LICENSE        | 25 -------------------------
 3 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..020da1e
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,6 @@
+Apache SDAP is an effort undergoing incubation at The Apache Software Foundation (ASF).
+Incubation is required of all newly accepted projects until a further review indicates
+that the infrastructure, communications, and decision making process have stabilized in
+a manner consistent with other successful ASF projects. While incubation status is not
+necessarily a reflection of the completeness or stability of the code, it does indicate
+that the project has yet to be fully endorsed by the ASF.
diff --git a/DISCLAIMER-WIP b/DISCLAIMER-WIP
deleted file mode 100644
index 194647a..0000000
--- a/DISCLAIMER-WIP
+++ /dev/null
@@ -1,19 +0,0 @@
-Apache SDAP is an effort undergoing incubation at The Apache Software Foundation (ASF).
-Incubation is required of all newly accepted projects until a further review indicates
-that the infrastructure, communications, and decision making process have stabilized in
-a manner consistent with other successful ASF projects. While incubation status is not
-necessarily a reflection of the completeness or stability of the code, it does indicate
-that the project has yet to be fully endorsed by the ASF.
-
-Some of the incubating project’s releases may not be fully compliant with ASF policy. 
-For example, releases may have incomplete or un-reviewed licensing conditions. What 
-follows is a list of issues the project is currently aware of (this list is likely 
-to be incomplete): 
-- License issues with included code (./gradlew.bat)
-- Inclusion of precompiled code (./gradle/wrapper/gradle-wrapper.jar)
-
-If you are planning to incorporate this work into your product/project, please be 
-aware that you will need to conduct a thorough licensing review to determine the 
-overall implications of including this work. For the current status of this project 
-through the Apache Incubator, visit: 
-https://incubator.apache.org/projects/sdap.html
diff --git a/LICENSE b/LICENSE
index 8dada3e..d9a10c0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -174,28 +174,3 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   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.