You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by al...@apache.org on 2015/08/24 13:42:15 UTC

[49/50] [abbrv] incubator-taverna-databundle-viewer git commit: Add DISCLAIMER. Update LICENSE, NOTICE and README from upstream repository

Add DISCLAIMER. Update LICENSE, NOTICE and README from upstream repository


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/commit/32605885
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/tree/32605885
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/diff/32605885

Branch: refs/heads/master
Commit: 326058858fb024276f701ac25b209d4bbc38daae
Parents: 06d7808
Author: Denis Karyakin <sa...@gmail.com>
Authored: Thu Aug 20 23:03:08 2015 +0300
Committer: Denis Karyakin <sa...@gmail.com>
Committed: Thu Aug 20 23:03:08 2015 +0300

----------------------------------------------------------------------
 DISCLAIMER | 10 ++++++++++
 LICENSE    | 26 ++++++++++++++++++++++++++
 NOTICE     |  2 +-
 README.md  |  2 +-
 4 files changed, 38 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/blob/32605885/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..38054b8
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,10 @@
+Apache Taverna is an effort undergoing incubation at the Apache Software
+Foundation (ASF), sponsored by the Apache Incubator PMC.
+
+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.

http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/blob/32605885/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 68c771a..d645695 100644
--- a/LICENSE
+++ b/LICENSE
@@ -174,3 +174,29 @@
       incurred by, or claims asserted against, such Contributor by reason
       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.

http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/blob/32605885/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 0b9ed49..d90c529 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Taverna Databundle Viewer
-Copyright 2015 The Apache Software Foundation
+Copyright 2014-2015 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/blob/32605885/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 7556158..cda677e 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ You can see working prototype there: [DataBundleViewer](http://databundle.heroku
 
 ## License
 
-(c) 2015 Apache Software Foundation
+(c) 2014-2015 Apache Software Foundation
 
 This product includes software developed at The [Apache Software
 Foundation](http://www.apache.org/).