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:53:32 UTC
svn commit: r1179848 - in /uima/uima-as/trunk:
aggregate-uima-as-eclipse-plugins/ aggregate-uima-as/ uima-as-docbooks/
uima-as-parent/ uima-as/ uima-as/src/main/assembly/ uimaj-as-activemq/
uimaj-as-activemq/src/main/java/org/apache/uima/examples/as/ u...
Author: schor
Date: Thu Oct 6 20:53:32 2011
New Revision: 1179848
URL: http://svn.apache.org/viewvc?rev=1179848&view=rev
Log:
[UIMA-2246] Switch to 2.4.0-SNAPSHOT version. Also some updates to bin assembly per comments in the source. Also some updates for next version of Eclipse plugins - versions
Modified:
uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
uima/uima-as/trunk/aggregate-uima-as/pom.xml
uima/uima-as/trunk/uima-as-docbooks/pom.xml
uima/uima-as/trunk/uima-as-parent/pom.xml
uima/uima-as/trunk/uima-as/pom.xml
uima/uima-as/trunk/uima-as/src/main/assembly/bin.xml
uima/uima-as/trunk/uimaj-as-activemq/pom.xml
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/examples/as/GetMetaRequest.java
uima/uima-as/trunk/uimaj-as-camel/pom.xml
uima/uima-as/trunk/uimaj-as-core/pom.xml
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/DeploymentDescriptorFactory.java
uima/uima-as/trunk/uimaj-as-jms/pom.xml
uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml
uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml
Modified: uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml Thu Oct 6 20:53:32 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>aggregate-uima-as-eclipse-plugins</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA-AS Aggregate: ${project.artifactId}</name>
<description>The aggregate for building the Eclipse plugins
that are part of the UIMA-AS framework</description>
Modified: uima/uima-as/trunk/aggregate-uima-as/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/aggregate-uima-as/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as/pom.xml Thu Oct 6 20:53:32 2011
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>aggregate-uima-as</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA-AS Aggregate: ${project.artifactId}</name>
<description>The aggregate for building the uima-as functionality,
the eclipse plugins, and the docbooks
Modified: uima/uima-as/trunk/uima-as-docbooks/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-docbooks/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-docbooks/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-docbooks/pom.xml Thu Oct 6 20:53:32 2011
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-as-docbooks</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uima-as/trunk/uima-as-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-parent/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Thu Oct 6 20:53:32 2011
@@ -38,7 +38,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<description>The common parent pom for uima-as</description>
<url>${uimaWebsiteUrl}</url>
@@ -123,7 +123,7 @@
<uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<!-- level of uimaj sdk this release depends on -->
- <uimajDependencyVersion>2.3.1</uimajDependencyVersion>
+ <uimajDependencyVersion>2.4.0-SNAPSHOT</uimajDependencyVersion>
</properties>
<profiles>
Modified: uima/uima-as/trunk/uima-as/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as/pom.xml (original)
+++ uima/uima-as/trunk/uima-as/pom.xml Thu Oct 6 20:53:32 2011
@@ -28,13 +28,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-as</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<description>The top project for UIMA-AS</description>
<url>${uimaWebsiteUrl}</url>
@@ -60,7 +60,7 @@
</scm>
<properties>
- <jiraVersion>12315335</jiraVersion> <!-- for 2.3.1AS -->
+ <jiraVersion>12316312</jiraVersion> <!-- for 2.4.0AS -->
<uimaScmProject>${project.artifactId}</uimaScmProject>
<assemblyFinalName>uima-as-${project.version}</assemblyFinalName>
</properties>
@@ -70,7 +70,7 @@
<!-- uima base -->
<dependency>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-distr</artifactId>
+ <artifactId>uimaj</artifactId>
<type>zip</type>
<classifier>bin</classifier>
<version>${uimajDependencyVersion}</version>
@@ -338,7 +338,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-distr</artifactId>
+ <artifactId>uimaj</artifactId>
<version>${uimajDependencyVersion}</version>
<type>zip</type>
<classifier>bin</classifier>
Modified: uima/uima-as/trunk/uima-as/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as/src/main/assembly/bin.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as/src/main/assembly/bin.xml (original)
+++ uima/uima-as/trunk/uima-as/src/main/assembly/bin.xml Thu Oct 6 20:53:32 2011
@@ -150,7 +150,7 @@ under the License.
include changes to the Collection Reader made after base release 2.3.1
-->
<excludes>
- <exclude>descriptors/collection_reader/FileSystemCollectionReader.xml</exclude>
+ <!-- exclude>descriptors/collection_reader/FileSystemCollectionReader.xml</exclude-->
<!-- These ought to be excluded always. We need UIMA AS versions of these
from eclipseProject folder under uima-as -->
<exclude>.classpath</exclude>
@@ -396,11 +396,11 @@ under the License.
is a change made to the CollectionReader descriptor to fix a missing Language
parameter value. The change was made after the base was released.
-->
- <file>
+ <!-- file>
<source>../uimaj-as-activemq/src/test/resources/descriptors/collection_reader/FileSystemCollectionReader.xml</source>
<outputDirectory>examples/descriptors/collection_reader</outputDirectory>
<fileMode>644</fileMode>
- </file>
+ </file-->
<!-- put readme file with altered name at the top level -->
<!-- file>
Modified: uima/uima-as/trunk/uimaj-as-activemq/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/pom.xml Thu Oct 6 20:53:32 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-activemq</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<description>UIMA-AS ActiveMQ incorporation</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/examples/as/GetMetaRequest.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/examples/as/GetMetaRequest.java?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/examples/as/GetMetaRequest.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/examples/as/GetMetaRequest.java Thu Oct 6 20:53:32 2011
@@ -24,7 +24,6 @@ import java.util.HashSet;
import java.util.Set;
import javax.jms.Connection;
-import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Queue;
Modified: uima/uima-as/trunk/uimaj-as-camel/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-camel/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-camel/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-camel/pom.xml Thu Oct 6 20:53:32 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-camel</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<description>Apache UIMA-AS Camel Driver</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uima-as/trunk/uimaj-as-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-core/pom.xml Thu Oct 6 20:53:32 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/DeploymentDescriptorFactory.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/DeploymentDescriptorFactory.java?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/DeploymentDescriptorFactory.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/DeploymentDescriptorFactory.java Thu Oct 6 20:53:32 2011
@@ -301,7 +301,7 @@ public static RemoteDelegateConfiguratio
ServiceContext aggregateContext =
new ServiceContextImpl("Aggregate Annotator",
"Aggregate Annotator that does nothing",
- "C:/uima/releases/apache-uima-as-2.3.1/examples/descriptors/tutorial/ex4/MeetingDetectorTAE.xml",
+ "C:/uima/releases/apache-uima-as-2.4.0/examples/descriptors/tutorial/ex4/MeetingDetectorTAE.xml",
"AggregateQueue");
try {
UimaASAggregateDeploymentDescriptor dd =
Modified: uima/uima-as/trunk/uimaj-as-jms/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-jms/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-jms/pom.xml Thu Oct 6 20:53:32 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-jms</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml Thu Oct 6 20:53:32 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-osgi-runtime</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA AS: ${project.artifactId}</name>
<description>Apache UIMA AS runtime code packaged for osgi use</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml Thu Oct 6 20:53:32 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-eclipse-feature-deployeditor</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 the uima-as deploy editor</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml (original)
+++ uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml Thu Oct 6 20:53:32 2011
@@ -57,8 +57,8 @@ under the License.
</url>
<requires>
- <import plugin="org.apache.uima.runtime" version="2.3.1" match="greaterOrEqual"/>
- <import plugin="org.apache.uima.desceditor" version="2.3.1" match="greaterOrEqual"/>
+ <import plugin="org.apache.uima.runtime" version="2.4.0" match="greaterOrEqual"/>
+ <import plugin="org.apache.uima.desceditor" version="2.4.0" match="greaterOrEqual"/>
</requires>
<plugin
Modified: uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml Thu Oct 6 20:53:32 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-deployeditor</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA-AS Eclipse Plugin: ${project.artifactId}</name>
<description>Extension to the Component Descriptor Editor supporting editing UIMA-AS deployment descriptors</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml?rev=1179848&r1=1179847&r2=1179848&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml Thu Oct 6 20:53:32 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-runtime-deployeditor</artifactId>
<packaging>jar</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>UIMA-AS Eclipse Plugin: ${project.artifactId}</name>
<description>Bundles the uima-as runtime parts needed for the deploy editor extension to the CDE, as a fragment on top of the main uima runtime</description>
<url>${uimaWebsiteUrl}</url>
@@ -106,7 +106,7 @@
<!-- Uncomment Line below for the actual release -->
<!-- Fragment-Host>org.apache.uima.runtime;bundle-version="${parsedVersion.osgiVersion}"</Fragment-Host -->
<!-- Remove below line for the actual release -->
- <Fragment-Host>org.apache.uima.runtime;bundle-version="2.3.1"</Fragment-Host>
+ <Fragment-Host>org.apache.uima.runtime;bundle-version="2.4.0.SNAPSHOT"</Fragment-Host>
</instructions>
</configuration>
</plugin>