Author: schor
Date: Fri Nov 15 14:44:17 2019
New Revision: 1869854
URL: http://svn.apache.org/viewvc?rev=1869854&view=rev
Log:
no Jira, update the news for the 3.1.1 release (oops should have done this
sooner), and clarify some GIT conventions for releasing
Modified:
uima/site/trunk/uima-website/docs/git-conventions.html
uima/site/trunk/uima-website/docs/news.html
uima/site/trunk/uima-website/xdocs/git-conventions.xml
uima/site/trunk/uima-website/xdocs/news.xml
Modified: uima/site/trunk/uima-website/docs/git-conventions.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-conventions.html?rev=1869854&r1=1869853&r2=1869854&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/git-conventions.html (original)
+++ uima/site/trunk/uima-website/docs/git-conventions.html Fri Nov 15 14:44:17
2019
@@ -252,7 +252,15 @@
<p>After merging into master,
the branch is typically deleted.</p>
<h4>Branches for releasing</h4>
<p>
- These are typically named <code>rc/uimaXXXXX-x.y.z</code>.
+ When you are about to make a release, you typically will create a branch
for the release; this branch
+ will be checked out and the maven release prepare / perform will run on
it, and in the process create
+ commits to the branch updating the various "versions", first by removing
the -SNAPSHOT, and then by updating them
+ to the next SNAPSHOT version.
+ </p>
+ <p>The maven release
prepare/perform operations include "pushing" to the remote.
+ </p>
+ <p>
+ The branches used for the release work are typically named
<code>rc/uimaXXXXX-x.y.z</code>.
(rc stands for Release Candidate).
See <a target="_blank" rel="nofollow noopener"
href="git-release-notes.html">git-release-notes.hmtl</a>.
</p>
Modified: uima/site/trunk/uima-website/docs/news.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/news.html?rev=1869854&r1=1869853&r2=1869854&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/news.html (original)
+++ uima/site/trunk/uima-website/docs/news.html Fri Nov 15 14:44:17 2019
@@ -234,6 +234,13 @@
<blockquote class="sectionBody">
<table class="subsectionToc">
<tr >
+ <td>08 Nov 2019</td>
+ <td><a href='#08 Nov 2019'>
+ Apache UIMA Java SDK 3.1.1 released
+ </a>
+ </td>
+ </tr>
+ <tr >
<td>15 Aug 2019</td>
<td><a href='#15 Aug 2019'>
Apache UIMA Java SDK 3.1.0 released
@@ -784,6 +791,33 @@
<tr><td>
+
+ <a name="08 Nov 2019">
+ <h2>08 Nov 2019
+ – Apache UIMA Java SDK 3.1.1 released
+ </h2>
+ </a>
+ </td></tr>
+ <tr><td>
+ <blockquote class="subsectionBody">
+ <p>UIMA Java SDK 3.1.1 is in the 3.x.x
series of core Java UIMA SDK; see the news for 3.0.0 for important
+ information about migrating from 2.x.x versions of UIMA.
+ </p>
+ <p>Changes include:
+ <ul><li>Build updates to build from the GIT repositories, after the
uimaj project's SCM was moved
+ from SVN to GitHub.</li>
+ <li>Fixed a performance issue when running with 100's of CASes
using the same type system.</li>
+ </ul>
+ </p>
+ <p>Please see the <a
target="_blank" rel="noopener"
href="d/uimaj-3.1.1/issuesFixed/jira-report.html">
+ the complete list of issues fixed</a> for more details of the
changes.</p>
+ </blockquote>
+ </td></tr>
+ </table>
+ <table
class="subsectionTable">
+ <tr><td>
+
+
<a name="15 Aug 2019">
<h2>15 Aug 2019
Modified: uima/site/trunk/uima-website/xdocs/git-conventions.xml
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/git-conventions.xml?rev=1869854&r1=1869853&r2=1869854&view=diff
==============================================================================
--- uima/site/trunk/uima-website/xdocs/git-conventions.xml (original)
+++ uima/site/trunk/uima-website/xdocs/git-conventions.xml Fri Nov 15 14:44:17
2019
@@ -58,7 +58,15 @@ under the License.
<h4>Branches for releasing</h4>
<p>
- These are typically named <code>rc/uimaXXXXX-x.y.z</code>.
+ When you are about to make a release, you typically will create a branch
for the release; this branch
+ will be checked out and the maven release prepare / perform will run on
it, and in the process create
+ commits to the branch updating the various "versions", first by removing
the -SNAPSHOT, and then by updating them
+ to the next SNAPSHOT version.
+ </p>
+ <p>The maven release prepare/perform operations include "pushing" to the
remote.
+ </p>
+ <p>
+ The branches used for the release work are typically named
<code>rc/uimaXXXXX-x.y.z</code>.
(rc stands for Release Candidate).
See <a target="_blank" rel="nofollow noopener"
href="git-release-notes.html">git-release-notes.hmtl</a>.
Modified: uima/site/trunk/uima-website/xdocs/news.xml
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/news.xml?rev=1869854&r1=1869853&r2=1869854&view=diff
==============================================================================
--- uima/site/trunk/uima-website/xdocs/news.xml (original)
+++ uima/site/trunk/uima-website/xdocs/news.xml Fri Nov 15 14:44:17 2019
@@ -35,6 +35,21 @@
<subsectionToc/>
+ <subsection name="08 Nov 2019" date = "08 Nov 2019" title="Apache UIMA
Java SDK 3.1.1 released">
+ <p>UIMA Java SDK 3.1.1 is in the 3.x.x series of core Java UIMA SDK; see
the news for 3.0.0 for important
+ information about migrating from 2.x.x versions of UIMA.
+ </p>
+
+ <p>Changes include:
+ <ul><li>Build updates to build from the GIT repositories, after the
uimaj project's SCM was moved
+ from SVN to GitHub.</li>
+ <li>Fixed a performance issue when running with 100's of CASes
using the same type system.</li>
+ </ul>
+ </p>
+
+ <p>Please see the <a target="_blank" rel="noopener"
href="d/uimaj-3.1.1/issuesFixed/jira-report.html">
+ the complete list of issues fixed</a> for more details of the
changes.</p>
+ </subsection>
<subsection name="15 Aug 2019" date = "15 Aug 2019" title="Apache UIMA
Java SDK 3.1.0 released">
<p>UIMA Java SDK 3.1.0 is in the 3.x.x series of core Java UIMA SDK; see
the news for 3.0.0 for important
