You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2014/06/04 23:48:19 UTC
svn commit: r1600515 - in /uima/uimafit/trunk: ./ README pom.xml
uimafit-legacy-support/pom.xml uimafit-parent/pom.xml
Author: rec
Date: Wed Jun 4 21:48:18 2014
New Revision: 1600515
URL: http://svn.apache.org/r1600515
Log:
[UIMA-3845] Prepare for release version 2.1.0
- Update jiraVersion property
- Update to UIMA parent pom 9
- Comment out snapshot repositories used while depending on UIMA 2.6.0-SNAPSHOT
- Fix rat excludes in legacy module
- Update README
Modified:
uima/uimafit/trunk/ (props changed)
uima/uimafit/trunk/README
uima/uimafit/trunk/pom.xml
uima/uimafit/trunk/uimafit-legacy-support/pom.xml
uima/uimafit/trunk/uimafit-parent/pom.xml
Propchange: uima/uimafit/trunk/
------------------------------------------------------------------------------
Merged /uima/uimafit/branches/2.1.x:r1599358-1599368
Modified: uima/uimafit/trunk/README
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/README?rev=1600515&r1=1600514&r2=1600515&view=diff
==============================================================================
--- uima/uimafit/trunk/README (original)
+++ uima/uimafit/trunk/README Wed Jun 4 21:48:18 2014
@@ -1,5 +1,5 @@
- Apache uimaFIT (TM) v2.0.0
+ Apache uimaFIT (TM) v2.1.0
--------------------------
@@ -16,7 +16,8 @@ following list highlights some of the fe
* Factories: simplify instantiating UIMA components programmatically without descriptor files.
For example, to instantiate an AnalysisEngine a call like this could be made:
- AnalysisEngineFactory.createPrimitive(MyAEImpl.class, myTypeSystem, paramName, paramValue)
+
+ AnalysisEngineFactory.createEngine(MyAEImpl.class, myTypeSystem, paramName, paramValue, ...)
* Injection: handles the binding of configuration parameter values to the corresponding member
variables in the analysis engines and handles the binding of external resources. For example,
@@ -36,26 +37,27 @@ following list highlights some of the fe
SimplePipeline.runPipeline(reader, ae1, ..., aeN, consumer1, ... consumerN)
-What's New in 2.0.0
+What's New in 2.1.0
-------------------
-uimaFIT 2.0.0 is the first Apache release. The migration to Apache has been used to address several
-incompatible changes since 1.x.x. Please refer to the Migration Guide section in the reference
-manual for further details.
+uimaFIT 2.1.0 is a bugfix release to uimaFIT 2.0.0. The reason that the minor version was increased
+instead of the bugfix version is, that uima 2.1.0 requires Java 6 and uses UIMA 2.6.0. Otherwise,
+this version should serve as a drop-in replacement for uimaFIT 2.0.0.
A full list of issues addressed in this release can be found on the Apache issue tracker:
- https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310570&version=12323969
+ https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310570&version=12324978
Supported Platforms
-------------------
-uimaFIT requires Java 1.5 or higher, UIMA 2.4.2 or higher, and the Spring Framework 3.1.2 or higher.
+
+uimaFIT requires Java 1.6 or higher, UIMA 2.6.0 or higher, and the Spring Framework 3.1.2 or higher.
Availability
------------
-uimaFIT is licensed with Apache Software License 2.0 and is available from the Apache UIMA project:
+uimaFIT is licensed under the Apache License 2.0 and is available from the Apache UIMA project:
http://uima.apache.org
http://svn.apache.org/repos/asf/uima/uimafit
@@ -66,7 +68,7 @@ add uimaFIT as a dependency to your pom.
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-core</artifactId>
- <version>2.0.0</version>
+ <version>2.1.0</version>
</dependency>
@@ -77,9 +79,9 @@ uimafit-core - the main uimaFI
uimafit-cpe - support for the Collection Processing Engine (multi-threaded pipelines)
uimafit-maven - a Maven plugin to automatically enhance UIMA components with uimaFIT
metadata and to generate XML descriptors for uimaFIT-enabled components.
-uimafit-legacy-support - allows uimaFIT 2.0.0 to use uimaFIT 1.4.x meta data like Java annotations
+uimafit-legacy-support - allows uimaFIT 2.x.0 to use uimaFIT 1.4.x meta data like Java annotations
and META-INF/org.uimafit/types.txt files. Pipelines mixing uimaFIT 1.4.x
- and 2.x componens MUST be created using the 2.x factories, because the
+ and 2.x components MUST be created using the 2.x factories, because the
1.4.x factories will NOT understand how to handle uimaFIT 2.x components
or auto-configuration.
uimafit-spring - an experimental module serving as a proof-of-concept for the integration of
@@ -88,7 +90,7 @@ uimafit-spring - an experimental
passes all components created by UIMA through Spring to provide for the
wiring of Spring context dependencies. This module is made available for
the adventurous but currently not considered stable, finished, or even a
- proper part of the ackage. E.g. it is not included in the binary
+ proper part of the package. E.g. it is not included in the binary
distribution package.
Modified: uima/uimafit/trunk/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/pom.xml?rev=1600515&r1=1600514&r2=1600515&view=diff
==============================================================================
--- uima/uimafit/trunk/pom.xml (original)
+++ uima/uimafit/trunk/pom.xml Wed Jun 4 21:48:18 2014
@@ -32,7 +32,7 @@
<relativePath>uimafit-parent</relativePath>
</parent>
<properties>
- <jiraVersion>12323969</jiraVersion>
+ <jiraVersion>12324978</jiraVersion>
</properties>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/uima/uimafit/trunk/</connection>
Modified: uima/uimafit/trunk/uimafit-legacy-support/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-legacy-support/pom.xml?rev=1600515&r1=1600514&r2=1600515&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-legacy-support/pom.xml (original)
+++ uima/uimafit/trunk/uimafit-legacy-support/pom.xml Wed Jun 4 21:48:18 2014
@@ -124,8 +124,8 @@
<exclude>RELEASE_NOTES*</exclude>
<exclude>issuesFixed/**</exclude>
<!-- These test files are unreasonable to bear a license header -->
- <exclude>src/test/resources/data/docs/unix-newlines.txt</exclude>
- <exclude>src/test/resources/data/docs/windows-newlines.txt</exclude>
+ <exclude>src/test/resources/data/docs/unix-newlines.txt.bin</exclude>
+ <exclude>src/test/resources/data/docs/windows-newlines.txt.bin</exclude>
<exclude>src/test/resources/data/docs/bad.xcas</exclude>
<exclude>src/test/resources/data/docs/test.xcas</exclude>
<exclude>src/test/resources/data/docs/test.xmi</exclude>
Modified: uima/uimafit/trunk/uimafit-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-parent/pom.xml?rev=1600515&r1=1600514&r2=1600515&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-parent/pom.xml (original)
+++ uima/uimafit/trunk/uimafit-parent/pom.xml Wed Jun 4 21:48:18 2014
@@ -20,7 +20,6 @@
</properties>
<!--
- Only required while uimaFIT depends on unreleased versions of UIMA.
- -->
<repositories>
<repository>
<id>apache.snapshots</id>
@@ -30,18 +29,7 @@
<enabled>false</enabled>
</releases>
</repository>
- <!--
- <repository>
- <id>apache.rc</id>
- <name>UIMA 2.6.0 release candidate</name>
- <url>https://repository.apache.org/content/repositories/orgapacheuima-1017/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- -->
</repositories>
-
<pluginRepositories>
<pluginRepository>
<id>apache.snapshots.plugins</id>
@@ -57,24 +45,9 @@
<updatePolicy>never</updatePolicy>
</snapshots>
</pluginRepository>
- <!--
- <pluginRepository>
- <id>apache.rc.plugins</id>
- <name>UIMA 2.6.0 release candidate - Maven plugins</name>
- <url>https://repository.apache.org/content/repositories/orgapacheuima-1017/</url>
- <layout>default</layout>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <checksumPolicy>fail</checksumPolicy>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- -->
</pluginRepositories>
-
+ -->
+
<dependencies>
<dependency>
<groupId>junit</groupId>