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 2011/10/06 22:50:12 UTC
svn commit: r1179845 - in /uima/uimaj/trunk: ./ PearPackagingMavenPlugin/
aggregate-uimaj-docbooks/ aggregate-uimaj-eclipse-plugins/ aggregate-uimaj/
jVinci/ uima-docbook-overview-and-setup/ uima-docbook-references/
uima-docbook-tools/ uima-docbook-tut...
Author: schor
Date: Thu Oct 6 20:50:10 2011
New Revision: 1179845
URL: http://svn.apache.org/viewvc?rev=1179845&view=rev
Log:
[UIMA-2246] Switch to 2.4.0-SNAPSHOT version. Also minor reliability improvement to a cache used in CasCreationUtils
Modified:
uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml
uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml
uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml
uima/uimaj/trunk/aggregate-uimaj/pom.xml
uima/uimaj/trunk/jVinci/pom.xml
uima/uimaj/trunk/pom.xml
uima/uimaj/trunk/uima-docbook-overview-and-setup/pom.xml
uima/uimaj/trunk/uima-docbook-references/pom.xml
uima/uimaj/trunk/uima-docbook-tools/pom.xml
uima/uimaj/trunk/uima-docbook-tutorials-and-users-guides/pom.xml
uima/uimaj/trunk/uimaj-adapter-soap/pom.xml
uima/uimaj/trunk/uimaj-adapter-vinci/pom.xml
uima/uimaj/trunk/uimaj-bootstrap/pom.xml
uima/uimaj/trunk/uimaj-component-test-util/pom.xml
uima/uimaj/trunk/uimaj-core/pom.xml
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
uima/uimaj/trunk/uimaj-cpe/pom.xml
uima/uimaj/trunk/uimaj-document-annotation/pom.xml
uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml
uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml
uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml
uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/pom.xml
uima/uimaj/trunk/uimaj-ep-cas-editor/pom.xml
uima/uimaj/trunk/uimaj-ep-configurator/pom.xml
uima/uimaj/trunk/uimaj-ep-debug/pom.xml
uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml
uima/uimaj/trunk/uimaj-ep-launcher/pom.xml
uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml
uima/uimaj/trunk/uimaj-ep-runtime/pom.xml
uima/uimaj/trunk/uimaj-examples/pom.xml
uima/uimaj/trunk/uimaj-internal-tools/pom.xml
uima/uimaj/trunk/uimaj-parent/pom.xml
uima/uimaj/trunk/uimaj-test-util/pom.xml
uima/uimaj/trunk/uimaj-tools/pom.xml
Modified: uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml (original)
+++ uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>PearPackagingMavenPlugin</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>UIMA Maven Plugin ${project.artifactId}</name>
<description>This is a maven plugin that produces a pear artifact.</description>
Modified: uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml (original)
+++ uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>aggregate-uimaj-docbooks</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Aggregate POM ${project.artifactId}: UIMA Base</name>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml (original)
+++ uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>aggregate-uimaj-eclipse-plugins</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Aggregate: ${project.artifactId}</name>
<description>The aggregate for building the Eclipse plugins
that are part of the base UIMA framework</description>
Modified: uima/uimaj/trunk/aggregate-uimaj/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/aggregate-uimaj/pom.xml (original)
+++ uima/uimaj/trunk/aggregate-uimaj/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>aggregate-uimaj</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Aggregate: ${project.artifactId}: UIMA Base</name>
<description>The aggregate for the base UIMA framework build and release</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/trunk/jVinci/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/jVinci/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/jVinci/pom.xml (original)
+++ uima/uimaj/trunk/jVinci/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>jVinci</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Base: ${project.artifactId}: Vinci Transport Library</name>
<description>This is a non-standard protocol for higher efficiency than
SOAP, used by the base UIMA Collection processing manager for supporting
Modified: uima/uimaj/trunk/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/pom.xml (original)
+++ uima/uimaj/trunk/pom.xml Thu Oct 6 20:50:10 2011
@@ -29,13 +29,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Java SDK: ${project.artifactId}</name>
<description>The top project for the uimaj SDK</description>
<url>${uimaWebsiteUrl}</url>
@@ -62,7 +62,7 @@
<properties>
<uimaScmProject>${project.artifactId}</uimaScmProject>
- <jiraVersion>12315996</jiraVersion> <!-- for 2.3.2SDK -->
+ <jiraVersion>12315996</jiraVersion> <!-- for 2.4.0SDK -->
<assemblyFinalName>uimaj-${project.version}</assemblyFinalName>
<postNoticeText>${ibmNoticeText}</postNoticeText>
</properties>
Modified: uima/uimaj/trunk/uima-docbook-overview-and-setup/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uima-docbook-overview-and-setup/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uima-docbook-overview-and-setup/pom.xml (original)
+++ uima/uimaj/trunk/uima-docbook-overview-and-setup/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-docbook-overview-and-setup</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>Apache UIMA SDK Documentation - overview and setup</name>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/trunk/uima-docbook-references/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uima-docbook-references/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uima-docbook-references/pom.xml (original)
+++ uima/uimaj/trunk/uima-docbook-references/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-docbook-references</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>Apache UIMA SDK Documentation - references</name>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/trunk/uima-docbook-tools/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uima-docbook-tools/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uima-docbook-tools/pom.xml (original)
+++ uima/uimaj/trunk/uima-docbook-tools/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-docbook-tools</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>Apache UIMA SDK Documentation - tools</name>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/trunk/uima-docbook-tutorials-and-users-guides/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uima-docbook-tutorials-and-users-guides/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uima-docbook-tutorials-and-users-guides/pom.xml (original)
+++ uima/uimaj/trunk/uima-docbook-tutorials-and-users-guides/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-docbook-tutorials-and-users-guides</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>Apache UIMA SDK Documentation - tutorials and user's guides</name>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/trunk/uimaj-adapter-soap/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-adapter-soap/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-adapter-soap/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-adapter-soap/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-adapter-soap</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Base: ${project.artifactId}: SOAP Adapter</name>
<description>Provides the capability to connect to a remote
component, using the SOAP protocol</description>
Modified: uima/uimaj/trunk/uimaj-adapter-vinci/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-adapter-vinci/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-adapter-vinci/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-adapter-vinci/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-adapter-vinci</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Base: ${project.artifactId}: Vinci Adapter</name>
<description>Provides the capability to connect to a remote analysis
engine, using the Vinci protocol</description>
Modified: uima/uimaj/trunk/uimaj-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-bootstrap/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-bootstrap/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-bootstrap/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-bootstrap</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Base: ${project.artifactId}: Bootstrap launcher</name>
<description>Configures a classpath from directories, and runs
a Java application using that</description>
Modified: uima/uimaj/trunk/uimaj-component-test-util/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-component-test-util/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-component-test-util/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-component-test-util/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-component-test-util</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Base: ${project.artifactId}: for JUnit</name>
<description>Supporting utilities used in various JUnit tests</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/trunk/uimaj-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-core/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-core</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Base: ${project.artifactId}</name>
<description>The core implementation of the UIMA Java Framework</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java Thu Oct 6 20:50:10 2011
@@ -1784,6 +1784,7 @@ public class CasCreationUtils {
System.err.format("GetMetaDataCache: cleanup task terminating, cache empty%n");
}
cancel();
+ cleanupTimer.cancel(); // probably not needed, but for safety ...
cleanupTimer = null;
}
if (cacheDebug) {
@@ -1792,7 +1793,7 @@ public class CasCreationUtils {
}
}
};
- cleanupTimer.scheduleAtFixedRate(metaDataCacheCleanupTask, HOLD_TIME, HOLD_TIME);
+ cleanupTimer.schedule(metaDataCacheCleanupTask, HOLD_TIME, HOLD_TIME);
}
}
}
Modified: uima/uimaj/trunk/uimaj-cpe/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-cpe/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-cpe/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-cpe/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-cpe</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Base: ${project.artifactId}: Collection Processing Engine</name>
<description>The implementation of a simple scaleout capability, called
the Collection Processing Engine. New implementations may find
Modified: uima/uimaj/trunk/uimaj-document-annotation/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-document-annotation/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-document-annotation/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-document-annotation/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-document-annotation</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Base: ${project.artifactId}</name>
<description>A common, but not built-in, type in the type system,
specifying the language of a document</description>
Modified: uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-eclipse-feature-runtime</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Eclipse: ${project.artifactId}</name>
<description>UIMA Eclipse Plugin Feature that
Modified: uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-eclipse-feature-tools</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Eclipse: ${project.artifactId}</name>
<description>UIMA Eclipse Plugin Feature for base uima tooling</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml Thu Oct 6 20:50:10 2011
@@ -59,8 +59,8 @@
<uimaScmRoot>uimaj</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<eclipseUpdateSite>${project.build.directory}/eclipse-update-site</eclipseUpdateSite>
- <item-maven-release-version>2.3.1</item-maven-release-version>
- <item-eclipse-release-version>2.3.1</item-eclipse-release-version>
+ <item-maven-release-version>2.4.0</item-maven-release-version>
+ <item-eclipse-release-version>2.4.0</item-eclipse-release-version>
</properties>
<!-- don't use dependency mechanism - use dependency:copy
Modified: uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml Thu Oct 6 20:50:10 2011
@@ -25,13 +25,22 @@
</description>
<!-- keep old features listed here - to permit the update site to provide the older features -->
+ <feature url="features/org.apache.uima.tools_2.4.0.jar" id="org.apache.uima.tools" version="2.4.0">
+ <category name="uima-tooling-and-runtimes"/>
+ </feature>
+ <feature url="features/org.apache.uima.runtime_2.4.0.jar" id="org.apache.uima.runtime" version="2.4.0">
+ <category name="uima-tooling-and-runtimes"/>
+ </feature>
+ <feature url="features/org.apache.uima.as.deployeditor_2.4.0.jar" id="org.apache.uima.as.deployeditor" version="2.4.0">
+ <category name="uima-as-tooling"/>
+ </feature>
+
<feature url="features/org.apache.uima.tools_2.3.1.jar" id="org.apache.uima.tools" version="2.3.1">
<category name="uima-tooling-and-runtimes"/>
</feature>
<feature url="features/org.apache.uima.runtime_2.3.1.jar" id="org.apache.uima.runtime" version="2.3.1">
<category name="uima-tooling-and-runtimes"/>
</feature>
- <!-- next feature not yet ready -->
<feature url="features/org.apache.uima.as.deployeditor_2.3.1.jar" id="org.apache.uima.as.deployeditor" version="2.3.1">
<category name="uima-as-tooling"/>
</feature>
Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-cas-editor-ide</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>UIMA Eclipse: ${project.artifactId}</name>
<description>Allows editing the contents of a saved CAS</description>
Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-cas-editor</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>UIMA Eclipse: ${project.artifactId}</name>
<description>Allows editing the contents of a saved CAS</description>
Modified: uima/uimaj/trunk/uimaj-ep-configurator/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-configurator/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-configurator/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-configurator/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-configurator</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>UIMA Eclipse: ${project.artifactId}: Descriptor Editor</name>
<description>A frame-based editor for most of the UIMA XML
Modified: uima/uimaj/trunk/uimaj-ep-debug/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-debug/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-debug/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-debug/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-debug</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>UIMA Eclipse: ${project.artifactId}</name>
<!-- continuation lines need to start in col 1 else manifest has extra blanks -->
Modified: uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-jcasgen</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Eclipse: ${project.artifactId}</name>
<description>Provides a connection to the JCasGen tooling, for
the Component Descriptor Editor</description>
Modified: uima/uimaj/trunk/uimaj-ep-launcher/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-launcher/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-launcher/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-launcher/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-launcher</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>UIMA Eclipse: ${project.artifactId}</name>
<!-- continuation lines need to start in col 1 else manifest has extra blanks -->
Modified: uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-pear-packager</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>UIMA Eclipse: ${project.artifactId}</name>
<description>Provides an Eclipse Wizard to construct
Modified: uima/uimaj/trunk/uimaj-ep-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-runtime/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-runtime/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-runtime/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-runtime</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>jar</packaging> <!-- can't be bundle because it doesn't handle property substitution -->
<name>UIMA Eclipse: ${project.artifactId}</name>
<description>Provides the core UIMA Framework to other Eclipse
Modified: uima/uimaj/trunk/uimaj-examples/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-examples/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-examples/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-examples/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-examples</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Base: ${project.artifactId}: SDK Examples</name>
<description>Examples and sample code</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/trunk/uimaj-internal-tools/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-internal-tools/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-internal-tools/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-internal-tools/pom.xml Thu Oct 6 20:50:10 2011
@@ -31,7 +31,7 @@
<artifactId>uimaj-internal-tools</artifactId>
<packaging>jar</packaging>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Base: ${project.artifactId}: internal Tools</name>
<description>Internal tooling for developing UIMA,
not a part of normal distributions.</description>
Modified: uima/uimaj/trunk/uimaj-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-parent/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-parent/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-parent/pom.xml Thu Oct 6 20:50:10 2011
@@ -38,7 +38,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Java SDK: ${project.artifactId}</name>
<description>The common parent pom for the uimaj SDK</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/trunk/uimaj-test-util/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-test-util/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-test-util/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-test-util/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Base: ${project.artifactId}: JUnit utilities</name>
<description>Utilities for testing UIMA</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/trunk/uimaj-tools/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/pom.xml?rev=1179845&r1=1179844&r2=1179845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-tools/pom.xml Thu Oct 6 20:50:10 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uimaj-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-tools</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA Base: ${project.artifactId}: Tools</name>
<description>Tooling supporting UIMA use</description>
<url>${uimaWebsiteUrl}</url>