You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/06/25 17:51:39 UTC
[1/2] incubator-taverna-language git commit: README: prerequisites,
not requisites
Repository: incubator-taverna-language
Updated Branches:
refs/heads/master 3ad5f92ce -> 960d77a65
README: prerequisites, not requisites
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/772e48a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/772e48a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/772e48a5
Branch: refs/heads/master
Commit: 772e48a5e12a58d11d72d1dfd32d8880a63c5e2e
Parents: 3ad5f92
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jun 25 16:44:13 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jun 25 16:44:13 2015 +0100
----------------------------------------------------------------------
README.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/772e48a5/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 648ed0d..13c163d 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,8 @@
Apache Taverna Language is a set of APIs for workflow definitions (SCUFL2)
and workflow inputs/outputs/run (DataBundle), as consumed and produced
-by the [Apache Taverna](http://taverna.incubator.apache.org/) workflow
-system.
+by the [Apache Taverna](http://taverna.incubator.apache.org/) (incubating)
+workflow system.
The API includes support for the legacy formats from Taverna 2 and Taverna
1, and therefore can be also used independently of Apache Taverna 3.
@@ -31,8 +31,8 @@ The API includes support for the legacy formats from Taverna 2 and Taverna
This product includes software developed at The [Apache Software
Foundation](http://www.apache.org/).
-Licensed under the [Apache License
-2.0](https://www.apache.org/licenses/LICENSE-2.0), see the file
+Licensed under the
+[Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0), see the file
[LICENSE](LICENSE) for details.
The file [NOTICE](NOTICE) contain any additional attributions and
@@ -73,7 +73,7 @@ For more details, see the READMEs of:
* [taverna-scufl2-api](taverna-scufl2-api/)
-## Requisites
+## Prerequisites
* Java 1.7 or newer (tested with OpenJDK 1.8)
* [Apache Maven](https://maven.apache.org/download.html) 3.2.5 or newer (older
[2/2] incubator-taverna-language git commit: LICENSE from
http://www.apache.org/licenses/LICENSE-2.0.txt
Posted by st...@apache.org.
LICENSE from http://www.apache.org/licenses/LICENSE-2.0.txt
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/960d77a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/960d77a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/960d77a6
Branch: refs/heads/master
Commit: 960d77a65b077b4a625f1669df3d97cd94549661
Parents: 772e48a
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jun 25 16:47:56 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jun 25 16:47:56 2015 +0100
----------------------------------------------------------------------
LICENSE | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/960d77a6/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.