This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
The following commit(s) were added to refs/heads/asf-site by this push: new 86c39cc Site + Apidocs Maven Publish 86c39cc is described below commit 86c39cc126eecce0bfdba2810d1c1eda147bbb25 Author: Juan Pablo Santos Rodriguez <juanpa...@apache.org> AuthorDate: Tue Dec 12 00:08:16 2017 +0100 Site + Apidocs Maven Publish --- attach/CopyrightNotice/feather-small.png | Bin community/mailing_lists.html | 0 community/people.html | 0 community/social_media.html | 0 css/fonts/FontJspwiki.eot | Bin css/fonts/FontJspwiki.svg | 0 css/fonts/FontJspwiki.ttf | Bin css/fonts/FontJspwiki.woff | Bin css/haddock.css | 0 css/images/feather-small.png | Bin css/jspwiki.css | 0 css/jspwiki_print.css | 0 development/edit_website.html | 2 +- development/source_and_guide.html | 20 ++++++++++++++++++-- general/downloads.html | 0 general/news.html | 4 ++++ images/Apache_Logo.png | Bin images/SilkIconSet-readme.txt | 0 images/apache_incubator_logo.png | Bin images/apache_software_foundation_logo.gif | Bin images/apache_software_foundation_logo.png | Bin images/arrdown.png | Bin images/arrdownsmall.gif | Bin images/arrup.gif | Bin images/asf_logo.png | Bin images/attach-strip.png | Bin images/attachment_big.png | Bin images/attachment_small.gif | Bin images/attachment_small.png | Bin images/book_open.png | Bin images/downGreenArrow.png | Bin images/editor-strip.gif | Bin images/error.gif | Bin images/exclamation.gif | Bin images/favicon.ico | Bin images/favicon.png | Bin images/filter.gif | Bin images/information.gif | Bin images/jspwiki-icons.png | Bin images/jspwiki-strip.gif | Bin images/jspwiki_logo.png | Bin images/jspwiki_logo_s.png | Bin images/note.png | Bin images/out.png | Bin images/personal.png | Bin images/preview.gif | Bin images/progress.gif | Bin images/resize-horizontal.gif | Bin images/search.gif | Bin images/slimbox_close.gif | Bin images/slimbox_close.png | Bin images/slimbox_close_hover.gif | Bin images/sortable.gif | Bin images/sorted_down.gif | Bin images/sorted_up.gif | Bin images/spin.gif | Bin images/tip.png | Bin images/xml.png | Bin images/xmlCoffeeCup.png | Bin index.html | 6 +++--- js/haddock-edit.js | 0 js/haddock-wysiwyg.js | 0 js/haddock.js | 0 js/jspwiki-common.js | 0 js/jspwiki-edit.js | 0 js/jspwiki-prefs.js | 0 js/mootools.js | 0 pmc/board_reports.html | 0 pmc/how_to_release.html | 0 69 files changed, 26 insertions(+), 6 deletions(-) diff --git a/attach/CopyrightNotice/feather-small.png b/attach/CopyrightNotice/feather-small.png old mode 100644 new mode 100755 diff --git a/community/mailing_lists.html b/community/mailing_lists.html old mode 100644 new mode 100755 diff --git a/community/people.html b/community/people.html old mode 100644 new mode 100755 diff --git a/community/social_media.html b/community/social_media.html old mode 100644 new mode 100755 diff --git a/css/fonts/FontJspwiki.eot b/css/fonts/FontJspwiki.eot old mode 100644 new mode 100755 diff --git a/css/fonts/FontJspwiki.svg b/css/fonts/FontJspwiki.svg old mode 100644 new mode 100755 diff --git a/css/fonts/FontJspwiki.ttf b/css/fonts/FontJspwiki.ttf old mode 100644 new mode 100755 diff --git a/css/fonts/FontJspwiki.woff b/css/fonts/FontJspwiki.woff old mode 100644 new mode 100755 diff --git a/css/haddock.css b/css/haddock.css old mode 100644 new mode 100755 diff --git a/css/images/feather-small.png b/css/images/feather-small.png old mode 100644 new mode 100755 diff --git a/css/jspwiki.css b/css/jspwiki.css old mode 100644 new mode 100755 diff --git a/css/jspwiki_print.css b/css/jspwiki_print.css old mode 100644 new mode 100755 diff --git a/development/edit_website.html b/development/edit_website.html old mode 100644 new mode 100755 index f55a9ea..a0b2850 --- a/development/edit_website.html +++ b/development/edit_website.html @@ -164,7 +164,7 @@ <h2>Apache JSPWiki website</h2> <p>(adapted from <a href="https://github.com/apache/incubator-guacamole-website">Apache Guacamole site</a>)</p> <p>Most of this website is powered by Apache JSPWiki itself, under <a href="">http://jspwiki-wiki.apache.org</a></p> -<p><a href="https://git-wip-us.apache.org/repos/asf?p=jspwiki-site.git">This repository</a> contains the source for the website of Apache JSPWiki, available under <a href="">http://jspwiki.apache.org</a>, which can be deployed via <a href="https://blogs.apache.org/infra/entry/git_based_websites_available">gitpubsub</a>.</p> +<p><a href="https://github.com/apache/jspwiki-site.git">This repository</a> contains the source for the website of Apache JSPWiki, available under <a href="">http://jspwiki.apache.org</a>, which can be deployed via <a href="https://blogs.apache.org/infra/entry/git_based_websites_available">gitpubsub</a>.</p> <p>This website itself is completely static, being automatically generated by <a href="https://jbake.org/">JBake</a> prior to deployment. The content of the website is written in a mixture of Freemarker templates and Markdown. Templated content is interpreted only at build time, with the final result being completely static. This allows us to have a fast, backup site if needed, and also to publish our <a href="/apidocs/index.html">apidocs</a> easily (see <a href="/development/edit_websit [...] <p>To facilitate ease of development and testing, this repository also contains a couple of build scripts, <code>ci.sh</code> and <code>mvn-ci.sh</code>, the usage of which is documented below.</p> <h2>Table of contents</h2> diff --git a/development/source_and_guide.html b/development/source_and_guide.html old mode 100644 new mode 100755 index a158053..e24a3dd --- a/development/source_and_guide.html +++ b/development/source_and_guide.html @@ -164,10 +164,26 @@ <h2>Getting JSPWiki Source Code</h2> <p>JSPWiki <a href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary">source code</a> is maintained using Git.</p> <p>Checkout the code using:</p> -<pre><code>git clone http://git-wip-us.apache.org/repos/asf/jspwiki.git jspwiki +<pre><code>git clone http://github.com/apache/jspwiki.git jspwiki </code></pre> -<p>Change http to https if you are a developer intending to git push. You can check<br/><a href="https://reference.apache.org/committer/git">Getting started with Git at the ASF</a> for further information. There is also a<br/><a href="https://github.com/apache/jspwiki">GitHub mirror</a>, so you can also fork and send your PRs from there.</p> +<p>Change http to https if you are a developer intending to git push. You can check<br/><a href="https://reference.apache.org/committer/git">Getting started with Git at the ASF</a> for further information. Also, as it is<br/>hosted on GitHub, you can also fork and send your PRs from there. </p> +<p>In order to be able to commit on the github repos, the following steps must be taken:</p> +<ul> + <li>Enable <a href="https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/">2FA on your github account</a></li> + <li>Become part of the ASF org on github. If you have not done so already, visit id.apache.org and add your GitHub ID to your profile. An organisational invite will be sent to you via email shortly thereafter (within 30 minutes).</li> + <li>Link ASF and GitHub accounts through <a href="https://gitbox.apache.org/setup"><a href="https://gitbox.apache.org/setup">https://gitbox.apache.org/setup</a></a></li> +</ul> <p>See the <a href="edit_website.html">Edit Website</a> page for the website sources.</p> +<h2>Current repositories</h2> +<ul> + <li> + <a href="https://github.com/apache/jspwiki">https://github.com/apache/jspwiki</a></li> + <li> + <a href="https://github.com/apache/jspwiki-asf-docs">https://github.com/apache/jspwiki-asf-docs</a></li> + <li> + <a href="https://github.com/apache/jspwiki-site">https://github.com/apache/jspwiki-site</a></li> +</ul> +<p>ASF git copies are on gitbox, like <a href="https://gitbox.apache.org/repos/asf/jspwiki.git"><a href="https://gitbox.apache.org/repos/asf/jspwiki.git">https://gitbox.apache.org/repos/asf/jspwiki.git</a></a>. </p> <h2>Building JSPWiki</h2> <p>Apache JSPWiki is a <a href="http://maven.apache.org">Maven</a>-based project and<br/>builds using the same commands as other Maven projects. The JSPWiki team maintains<br/>a <a href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=blob_plain;f=mvn_cheat-sheet.md">cheat sheet</a><br/>of common Maven tasks for this project. Current release is 2.10.2 and can be reached through<br/>the <a href="../general/downloads.html">downloads</a> page, with development going into 2.10.3.</p> <h3>Coding standards:</h3> diff --git a/general/downloads.html b/general/downloads.html old mode 100644 new mode 100755 diff --git a/general/news.html b/general/news.html old mode 100644 new mode 100755 index c566a3c..456484b --- a/general/news.html +++ b/general/news.html @@ -164,6 +164,10 @@ <h2>Project News</h2> <ul> <li> + <p><strong>11-Dec-2017:</strong> JSPWiki development now occurs on <a href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code">GitHub</a>!</p></li> + <li> + <p><strong>01-Jul-2017:</strong> new website!</p></li> + <li> <p><strong>06-Apr-2016:</strong> new committer and PMC member - Dave Koelmeyer</p></li> <li> <p><strong>20-Feb-2016:</strong> Official <a href="downloads.html">Apache JSPWiki 2.10.2 release</a> is out!</p></li> diff --git a/images/Apache_Logo.png b/images/Apache_Logo.png old mode 100644 new mode 100755 diff --git a/images/SilkIconSet-readme.txt b/images/SilkIconSet-readme.txt old mode 100644 new mode 100755 diff --git a/images/apache_incubator_logo.png b/images/apache_incubator_logo.png old mode 100644 new mode 100755 diff --git a/images/apache_software_foundation_logo.gif b/images/apache_software_foundation_logo.gif old mode 100644 new mode 100755 diff --git a/images/apache_software_foundation_logo.png b/images/apache_software_foundation_logo.png old mode 100644 new mode 100755 diff --git a/images/arrdown.png b/images/arrdown.png old mode 100644 new mode 100755 diff --git a/images/arrdownsmall.gif b/images/arrdownsmall.gif old mode 100644 new mode 100755 diff --git a/images/arrup.gif b/images/arrup.gif old mode 100644 new mode 100755 diff --git a/images/asf_logo.png b/images/asf_logo.png old mode 100644 new mode 100755 diff --git a/images/attach-strip.png b/images/attach-strip.png old mode 100644 new mode 100755 diff --git a/images/attachment_big.png b/images/attachment_big.png old mode 100644 new mode 100755 diff --git a/images/attachment_small.gif b/images/attachment_small.gif old mode 100644 new mode 100755 diff --git a/images/attachment_small.png b/images/attachment_small.png old mode 100644 new mode 100755 diff --git a/images/book_open.png b/images/book_open.png old mode 100644 new mode 100755 diff --git a/images/downGreenArrow.png b/images/downGreenArrow.png old mode 100644 new mode 100755 diff --git a/images/editor-strip.gif b/images/editor-strip.gif old mode 100644 new mode 100755 diff --git a/images/error.gif b/images/error.gif old mode 100644 new mode 100755 diff --git a/images/exclamation.gif b/images/exclamation.gif old mode 100644 new mode 100755 diff --git a/images/favicon.ico b/images/favicon.ico old mode 100644 new mode 100755 diff --git a/images/favicon.png b/images/favicon.png old mode 100644 new mode 100755 diff --git a/images/filter.gif b/images/filter.gif old mode 100644 new mode 100755 diff --git a/images/information.gif b/images/information.gif old mode 100644 new mode 100755 diff --git a/images/jspwiki-icons.png b/images/jspwiki-icons.png old mode 100644 new mode 100755 diff --git a/images/jspwiki-strip.gif b/images/jspwiki-strip.gif old mode 100644 new mode 100755 diff --git a/images/jspwiki_logo.png b/images/jspwiki_logo.png old mode 100644 new mode 100755 diff --git a/images/jspwiki_logo_s.png b/images/jspwiki_logo_s.png old mode 100644 new mode 100755 diff --git a/images/note.png b/images/note.png old mode 100644 new mode 100755 diff --git a/images/out.png b/images/out.png old mode 100644 new mode 100755 diff --git a/images/personal.png b/images/personal.png old mode 100644 new mode 100755 diff --git a/images/preview.gif b/images/preview.gif old mode 100644 new mode 100755 diff --git a/images/progress.gif b/images/progress.gif old mode 100644 new mode 100755 diff --git a/images/resize-horizontal.gif b/images/resize-horizontal.gif old mode 100644 new mode 100755 diff --git a/images/search.gif b/images/search.gif old mode 100644 new mode 100755 diff --git a/images/slimbox_close.gif b/images/slimbox_close.gif old mode 100644 new mode 100755 diff --git a/images/slimbox_close.png b/images/slimbox_close.png old mode 100644 new mode 100755 diff --git a/images/slimbox_close_hover.gif b/images/slimbox_close_hover.gif old mode 100644 new mode 100755 diff --git a/images/sortable.gif b/images/sortable.gif old mode 100644 new mode 100755 diff --git a/images/sorted_down.gif b/images/sorted_down.gif old mode 100644 new mode 100755 diff --git a/images/sorted_up.gif b/images/sorted_up.gif old mode 100644 new mode 100755 diff --git a/images/spin.gif b/images/spin.gif old mode 100644 new mode 100755 diff --git a/images/tip.png b/images/tip.png old mode 100644 new mode 100755 diff --git a/images/xml.png b/images/xml.png old mode 100644 new mode 100755 diff --git a/images/xmlCoffeeCup.png b/images/xmlCoffeeCup.png old mode 100644 new mode 100755 diff --git a/index.html b/index.html index af76acd..493996c 100755 --- a/index.html +++ b/index.html @@ -183,17 +183,17 @@ <h2>Project status</h2> <ul> <li> + <p><strong>11-Dec-2017:</strong> JSPWiki development now occurs on <a href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code">GitHub</a>!</p></li> + <li> <p><strong>01-Jul-2017:</strong> new website!</p></li> <li> <p><strong>06-Apr-2016:</strong> new committer and PMC member - Dave Koelmeyer</p></li> <li> - <p><strong>20-Feb-2016:</strong> Official <a href="general/downloads.html">Apache JSPWiki 2.10.2 release</a> is out!</p></li> + <p><strong>20-Feb-2016:</strong> Official <a href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.10#section-NewIn2.10-SectionNewIn2.10NewInJSPWiki2.10.2ReleasedOn20022016">Apache JSPWiki 2.10.2 release</a> is out!</p></li> <li> <p><strong>23-Dec-2014:</strong> new committer and PMC member - David Vittor</p></li> <li> <p><strong>21-Aug-2014:</strong> new committer and PMC member - Siegfried Goeschl</p></li> - <li> - <p><strong>29-May-2014:</strong> Official <a href="general/downloads.html">Apache JSPWiki 2.10.1 release</a> is out!</p></li> </ul> </div> <div class="page-footer visible-print"> diff --git a/js/haddock-edit.js b/js/haddock-edit.js old mode 100644 new mode 100755 diff --git a/js/haddock-wysiwyg.js b/js/haddock-wysiwyg.js old mode 100644 new mode 100755 diff --git a/js/haddock.js b/js/haddock.js old mode 100644 new mode 100755 diff --git a/js/jspwiki-common.js b/js/jspwiki-common.js old mode 100644 new mode 100755 diff --git a/js/jspwiki-edit.js b/js/jspwiki-edit.js old mode 100644 new mode 100755 diff --git a/js/jspwiki-prefs.js b/js/jspwiki-prefs.js old mode 100644 new mode 100755 diff --git a/js/mootools.js b/js/mootools.js old mode 100644 new mode 100755 diff --git a/pmc/board_reports.html b/pmc/board_reports.html old mode 100644 new mode 100755 diff --git a/pmc/how_to_release.html b/pmc/how_to_release.html old mode 100644 new mode 100755 -- To stop receiving notification emails like this one, please contact ['"commits@jspwiki.apache.org" <commits@jspwiki.apache.org>'].