freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject freemarker-site git commit: Committer-howto update, doap.rdf update...
Date Wed, 04 Apr 2018 11:47:36 GMT
Repository: freemarker-site
Updated Branches:
  refs/heads/asf-site d81b62f44 -> 7e5f9d684


Committer-howto update, doap.rdf update...


Project: http://git-wip-us.apache.org/repos/asf/freemarker-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/freemarker-site/commit/7e5f9d68
Tree: http://git-wip-us.apache.org/repos/asf/freemarker-site/tree/7e5f9d68
Diff: http://git-wip-us.apache.org/repos/asf/freemarker-site/diff/7e5f9d68

Branch: refs/heads/asf-site
Commit: 7e5f9d68402e0000a7b9a5e0f38a7aa2fe5c8ff9
Parents: d81b62f
Author: ddekany <ddekany@apache.org>
Authored: Wed Apr 4 13:47:30 2018 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Wed Apr 4 13:47:30 2018 +0200

----------------------------------------------------------------------
 committer-howto.html | 53 +++++++++++++++++++++++++++++++++++++----------
 doap.rdf             |  7 +++++++
 toc.js               |  8 +++++++
 3 files changed, 57 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/7e5f9d68/committer-howto.html
----------------------------------------------------------------------
diff --git a/committer-howto.html b/committer-howto.html
index c495b45..7a1b48d 100644
--- a/committer-howto.html
+++ b/committer-howto.html
@@ -42,7 +42,7 @@ ga('send', 'pageview');
 <h1 class="content-header header-section1" id="committer-howto" itemprop="headline">Committer
how-to</h1>
 </div></div><div class="page-menu">
 <div class="page-menu-title">Page Contents</div>
-<ul><li><a class="page-menu-link" href="#git-commit-policy" data-menu-target="git-commit-policy">Git
commit policies</a></li><li><a class="page-menu-link" href="#merging-pull-request"
data-menu-target="merging-pull-request">Merging in pull requests from GitHub</a></li><li><a
class="page-menu-link" href="#close-pull-request-without-merging" data-menu-target="close-pull-request-without-merging">Closing
GitHub pull requests without merging</a></li><li><a class="page-menu-link"
href="#making-releases" data-menu-target="making-releases">Making releases</a></li><li><a
class="page-menu-link" href="#deploy-snapshot" data-menu-target="deploy-snapshot">Deploying
Maven SNAPSHOT versions</a></li><li><a class="page-menu-link" href="#updating-homepage"
data-menu-target="updating-homepage">Updating the FreeMarker home page</a></li><li><a
class="page-menu-link" href="#updating-docgen" data-menu-target="updating-docgen">Updating
Docgen</a></li><li><a class="page-menu-link" href="#edit-docbook" data-
 menu-target="edit-docbook">Regarding editing the Manual and the Site DocBook</a></li><li><a
class="page-menu-link" href="#handle-security-vulnerabilities" data-menu-target="handle-security-vulnerabilities">Dealing
with security vulnerabilities</a></li></ul> </div><p><em>This
page applies to Committers only, not to usual
+<ul><li><a class="page-menu-link" href="#git-commit-policy" data-menu-target="git-commit-policy">Git
commit policies</a></li><li><a class="page-menu-link" href="#merging-pull-request"
data-menu-target="merging-pull-request">Merging in pull requests from GitHub</a></li><li><a
class="page-menu-link" href="#close-pull-request-without-merging" data-menu-target="close-pull-request-without-merging">Closing
GitHub pull requests without merging</a></li><li><a class="page-menu-link"
href="#making-releases" data-menu-target="making-releases">Making releases</a></li><li><a
class="page-menu-link" href="#deploy-snapshot" data-menu-target="deploy-snapshot">Deploying
Maven SNAPSHOT versions</a></li><li><a class="page-menu-link" href="#updating-homepage"
data-menu-target="updating-homepage">Updating the FreeMarker home page</a></li><li><a
class="page-menu-link" href="#updating-docgen" data-menu-target="updating-docgen">Updating
Docgen</a></li><li><a class="page-menu-link" href="#edit-docbook" data-
 menu-target="edit-docbook">Regarding editing the Manual and the Site DocBook</a></li><li><a
class="page-menu-link" href="#handle-security-vulnerabilities" data-menu-target="handle-security-vulnerabilities">Dealing
with security vulnerabilities</a></li><li><a class="page-menu-link" href="#pmc-resources"
data-menu-target="pmc-resources">PMC member resources</a></li></ul> </div><p><em>This
page applies to Committers only, not to usual
       contributors.</em> A Committer is a person with extra rights who
       receives his status via invitation. You don&#39;t need to be a Committer to
       contribute, anyone can fork and send pull requests on Github; see more
@@ -258,7 +258,8 @@ ga('send', 'pageview');
 
           <li>
             <p>Ensure that all changes in the 2.3-gae branch were merged
-            into the 2.3 branch.</p>
+            into the 2.3 branch. (Also that both branches where <code class="inline-code">git
+            push</code>-ed.)</p>
           </li>
 
           <li>
@@ -339,7 +340,7 @@ ga('send', 'pageview');
 
           <li>
             <p>Upload the content of <code class="inline-code">documentation/_html</code>
