You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2019/10/31 14:04:14 UTC

svn commit: r1869214 - in /uima/site/trunk/uima-website: docs/git-release-notes.html docs/stylesheets/base.css xdocs/git-release-notes.xml

Author: schor
Date: Thu Oct 31 14:04:14 2019
New Revision: 1869214

URL: http://svn.apache.org/viewvc?rev=1869214&view=rev
Log:
no jira update git things, change the font size for <code> tag to be only slightly larger than normal (was too large)

Modified:
    uima/site/trunk/uima-website/docs/git-release-notes.html
    uima/site/trunk/uima-website/docs/stylesheets/base.css
    uima/site/trunk/uima-website/xdocs/git-release-notes.xml

Modified: uima/site/trunk/uima-website/docs/git-release-notes.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-release-notes.html?rev=1869214&r1=1869213&r2=1869214&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/git-release-notes.html (original)
+++ uima/site/trunk/uima-website/docs/git-release-notes.html Thu Oct 31 14:04:14 2019
@@ -226,6 +226,29 @@
                                                           <div class="sectionTable">
       <table class="sectionTable">
         <tr><td>
+        <a name="Suggested basic release flow"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Suggested basic release flow</h1></a>
+      </td></tr>
+      <tr><td>
+        <blockquote class="sectionBody">
+                                    <ol><li><p>Update the master in preparation for the release, including things like the Readme, release-notes,
+                 the Jira release pointer for ISSUES Fixed, API compatibility: previous version.
+                 See <a target="_blank" rel="nofollow noopener" href="checklist-release.html">checklist-release</a>
+              </p></li>
+          <li><p>(optional) If others might be continuing to update master, make a release branch, and do all the work
+                 on that branch.  Once the release is out, merge the branch back into the master (should have
+                 very little change, other than new pom SNAPSHOT version levels).</p></li>
+                 
+          <li><p>Checkout the release branch, and run the normal maven release prepare / perform cycles.</p></li>
+          <li><p>Once the vote passes, retag the last rc with the rel/tag-name (see below).</p></li>
+          <li><p>If branched, merge the release branch back into the master (updating the pom SNAPSHOT version numbers).</p></li>    
+      </ol>
+                            </blockquote>
+        </p>
+      </td></tr>
+    </table>
+                                        <div class="sectionTable">
+      <table class="sectionTable">
+        <tr><td>
         <a name="Tags"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Tags</h1></a>
       </td></tr>
       <tr><td>

Modified: uima/site/trunk/uima-website/docs/stylesheets/base.css
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/stylesheets/base.css?rev=1869214&r1=1869213&r2=1869214&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/stylesheets/base.css (original)
+++ uima/site/trunk/uima-website/docs/stylesheets/base.css Thu Oct 31 14:04:14 2019
@@ -110,13 +110,13 @@ dl dd {
   margin-left: 6em;
 }
 pre, code {
-  font-size: 115%;
+  font-size: 108%;
   *font-size: 100%;
   font-family: Courier, "Courier New";
 }
 
 pre code {
-  font-size: 100%
+  font-size: 108%
 }
 
 pre {

Modified: uima/site/trunk/uima-website/xdocs/git-release-notes.xml
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/git-release-notes.xml?rev=1869214&r1=1869213&r2=1869214&view=diff
==============================================================================
--- uima/site/trunk/uima-website/xdocs/git-release-notes.xml (original)
+++ uima/site/trunk/uima-website/xdocs/git-release-notes.xml Thu Oct 31 14:04:14 2019
@@ -26,6 +26,24 @@ under the License.
 
   <body>
 
+    <section name="Suggested basic release flow">
+      <ol><li><p>Update the master in preparation for the release, including things like the Readme, release-notes,
+                 the Jira release pointer for ISSUES Fixed, API compatibility: previous version.
+                 See <a target="_blank" rel="nofollow noopener" 
+                    href="checklist-release.html">checklist-release</a>
+              </p></li>
+          <li><p>(optional) If others might be continuing to update master, make a release branch, and do all the work
+                 on that branch.  Once the release is out, merge the branch back into the master (should have
+                 very little change, other than new pom SNAPSHOT version levels).</p></li>
+                 
+          <li><p>Checkout the release branch, and run the normal maven release prepare / perform cycles.</p></li>
+          <li><p>Once the vote passes, retag the last rc with the rel/tag-name (see below).</p></li>
+          <li><p>If branched, merge the release branch back into the master (updating the pom SNAPSHOT version numbers).</p></li>    
+      </ol>
+    
+    </section>
+    
+    
     <section name="Tags">
     
 	    <p>Tags are stored in the .git folder in the subfolder /refs/tags.</p>