Author: cwiklik
Date: Fri Jan 28 15:47:06 2011
New Revision: 1064740
URL: http://svn.apache.org/viewvc?rev=1064740&view=rev
Log:
UIMA-2010 rollback for RC4
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-distr/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/uimaj-as-activemq/pom.xml
uima/uima-as/trunk/uimaj-as-camel/pom.xml
uima/uima-as/trunk/uimaj-as-core/pom.xml
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-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=1064740&r1=1064739&r2=1064740&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 Fri Jan 28
15:47:06 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-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.3.1-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=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/aggregate-uima-as/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as/pom.xml Fri Jan 28 15:47:06 2011
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-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.3.1-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-distr/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-distr/pom.xml?rev=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-distr/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-distr/pom.xml Fri Jan 28 15:47:06 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-as-distr</artifactId>
<packaging>pom</packaging>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<description>Build and release UIMA-AS</description>
<url>${uimaWebsiteUrl}</url>
@@ -226,11 +226,11 @@
<version>5.4.1</version>
</dependency>
-<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>kahadb</artifactId>
- <version>5.4.1</version>
-</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>kahadb</artifactId>
+ <version>5.4.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -259,24 +259,6 @@
<version>7.0.1.v20091125</version>
</dependency>
- <!-- dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.0.1</version>
- </dependency -->
-<!-- dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>7.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- <version>6.0.1</version>
- </dependency -->
-
-
<dependency>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
@@ -288,30 +270,6 @@
<artifactId>xstream</artifactId>
<version>1.3.1</version>
</dependency>
-<!-- dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-console</artifactId>
- <version>4.1.1</version>
- </dependency -->
- <!-- next dependency has gone missing as of Nov 2010 (maybe earlier)
- remove - it's not used - to allow building -->
- <!--dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activeio-core</artifactId>
- <version>3.0.0-incubator</version>
- </dependency-->
-
- <!-- dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>2.1</version>
- </dependency -->
-
- <!-- dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- <version>2.1.1</version>
- </dependency-->
<!-- lib/optional -->
@@ -333,42 +291,12 @@
<version>2.0.0</version>
</dependency>
- <!-- dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- <version>1.0</version>
- </dependency-->
-
- <!-- dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jmdns</artifactId>
- <version>1.0-5.4.1</version>
- </dependency -->
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>
- <!--dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- <version>2.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-tools</artifactId>
- <version>2.1.1</version>
- </dependency-->
-
- <!-- dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.1.0</version>
- </dependency -->
-
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
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=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-docbooks/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-docbooks/pom.xml Fri Jan 28 15:47:06 2011
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-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.3.1-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=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Fri Jan 28 15:47:06 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.3.1-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<description>The common parent pom for uima-as</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uima-as/trunk/uima-as/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as/pom.xml?rev=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as/pom.xml (original)
+++ uima/uima-as/trunk/uima-as/pom.xml Fri Jan 28 15:47:06 2011
@@ -28,13 +28,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-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.3.1-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<description>The top project for UIMA-AS</description>
<url>${uimaWebsiteUrl}</url>
@@ -503,19 +503,8 @@
</execution>
</executions>
</plugin>
-
- </plugins>
- </build>
- </profile>
-
-
- <profile>
- <id>apache-release</id>
-
- <build>
<!-- Run jira report -->
<!-- depends on having -DjiraVersion set -->
- <plugins>
<plugin>
<artifactId>maven-changes-plugin</artifactId>
<executions>
@@ -527,7 +516,8 @@
</execution>
</executions>
</plugin>
- </plugins>
+
+ </plugins>
</build>
</profile>
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=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/pom.xml Fri Jan 28 15:47:06 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-activemq</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<description>UIMA-AS ActiveMQ incorporation</description>
<url>${uimaWebsiteUrl}</url>
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=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-camel/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-camel/pom.xml Fri Jan 28 15:47:06 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-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.3.1-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=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-core/pom.xml Fri Jan 28 15:47:06 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-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.3.1-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<url>${uimaWebsiteUrl}</url>
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=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-jms/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-jms/pom.xml Fri Jan 28 15:47:06 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-jms</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-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=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml Fri Jan 28 15:47:06 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-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.3.1-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=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml Fri Jan 28
15:47:06 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-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.3.1-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-ep-deployeditor/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml?rev=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml Fri Jan 28 15:47:06 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-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.3.1-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=1064740&r1=1064739&r2=1064740&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml Fri Jan 28
15:47:06 2011
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <version>2.3.1-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.3.1-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>
