Merge pull request #2 from apache/dependabot/bundler/nokogiri-1.10.5
Bump nokogiri from 1.10.2 to 1.10.5
diff --git a/Gemfile.lock b/Gemfile.lock
index bd41959..2b1de34 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -223,7 +223,7 @@
i18n
ruby-oembed (0.8.8)
ruby_dep (1.5.0)
- rubyzip (1.2.2)
+ rubyzip (2.0.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
diff --git a/_data/project.yml b/_data/project.yml
index 940a6bd..7fc4928 100644
--- a/_data/project.yml
+++ b/_data/project.yml
@@ -24,7 +24,7 @@
description: Apache Tuweni is a set of libraries and other tools to aid development of blockchain and other decentralized software written in Java and Kotlin.
download: /download
-latest_release: 0.9.0
+latest_release: 1.0.0
dev_list: dev@tuweni.incubator.apache.org
dev_list_subscribe: dev-subscribe@tuweni.incubator.apache.org
diff --git a/_includes/themes/apache/_navigation.html b/_includes/themes/apache/_navigation.html
index b2124a1..734c89a 100644
--- a/_includes/themes/apache/_navigation.html
+++ b/_includes/themes/apache/_navigation.html
@@ -27,6 +27,12 @@
<li><a href="/community-members">Who we are</a></li>
</ul>
</li>
+ <li id="docs">
+ <a href="#" data-toggle="dropdown" class="dropdown-toggle">Docs<b class="caret"></b></a>
+ <ul class="dropdown-menu dropdown-left">
+ <li><a href="/faq">FAQ</a></li>
+ </ul>
+ </li>
<li><a href="{{ site.data.project.source_repository }}">GitHub</a></li>
<li id="apache">
<a href="#" data-toggle="dropdown" class="dropdown-toggle">Apache<b class="caret"></b></a>
diff --git a/community.md b/community.md
index 4c207a6..47bf6c1 100644
--- a/community.md
+++ b/community.md
@@ -77,9 +77,9 @@
### Source Code
-The project sources are accessible via the [source code repository]({{ site.data.project.source_repository }}) which is also mirrored in [GitHub]({{ site.data.project.source_repository_mirror }})
+The project sources are accessible via the [source code repository]({{ site.data.project.source_repository }}) which is also mirrored at [Apache]({{ site.data.project.source_repository_mirror }})
### Website Source Code
-The project website sources are accessible via the [website source code repository]({{ site.data.project.website_repository }}) which is also mirrored in [GitHub]({{ site.data.project.website_repository_mirror }})
+The project website sources are accessible via the [website source code repository]({{ site.data.project.website_repository }}) which is also mirrored at [Apache]({{ site.data.project.website_repository_mirror }})
diff --git a/download.md b/download.md
index 98362af..575fb9e 100644
--- a/download.md
+++ b/download.md
@@ -43,50 +43,50 @@
<tr>
<td>{{ site.data.project.name }} {{site.data.project.latest_release}} (tgz)</td>
<td><a href="https://www.apache.org/dyn/closer.lua/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-bin-{{site.data.project.latest_release}}-incubating.tgz">tgz</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-bin-{{site.data.project.latest_release}}-incubating.tgz.sha512">SHA-512</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-bin-{{site.data.project.latest_release}}-incubating.tgz.asc">ASC</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-bin-{{site.data.project.latest_release}}-incubating.tgz.sha512">SHA-512</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-bin-{{site.data.project.latest_release}}-incubating.tgz.asc">ASC</a></td>
</tr>
<tr>
<td>{{ site.data.project.name }} {{site.data.project.latest_release}} (zip)</td>
<td><a href="https://www.apache.org/dyn/closer.lua/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-bin-{{site.data.project.latest_release}}-incubating.zip">zip</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-bin-{{site.data.project.latest_release}}-incubating.zip.sha512">SHA-512</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-bin-{{site.data.project.latest_release}}-incubating.zip.asc">ASC</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-bin-{{site.data.project.latest_release}}-incubating.zip.sha512">SHA-512</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-bin-{{site.data.project.latest_release}}-incubating.zip.asc">ASC</a></td>
</tr>
<tr>
<td>{{ site.data.project.name }} {{site.data.project.latest_release}} (source tgz)</td>
<td><a href="https://www.apache.org/dyn/closer.lua/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-src-{{site.data.project.latest_release}}-incubating.tgz">tgz</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-src-{{site.data.project.latest_release}}-incubating.tgz.sha512">SHA-512</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-src-{{site.data.project.latest_release}}-incubating.tgz.asc">ASC</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-src-{{site.data.project.latest_release}}-incubating.tgz.sha512">SHA-512</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-src-{{site.data.project.latest_release}}-incubating.tgz.asc">ASC</a></td>
</tr>
<tr>
<td>{{ site.data.project.name }} {{site.data.project.latest_release}} (source zip)</td>
<td><a href="https://www.apache.org/dyn/closer.lua/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-src-{{site.data.project.latest_release}}-incubating.zip">zip</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-src-{{site.data.project.latest_release}}-incubating.zip.sha512">SHA-512</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-src-{{site.data.project.latest_release}}-incubating.zip.asc">ASC</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-src-{{site.data.project.latest_release}}-incubating.zip.sha512">SHA-512</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-src-{{site.data.project.latest_release}}-incubating.zip.asc">ASC</a></td>
</tr>
<tr>
<td>{{ site.data.project.name }} {{site.data.project.latest_release}} (Gossip application tgz)</td>
<td><a href="https://www.apache.org/dyn/closer.lua/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-gossip-{{site.data.project.latest_release}}-incubating.tgz">tgz</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-gossip-{{site.data.project.latest_release}}-incubating.tgz.sha512">SHA-512</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-gossip-{{site.data.project.latest_release}}-incubating.tgz.asc">ASC</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-gossip-{{site.data.project.latest_release}}-incubating.tgz.sha512">SHA-512</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-gossip-{{site.data.project.latest_release}}-incubating.tgz.asc">ASC</a></td>
</tr>
<tr>
<td>{{ site.data.project.name }} {{site.data.project.latest_release}} (Gossip application zip)</td>
<td><a href="https://www.apache.org/dyn/closer.lua/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-gossip-{{site.data.project.latest_release}}-incubating.zip">zip</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-gossip-{{site.data.project.latest_release}}-incubating.zip.sha512">SHA-512</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-gossip-{{site.data.project.latest_release}}-incubating.zip.asc">ASC</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-gossip-{{site.data.project.latest_release}}-incubating.zip.sha512">SHA-512</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-gossip-{{site.data.project.latest_release}}-incubating.zip.asc">ASC</a></td>
</tr>
<tr>
<td>{{ site.data.project.name }} {{site.data.project.latest_release}} (Relayer application tgz)</td>
<td><a href="https://www.apache.org/dyn/closer.lua/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-relayer-{{site.data.project.latest_release}}-incubating.tgz">tgz</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-relayer-{{site.data.project.latest_release}}-incubating.tgz.sha512">SHA-512</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-relayer-{{site.data.project.latest_release}}-incubating.tgz.asc">ASC</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-relayer-{{site.data.project.latest_release}}-incubating.tgz.sha512">SHA-512</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-relayer-{{site.data.project.latest_release}}-incubating.tgz.asc">ASC</a></td>
</tr>
<tr>
<td>{{ site.data.project.name }} {{site.data.project.latest_release}} (Relayer application zip)</td>
<td><a href="https://www.apache.org/dyn/closer.lua/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-relayer-{{site.data.project.latest_release}}-incubating.zip">zip</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-relayer-{{site.data.project.latest_release}}-incubating.zip.sha512">SHA-512</a></td>
- <td><a href="https://www.apache.org/dist/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-relayer-{{site.data.project.latest_release}}-incubating.zip.asc">ASC</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-relayer-{{site.data.project.latest_release}}-incubating.zip.sha512">SHA-512</a></td>
+ <td><a href="https://downloads.apache.org/{{site.data.project.incubator_slash_name}}/{{site.data.project.latest_release}}-incubating/{{site.data.project.unix_name}}-relayer-{{site.data.project.latest_release}}-incubating.zip.asc">ASC</a></td>
</tr>
<!--tr>
<td>Release Notes</td>
@@ -101,7 +101,7 @@
Choose a source distribution in either *tar* or *zip* format,
and [verify](https://www.apache.org/dyn/closer.cgi#verify)
using the corresponding *asc* signature (using the committer file in
-[KEYS](https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/KEYS)).
+[KEYS](https://downloads.apache.org/{{ site.data.project.incubator_slash_name }}/KEYS)).
If you cannot do that, the *sha512* hash file may be used to check that the
download has completed OK.
@@ -112,7 +112,7 @@
succeed.
For security, hash and signature files are always hosted at
-[Apache](https://www.apache.org/dist).
+[Apache](https://downloads.apache.org).
### Maven Central
diff --git a/faq.md b/faq.md
new file mode 100644
index 0000000..fc8ef8a
--- /dev/null
+++ b/faq.md
@@ -0,0 +1,61 @@
+---
+layout: page
+title: Apache Tuweni FAQ
+tagline: Apache Tuweni
+---
+<!--
+{% comment %}
+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.
+{% endcomment %}
+-->
+
+{% include JB/setup %}
+
+# Apache Tuweni
+Tuweni is a Lakota language word which means both never and nobody.
+
+## What is Apache Tuweni?
+Apache Tuweni is an incubating project of the Apache Software Foundation originating from the Cava project at ConsenSys.
+
+The project is mostly Java with sprinkles of Kotlin.
+
+## Why Apache Tuweni?
+Tuweni stems from the need to create libraries for peer-to-peer, blockchain-based projects.
+
+We saw a great deal of fragmentation in the blockchain space early on.
+
+There are two facets to the project.
+
+One is to allow an easy path to standards and adoption by developers of peer to peer and blockchain-related technologies.
+
+The other is to offer an open home for technology to strive away from the conflicting interests of different blockchain groups.
+The Apache Software Foundation being a merit-based organization allows for such an organic community to form.
+
+Committer rights are bestowed on individuals for their contributions, and are tied to their identity, rather than their day job.
+
+## What can I use Apache Tuweni for?
+Apache Tuweni is organized in roughly 4 sections:
+
+* Low level libraries for bytes and units, as well as popular blockchain serialization formats such as RLP and SSZ.
+* Crypto libraries based off sodium and bouncycastle, for summetric and asymmetric encryption as well as hashing.
+* Ethereum centric libraries to evaluate domain objects, index chains, implementing ethereum wire protocol and the LES subprotocol, the discv4 and discv5 discovery protocols.
+* Blockchain and peer to peer network libraries reprising the above, adding secure scuttlebutt and hobbits.
+
+## Who is Apache Tuweni?
+
+Apache Tuweni is maintained by volunteers at the Apache Software Foundation.
+
+[You too can participate.](/community)
diff --git a/index.md b/index.md
index d278d86..fe22979 100644
--- a/index.md
+++ b/index.md
@@ -24,4 +24,4 @@
{% include JB/setup %}
-Apache Tuweni is a set of libraries and other tools to aid development of blockchain and other decentralized software in Java and other JVM languages. It includes a low-level bytes library, serialization and deserialization codecs (e.g. RLP), various cryptography functions and primatives, and lots of other helpful utilities. Tuweni is developed for JDK 1.8 or higher, and depends on various other FOSS libraries.
\ No newline at end of file
+Apache Tuweni is a set of libraries and other tools to aid development of blockchain and other decentralized software in Java and other JVM languages. It includes a low-level bytes library, serialization and deserialization codecs (e.g. RLP), various cryptography functions and primitives, and lots of other helpful utilities.
diff --git a/publish.sh b/publish.sh
new file mode 100755
index 0000000..39d4626
--- /dev/null
+++ b/publish.sh
@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+# 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.
+#
+# Infra has set up a webhook at the github repo that fires this task.
+# We cannot push to github, though, but only to gitbox.
+# So we need two repositories in two directories:
+#
+# master-branch (just cloning):
+# git clone https://github.com/apache/incubator-tuweni-website.git master-branch
+# asf-site-branch (pushing):
+# git clone https://gitbox.apache.org/repos/asf/incubator-tuweni-website.git asf-site-branch
+
+#
+# Testing:
+#
+echo "CHANGE_ID -${CHANGE_ID}-"
+echo "CHANGE_URL -${CHANGE_URL}-"
+echo "BRANCH_NAME -${BRANCH_NAME}-"
+echo "GIT_COMMIT -${GIT_COMMIT}-"
+echo "GIT_PREVIOUS_COMMIT -${GIT_PREVIOUS_COMMIT}-"
+
+if [ "X${GIT_COMMIT}" = "X${GIT_PREVIOUS_COMMIT}" ]; then
+ echo "Commit ${GIT_COMMIT} equal to previous commit ${GIT_PREVIOUS_COMMIT}: we are done"
+# exit 0
+fi
+
+#
+# Install RVM if needed
+#
+curl -sSL https://get.rvm.io | bash -s stable
+source "$HOME/.rvm/scripts/rvm"
+rvm install 2.7.0
+rvm use 2.7.0
+
+#
+# Run the jekyll script to generate HTML for tuweni.apache.org
+#
+cd master-branch
+echo "Building site..."
+gem install bundler -v 1.16.2
+bundle install && bundle exec jekyll build
+if [ $? -ne 0 ]; then
+ echo "Build failed!"
+ exit 1
+fi
+cd ..
+
+#
+# Copy the generated html to the asf-site branch
+#
+cd asf-site-branch
+git checkout asf-site
+git fetch origin asf-site
+git pull origin asf-site
+
+cp -R ../master-branch/target/* content
+
+#
+# Commit and push to gitbox
+#
+echo "Adding content..."
+git add -v content/
+echo "Commit to gitbox..."
+git status
+
+#
+# Note: the "Automated site publishing" text below is used to reject
+# builds triggered when pushing to asf-site (see git configuration above).
+# If you change this text then remember to change it above also.
+#
+git commit -v -m "Automated site publishing by Jenkins build ${BUILD_NUMBER}"
+if [ $? -ne 0 ]; then
+ echo "Commit failed."
+ exit 2
+fi
+echo "Pushing to gitbox..."
+git push -v origin asf-site
+if [ $? -ne 0 ]; then
+ echo "Push failed."
+ exit 3
+fi
+echo "Done."
+
+
+