-            from the binary release to https://freemarker.apache.org/<strong>builds/<em>X.X.X</em>-voting</strong>/documentation/
+            from the binary release to https://freemarker.apache.org/<strong>builds/<em>X.X.X</em>-voting</strong>/
             (by committing it into the "asf-site" branch of
             https://git-wip-us.apache.org/repos/asf/freemarker-site.git). The
             change log will be a link pointing to a page inside this.</p>
@@ -379,7 +380,9 @@ ga('send', 'pageview');
                   </li>
 
                   <li>
-                    <p>Specify Maven staging coordinates</p>
+                    <p>Specify Maven staging repository URL and artifact
+                    coordinates, also the URL of the repository directory that
+                    contains this release for easier reviewing</p>
                   </li>
                 </ul>
               </li>
@@ -424,6 +427,25 @@ ga('send', 'pageview');
           </li>
 
           <li>
+            <p>Tag the release on Git (tags are like
+            <code class="inline-code">v2.3.45-gae</code> and <code class="inline-code">v2.3.45</code>).
Be
+            careful not to tag a commit made since the voting has
+            succeeded.</p>
+          </li>
+
+          <li>
+            <p>Add the release on: <a href="https://reporter.apache.org/addrelease.html?freemarker">https://reporter.apache.org/addrelease.html?freemarker</a></p>
+          </li>
+
+          <li>
+            <p>Update <code class="inline-code">doap.rdf</code> in the
+            <code class="inline-code">freemarker-site</code> repository (don&#39;t
forget to
+            commit it into the <code class="inline-code">asf-site</code> branch
as well, not
+            just into <code class="inline-code">master</code>, or else it&#39;s
not
+            published)</p>
+          </li>
+
+          <li>
             <p>Wait 24 hours so that the mirrors get synced. Check <a href="https://www.apache.org/dist/freemarker/">https://www.apache.org/dist/freemarker/</a>
             and <a href="http://archive.apache.org/dist/freemarker/">http://archive.apache.org/dist/freemarker/</a>.
             Check Maven Central repository too (in the case of non-RC
@@ -437,12 +459,6 @@ ga('send', 'pageview');
           </li>
 
           <li>
-            <p>Tag the release on Git (see earlier tags for the tag name
-            format). Be careful not to tag a commit made since the voting has
-            succeeded.</p>
-          </li>
-
-          <li>
             <p>Update https://freemarker.apache.org:</p>
 
             <ul>
@@ -673,11 +689,26 @@ ga('send', 'pageview');
         private mailing lists of the project before doing publicly visible
         moves. See <a href="https://www.apache.org/security/committers.html">this
         page</a> for further guidelines.</p>
+      
+        
+
+
+
+<h2 class="content-header header-section2" id="pmc-resources">PMC member resources</h2>
+
+
+        <p>This section is for PMC (Project Management Committee) members
+        only, and meant to contain information that is specific to the
+        FreeMarker project.</p>
+
+        <p>To share files among PMC members (such as Board report drafts),
+        use this SVN repository: <a href="https://svn.apache.org/repos/private/pmc/freemarker/">https://svn.apache.org/repos/private/pmc/freemarker/</a>.
+        It can be read by PMC members only.</p>
       </div></div>      </div>
     </div>
 <div class="site-footer"><div class="site-width"><div class="footer-top"><div
class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a
href="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a
href="docs/app_versions.html">Version history</a></li><li><a href="history.html">About
us</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li></ul></div><div
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a
href="http://try.freemarker.org/">Try template online</a></li><li><a
href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a
href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a
href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div
class="column"><h3 class="column-header">Community</h3><ul><li><a
href="https://github.com/apache/freemarke
 r">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow
us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/">Report
a bug</a></li><li><a href="https://stackoverflow.com/questions/ask?tags=freemarker">Ask
a question</a></li><li><a href="mailing-lists.html">Mailing lists</a></li></ul></div></div><div
class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/apache/freemarker">GitHub</a></li><li><a
class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a
class="stack-overflow" href="https://stackoverflow.com/questions/ask?tags=freemarker">Stack
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML
Editor</span></a></div></div><div class="footer-bottom"> <p
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2018-03-30T22:46:19Z" title="Friday, March 30,
2018 10:46:19 PM GMT">2018-03-30 22:46:19 GMT</time> </p>
+<time itemprop="dateModified" datetime="2018-04-04T11:45:10Z" title="Wednesday, April
4, 2018 11:45:10 AM GMT">2018-04-04 11:45:10 GMT</time> </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2018
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The
Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache,
the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks
mentioned may be trademarks or registered trademarks of their respective owners. </p>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/7e5f9d68/doap.rdf
----------------------------------------------------------------------
diff --git a/doap.rdf b/doap.rdf
index 163d62d..65cc300 100644
--- a/doap.rdf
+++ b/doap.rdf
@@ -110,6 +110,13 @@
     <release>
         <Version>
             <name>Apache FreeMarker</name>
+            <created>2018-04-04</created>
+            <revision>2.3.28</revision>
+        </Version>
+    </release>
+    <release>
+        <Version>
+            <name>Apache FreeMarker</name>
             <created>2017-11-03</created>
             <revision>2.3.27-incubating</revision>
         </Version>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/7e5f9d68/toc.js
----------------------------------------------------------------------
diff --git a/toc.js b/toc.js
index d664bd4..6457496 100644
--- a/toc.js
+++ b/toc.js
@@ -242,6 +242,14 @@ var toc = {
 "children": [
 ]
 }
+,
+{
+"title": "PMC member resources",
+"url": "committer-howto.html#pmc-resources",
+"isFile": false,
+"children": [
+]
+}
 ]
 }
 ,


Mime
View raw message