no jira - updated versions
git-svn-id: https://svn.apache.org/repos/asf/uima/ruta/trunk@1784974 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/README b/README
index 1f762d7..da41929 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-Apache UIMA Ruta (TM) v2.5.1
+Apache UIMA Ruta (TM) v2.6.0
-------------------------------------------------------------------------
Building from the Source Distribution
diff --git a/RELEASE_NOTES.html b/RELEASE_NOTES.html
index 87ed0a6..ac5f3e0 100644
--- a/RELEASE_NOTES.html
+++ b/RELEASE_NOTES.html
@@ -21,10 +21,10 @@
-->
<head>
- <title>Apache UIMA Ruta v2.5.1 Release Notes</title>
+ <title>Apache UIMA Ruta v2.6.0 Release Notes</title>
</head>
<body>
-<h1>Apache UIMA Ruta™ v2.5.1 Release Notes</h1>
+<h1>Apache UIMA Ruta™ v2.6.0 Release Notes</h1>
<h2>Contents</h2>
<p>
@@ -50,8 +50,13 @@
<p>
<p>UIMA Ruta Language and Analysis Engine:</p>
<ul>
- <li>Typesystem descriptors with JCasGen classes are located in separate artifact</li>
+ <li>Annotation expressions can be restricted using feature matches and conditions</li>
+ <li>Several new configuration parameters for RutaEngine</li>
+ <li>Experimental features to optimize internal indexing (for experienced users)</li>
<li>Minimal support of feature structures in feature match expressions</li>
+ <li>API change report for ruta-core</li>
+ <li>Typesystem descriptors with JCasGen classes are located in separate artifact</li>
+ <li>Implementation of RutaBasic is located in separate artifact</li>
<li>Many bug fixes and improvements, especially for label expressions</li>
</ul>
<p>UIMA Ruta Workbench:</p>
@@ -60,15 +65,15 @@
<li>Improved error messages in launcher</li>
<li>Removed restriction of classpath size causing problems in launcher</li>
<li>Deactivated noVM preference</li>
+ <li>Changed UI to set annotation mode in views</li>
<li>Launcher uses project encoding</li>
<li>Bug fixes</li>
</ul>
<p>
- Although this is a bugfix release, semantic versioning indicates that this release is not
- backward compatible due to some modified public interfaces. These changes are either required for bugfixes or
- for compatibility towards UIMA version 3 and should not cause any problems when migrating.
- </p>
-
+ This release requires an update of script projects and its descriptors in the UIMA Ruta Workbench.
+ There are several ways to achieve this. The recommended way is to right-click on the UIMA Ruta project and select "UIMA Ruta -> Convert to UIMA Ruta project", which will update all provided descriptors.
+ Then, select the project and press "Project -> Clean..." in the menu, which will regenerate all descriptors of your scripts based on the new templates.
+ </p>
</p>
diff --git a/ruta-docbook/src/docbook/tools.ruta.howtos.xml b/ruta-docbook/src/docbook/tools.ruta.howtos.xml
index 9373ae5..b72f687 100644
--- a/ruta-docbook/src/docbook/tools.ruta.howtos.xml
+++ b/ruta-docbook/src/docbook/tools.ruta.howtos.xml
@@ -527,7 +527,7 @@
</para>
<programlisting><![CDATA[mvn archetype:generate -DarchetypeGroupId=org.apache.uima
- -DarchetypeArtifactId=ruta-maven-archetype -DarchetypeVersion=2.5.1
+ -DarchetypeArtifactId=ruta-maven-archetype -DarchetypeVersion=2.6.0
-DgroupId=my.domain -DartifactId=my-ruta-project]]></programlisting>
<para>
diff --git a/ruta-eclipse-update-site/pom.xml b/ruta-eclipse-update-site/pom.xml
index e021a0c..7abe27e 100644
--- a/ruta-eclipse-update-site/pom.xml
+++ b/ruta-eclipse-update-site/pom.xml
@@ -29,7 +29,7 @@
<artifactId>ruta-eclipse-update-site</artifactId>
<packaging>pom</packaging>
- <version>2.5.1</version>
+ <version>2.6.0</version>
<name>Apache UIMA Ruta Eclipse: ${project.artifactId}</name>
<description>The UIMA Ruta Eclipse update site</description>
@@ -51,8 +51,8 @@
<uimaScmProject>${project.artifactId}</uimaScmProject>
<eclipseUpdateSiteComponent>ruta</eclipseUpdateSiteComponent>
<eclipseUpdateSubSite>${project.build.directory}/eclipse-update-site/${eclipseUpdateSiteComponent}</eclipseUpdateSubSite>
- <item-maven-release-version>2.5.1</item-maven-release-version>
- <item-eclipse-release-version>2.5.1</item-eclipse-release-version>
+ <item-maven-release-version>2.6.0</item-maven-release-version>
+ <item-eclipse-release-version>2.6.0</item-eclipse-release-version>
</properties>
<build>
<pluginManagement>
