You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@yetus.apache.org by aw...@apache.org on 2018/07/27 17:36:09 UTC
[1/2] yetus git commit: YETUS-602. Add Sizzle to LICENSE
Repository: yetus
Updated Branches:
refs/heads/master 666b1192c -> 0abf0a756
YETUS-602. Add Sizzle to LICENSE
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/1485f89b
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/1485f89b
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/1485f89b
Branch: refs/heads/master
Commit: 1485f89bb941d8f08e435fa1b5997c206690163c
Parents: 666b119
Author: Allen Wittenauer <aw...@apache.org>
Authored: Thu Jul 19 11:47:07 2018 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Fri Jul 27 10:32:48 2018 -0700
----------------------------------------------------------------------
LICENSE | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/yetus/blob/1485f89b/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 5e115b3..1c7f96b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -385,3 +385,36 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
----
+
+This project incorporates via jQuery portions of the Sizzle project
+available under the MIT license:
+
+Copyright JS Foundation and other contributors, https://js.foundation/
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/jquery/sizzle
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
[2/2] yetus git commit: YETUS-432. website generation mysteriously
fails when releasedocmaker fails
Posted by aw...@apache.org.
YETUS-432. website generation mysteriously fails when releasedocmaker fails
Signed-off-by: Jack Bearden <ja...@jackbearden.com>
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/0abf0a75
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/0abf0a75
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/0abf0a75
Branch: refs/heads/master
Commit: 0abf0a7562b8c0b24561043b017d80df368557af
Parents: 1485f89
Author: Allen Wittenauer <aw...@apache.org>
Authored: Thu Jul 19 14:11:35 2018 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Fri Jul 27 10:34:11 2018 -0700
----------------------------------------------------------------------
asf-site-src/config.rb | 2 ++
asf-site-src/source/contribute/website.md | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/yetus/blob/0abf0a75/asf-site-src/config.rb
----------------------------------------------------------------------
diff --git a/asf-site-src/config.rb b/asf-site-src/config.rb
index 7cf2c43..0c7bf8a 100644
--- a/asf-site-src/config.rb
+++ b/asf-site-src/config.rb
@@ -97,7 +97,9 @@ def releasenotes(output, version)
--projecttitle="Apache Yetus" \
--dirversions \
--usetoday --license --lint=all)`
+ errmsg = $stderr
unless $CHILD_STATUS.exitstatus == 0
+ puts(errmsg)
abort("releasedocmaker failed to generate release notes for #{version}.")
end
http://git-wip-us.apache.org/repos/asf/yetus/blob/0abf0a75/asf-site-src/source/contribute/website.md
----------------------------------------------------------------------
diff --git a/asf-site-src/source/contribute/website.md b/asf-site-src/source/contribute/website.md
index 1076d2d..19cd73a 100644
--- a/asf-site-src/source/contribute/website.md
+++ b/asf-site-src/source/contribute/website.md
@@ -17,7 +17,7 @@
under the License.
-->
-# Maintaing the Yetus Website
+# Maintaining the Yetus Website
We use [Middleman](https://middlemanapp.com/) to generate the website content from markdown and other
dynamic templates. The following steps assume you have a working
@@ -27,6 +27,7 @@ ruby 2.x environment setup:
gem install bundler
bundle install
```
+and a working python 2.x environment for [releasedocmaker](../in-progress/releasedocmaker/).
If you're interested in digging into how our site makes use of Middleman, or if you run into a problem, you should start
by reading [Middleman's excellent documentation](https://middlemanapp.com/basics/install/).