jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject [jspwiki-site] branch jbake updated: test commit rights on JSPWiki's ASF repo on Github - update static site with latest changes
Date Mon, 11 Dec 2017 21:41:11 GMT
This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git


The following commit(s) were added to refs/heads/jbake by this push:
     new 54445b9  test commit rights on JSPWiki's ASF repo on Github - update static site
with latest changes
54445b9 is described below

commit 54445b954ee85f871c42d1d1dcfc0b7c1c79fb53
Author: Juan Pablo Santos Rodriguez <juanpablo@apache.org>
AuthorDate: Mon Dec 11 21:39:41 2017 +0100

    test commit rights on JSPWiki's ASF repo on Github - update static site with latest changes
---
 src/main/jbake/content/development/edit_website.md |  2 +-
 .../jbake/content/development/source_and_guide.md  | 22 ++++++++++++++++++----
 src/main/jbake/content/general/news.md             |  4 ++++
 src/main/jbake/content/index.md                    | 12 ++++--------
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/main/jbake/content/development/edit_website.md b/src/main/jbake/content/development/edit_website.md
index ff30bc0..861a78d 100755
--- a/src/main/jbake/content/development/edit_website.md
+++ b/src/main/jbake/content/development/edit_website.md
@@ -10,7 +10,7 @@ Apache JSPWiki website
 
 Most of this website is powered by Apache JSPWiki itself, under [http://jspwiki-wiki.apache.org]()
 
-[This repository](https://git-wip-us.apache.org/repos/asf?p=jspwiki-site.git) contains the
source for the website of Apache JSPWiki, available under [http://jspwiki.apache.org](), which
can be deployed via [gitpubsub](https://blogs.apache.org/infra/entry/git_based_websites_available).
+[This repository](https://github.com/apache/jspwiki-site.git) contains the source for the
website of Apache JSPWiki, available under [http://jspwiki.apache.org](), which can be deployed
via [gitpubsub](https://blogs.apache.org/infra/entry/git_based_websites_available).
 
 This website itself is completely static, being automatically generated by [JBake](https://jbake.org/)
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 [apidocs](/apidocs/index.html) easily (see [publishing apidocs](/development/edit_website.html#publis
[...]
 
diff --git a/src/main/jbake/content/development/source_and_guide.md b/src/main/jbake/content/development/source_and_guide.md
index e5c1051..ab27111 100755
--- a/src/main/jbake/content/development/source_and_guide.md
+++ b/src/main/jbake/content/development/source_and_guide.md
@@ -10,14 +10,28 @@ JSPWiki [source code][] is maintained using Git.
 
 Checkout the code using:
 
-    git clone http://git-wip-us.apache.org/repos/asf/jspwiki.git jspwiki
+    git clone http://github.com/apache/jspwiki.git jspwiki
 
 Change http to https if you are a developer intending to git push. You can check 
-[Getting started with Git at the ASF][] for further information. There is also a 
-[GitHub mirror][], so you can also fork and send your PRs from there.
+[Getting started with Git at the ASF][] for further information. Also, as it is 
+hosted on GitHub, you can also fork and send your PRs from there. 
+
+In order to be able to commit on the github repos, the following steps must be taken:
+
+* Enable [2FA on your github account][]
+* 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).
+* Link ASF and GitHub accounts through <a href="https://gitbox.apache.org/setup">https://gitbox.apache.org/setup</a>
 
 See the [Edit Website][] page for the website sources.
 
+## Current repositories
+
+* <a href="https://github.com/apache/jspwiki">https://github.com/apache/jspwiki</a>
+* <a href="https://github.com/apache/jspwiki-asf-docs">https://github.com/apache/jspwiki-asf-docs</a>
+* <a href="https://github.com/apache/jspwiki-site">https://github.com/apache/jspwiki-site</a>
+
+ASF git copies are on gitbox, like <a href="https://gitbox.apache.org/repos/asf/jspwiki.git">https://gitbox.apache.org/repos/asf/jspwiki.git</a>.

+
 ## Building JSPWiki
 
 Apache JSPWiki is a <a href="http://maven.apache.org">Maven</a>-based project
and 
@@ -48,7 +62,7 @@ planned release version as this is used to create the release notes.
 
 
 [Getting started with Git at the ASF]: https://reference.apache.org/committer/git
-[GitHub mirror]: https://github.com/apache/jspwiki
+[2FA on your github account]: https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/
 [Edit Website]: edit_website.html
 [Release Page]: ../pmc/how_to_release.html
 [downloads]: ../general/downloads.html
diff --git a/src/main/jbake/content/general/news.md b/src/main/jbake/content/general/news.md
index 79f7a0a..c3b64a6 100755
--- a/src/main/jbake/content/general/news.md
+++ b/src/main/jbake/content/general/news.md
@@ -6,6 +6,10 @@ type=page
 
 ## Project News
 
+  * **11-Dec-2017:** JSPWiki development now occurs on [GitHub](https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code)!

+
+  * **01-Jul-2017:** new website!
+
   * **06-Apr-2016:** new committer and PMC member - Dave Koelmeyer
 
   * **20-Feb-2016:** Official [Apache JSPWiki 2.10.2 release][] is out!
diff --git a/src/main/jbake/content/index.md b/src/main/jbake/content/index.md
index 5cc546d..b2dbed5 100755
--- a/src/main/jbake/content/index.md
+++ b/src/main/jbake/content/index.md
@@ -27,6 +27,8 @@ JSPWiki is open-source software that is released under the Apache Public
License
 
 ## Project status
 
+  * **11-Dec-2017:** JSPWiki development now occurs on [GitHub](https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code)!

+
   * **01-Jul-2017:** new website!
 
   * **06-Apr-2016:** new committer and PMC member - Dave Koelmeyer
@@ -37,8 +39,6 @@ JSPWiki is open-source software that is released under the Apache Public
License
 
   * **21-Aug-2014:** new committer and PMC member - Siegfried Goeschl
 
-  * **29-May-2014:** Official [Apache JSPWiki 2.10.1 release][] is out!
-
 
 [Apache JSPWiki]: https://jspwiki.apache.org
 
@@ -62,10 +62,6 @@ JSPWiki is open-source software that is released under the Apache Public
License
 
 [WikiMatrix]: http://www.wikimatrix.org/show/JSPWiki
 
-[Getting Involved]:https://jspwiki-wiki.apache.org/Wiki.jsp?page=Getting%20Involved
-
-[Apache JSPWiki 2.10.0 release]: general/downloads.html
-
-[Apache JSPWiki 2.10.1 release]: general/downloads.html
+[Getting Involved]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=Getting%20Involved
 
-[Apache JSPWiki 2.10.2 release]: general/downloads.html
\ No newline at end of file
+[Apache JSPWiki 2.10.2 release]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.10#section-NewIn2.10-SectionNewIn2.10NewInJSPWiki2.10.2ReleasedOn20022016
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
['"commits@jspwiki.apache.org" <commits@jspwiki.apache.org>'].

Mime
View raw message