Author: cwiklik
Date: Tue Dec 8 21:16:27 2015
New Revision: 1718706
URL: http://svn.apache.org/viewvc?rev=1718706&view=rev
Log:
UIMA-4703 update poms for 2.8.1 release
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/pom.xml
uima/uima-as/trunk/src/main/assembly/bin.xml
uima/uima-as/trunk/uima-as-docbooks/pom.xml
uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml
uima/uima-as/trunk/uima-as-parent/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=1718706&r1=1718705&r2=1718706&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 Tue Dec 8
21:16:27 2015
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>aggregate-uima-as-eclipse-plugins</artifactId>
<packaging>pom</packaging>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache 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=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/aggregate-uima-as/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as/pom.xml Tue Dec 8 21:16:27 2015
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>aggregate-uima-as</artifactId>
<packaging>pom</packaging>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache 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/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/pom.xml?rev=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/pom.xml (original)
+++ uima/uima-as/trunk/pom.xml Tue Dec 8 21:16:27 2015
@@ -28,13 +28,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<relativePath>uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-as</artifactId>
<packaging>pom</packaging>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<description>The top project for UIMA-AS</description>
<url>${uimaWebsiteUrl}</url>
@@ -60,7 +60,7 @@
</scm>
<properties>
- <jiraVersion>12325591</jiraVersion> <!-- for 2.4.0AS -->
+ <jiraVersion>12327044</jiraVersion> <!-- for 2.8.1AS -->
<uimaScmProject>${project.artifactId}</uimaScmProject>
<assemblyFinalName>uima-as-${project.version}</assemblyFinalName>
@@ -121,10 +121,10 @@
</dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
+<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+</dependency>
<!--
Active MQ Stuff
@@ -135,7 +135,7 @@
<artifactId>activemq-jaas</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-web</artifactId>
<exclusions>
@@ -148,14 +148,14 @@
<groupId>org.fusesource.mqtt-client</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-spring</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-optional</artifactId>
<exclusions>
@@ -164,11 +164,11 @@
<artifactId>axis</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>kahadb</artifactId>
+ <artifactId>activemq-kahadb-store</artifactId>
</dependency>
<dependency>
@@ -183,7 +183,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<dependency>
Modified: uima/uima-as/trunk/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/assembly/bin.xml?rev=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/src/main/assembly/bin.xml (original)
+++ uima/uima-as/trunk/src/main/assembly/bin.xml Tue Dec 8 21:16:27 2015
@@ -47,7 +47,7 @@
<!-- UIMA-AS included other projects -->
- <dependencySet>
+ <!--dependencySet>
<includes>
<include>org.apache.activemq:activemq-all</include>
</includes>
@@ -56,23 +56,26 @@
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
- </dependencySet>
+ </dependencySet-->
<dependencySet>
<includes>
<include>commons-logging:commons-logging</include>
<include>org.springframework:spring-core</include>
-
<include>org.apache.activemq:activemq-camel</include>
- <include>org.apache.activemq:kahadb</include>
+
+
<include>org.apache.activemq:activemq-kahadb-store</include>
<include>org.apache.activemq:activemq-console</include>
-
<include>org.apache.activemq:activemq-core</include>
+
<include>org.apache.activemq:activemq-client</include>
+
<include>org.apache.activemq:activemq-jaas</include>
+
<include>org.apache.activemq:activemq-http</include>
+
<include>org.apache.activemq:activemq-broker</include>
<include>org.apache.activemq:activemq-spring</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec
</include>
-
<include>org.springframework:spring-asm</include>
+
<!--include>org.springframework:spring-asm</include-->
<include>org.springframework:spring-aop</include>
<include>org.springframework:spring-context</include>
<include>org.springframework:spring-tx</include>
@@ -80,10 +83,11 @@
<include>org.springframework:spring-expression</include>
<include>org.springframework:spring-jms</include>
<include>org.apache.xbean:xbean-spring</include>
-
<include>org.apache.activemq:activemq-optional</include>
+
<!--include>org.apache.activemq:activemq-optional</include-->
<include>org.slf4j:slf4j-log4j12</include>
<include>org.slf4j:jcl-over-slf4j</include>
<include>org.slf4j:slf4j-api</include>
+
<include>org.fusesource.hawtbuf:hawtbuf</include>
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
<outputDirectory>apache-activemq/lib</outputDirectory>
@@ -96,12 +100,11 @@
<dependencySet>
<includes>
<include>commons-codec:commons-codec</include>
-
<include>commons-httpclient:commons-httpclient</include>
+
<!--include>commons-httpclient:commons-httpclient</include-->
<include>org.eclipse.jetty.aggregate:jetty-all-server</include>
<include>com.thoughtworks.xstream:xstream</include>
<include>xmlpull:xmlpull</include>
-
<include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec
- </include>
+
<include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
<include>log4j:log4j</include>
<include>xpp3:xpp3</include>
<include>org.apache.httpcomponents:httpclient</include>
@@ -366,7 +369,7 @@
</fileSet -->
<fileSet>
-
<directory>target/apache-activemq-linux/apache-activemq-5.7.0</directory>
+
<directory>target/apache-activemq-linux/apache-activemq-${org.apache.activemq.version}</directory>
<outputDirectory>apache-activemq</outputDirectory>
<includes>
<include>bin/*</include>
@@ -404,7 +407,7 @@
</fileSet -->
<fileSet>
-
<directory>target/apache-activemq-win/apache-activemq-5.7.0</directory>
+
<directory>target/apache-activemq-win/apache-activemq-${org.apache.activemq.version}</directory>
<outputDirectory>apache-activemq</outputDirectory>
<includes>
<include>bin/*</include>
@@ -485,7 +488,6 @@
</file>
-
<file>
<source>src/main/config/activemq-nojournal.xml</source>
<outputDirectory>apache-activemq/conf</outputDirectory>
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=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-docbooks/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-docbooks/pom.xml Tue Dec 8 21:16:27 2015
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-as-docbooks</artifactId>
<packaging>pom</packaging>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<url>${uimaWebsiteUrl}</url>
@@ -60,4 +60,4 @@
<bookNameRoot>uima_async_scaleout</bookNameRoot>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml?rev=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml Tue Dec 8 21:16:27
2015
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.0</version>
+ <version>2.8.1</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-as-eclipse-update-site</artifactId>
<packaging>pom</packaging>
- <version>2.6.0</version>
+ <version>2.8.1</version>
<name>Apache UIMA Eclipse: ${project.artifactId}</name>
<description>The UIMA Eclipse update site</description>
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=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Tue Dec 8 21:16:27 2015
@@ -28,7 +28,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
<packaging>pom</packaging>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<description>The common parent pom for uima-as</description>
<url>${uimaWebsiteUrl}</url>
@@ -121,38 +121,40 @@
<uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<!-- level of uimaj sdk this release depends on -->
- <uimajDependencyVersion>2.6.0</uimajDependencyVersion>
+ <uimajDependencyVersion>2.8.1</uimajDependencyVersion>
<!-- level of ActiveMQ this release depends on -->
- <org.apache.activemq.version>5.7.0</org.apache.activemq.version>
+
<org.apache.activemq.version>5.12.1</org.apache.activemq.version>
<!-- level of SpringFramework this release depends on -->
-
<org.springframework.version>3.0.7.RELEASE</org.springframework.version>
+
<org.springframework.version>3.2.11.RELEASE</org.springframework.version>
<org.apache.geronimo.jms.specs.version>1.1.1</org.apache.geronimo.jms.specs.version>
<org.apache.geronimo.j2ee.specs.version>1.0.1</org.apache.geronimo.j2ee.specs.version>
-
<org.apache.geronimo.servlet.specs.version>1.2</org.apache.geronimo.servlet.specs.version>
+
<org.apache.geronimo.servlet.specs.version>1.0</org.apache.geronimo.servlet.specs.version>
- <jetty.version>7.6.7.v20120910</jetty.version>
+ <jetty.version>8.1.16.v20140903</jetty.version>
- <commons-pool.version>1.6</commons-pool.version>
+ <commons-pool.version>2.4.2</commons-pool.version>
- <xstream.version>1.4.3</xstream.version>
+ <xstream.version>1.4.7</xstream.version>
<log4j.version>1.2.17</log4j.version>
<xmlbeans.version>2.4.0</xmlbeans.version>
- <slf4j.version>1.6.4</slf4j.version>
+ <slf4j.version>1.7.10</slf4j.version>
- <http.client.version>3.1</http.client.version>
+ <!--http.client.version>4.2.5</http.client.version>
+ <http.core.version>4.2.4</http.client.version-->
+
<xpp3.version>1.1.4c</xpp3.version>
- <http.commons.client.version>4.2.1</http.commons.client.version>
-
- <http.commons.core.version>4.2.1</http.commons.core.version>
+ <http.commons.client.version>4.2.5</http.commons.client.version>
+ <http.commons.core.version>4.2.4</http.commons.core.version>
+ <hawtbuff.version>1.11</hawtbuff.version>
<!-- Needed for NOTICE file packaged in each jar under META-INF -->
@@ -192,7 +194,13 @@ ${uimaASNoticeText}
<!-- Active MQ Stuff -->
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-client</artifactId>
+
<version>${org.apache.activemq.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
<version>${org.apache.activemq.version}</version>
</dependency>
@@ -216,13 +224,27 @@ ${uimaASNoticeText}
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-optional</artifactId>
+ <artifactId>activemq-console</artifactId>
<version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>kahadb</artifactId>
+ <artifactId>activemq-http</artifactId>
+
<version>${org.apache.activemq.version}</version>
+ </dependency>
+
+<dependency>
+ <groupId>org.fusesource.hawtbuf</groupId>
+ <artifactId>hawtbuf</artifactId>
+ <version>${hawtbuff.version}</version>
+</dependency>
+
+
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
<version>${org.apache.activemq.version}</version>
</dependency>
@@ -239,11 +261,11 @@ ${uimaASNoticeText}
<version>${org.springframework.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>${org.springframework.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.springframework</groupId>
@@ -265,6 +287,12 @@ ${uimaASNoticeText}
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-webt</artifactId>
+
<version>${org.springframework.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>${org.springframework.version}</version>
</dependency>
@@ -297,7 +325,7 @@ ${uimaASNoticeText}
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
-
<artifactId>geronimo-servlet_2.5_spec</artifactId>
+
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<version>${org.apache.geronimo.servlet.specs.version}</version>
</dependency>
@@ -309,8 +337,8 @@ ${uimaASNoticeText}
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
<version>${commons-pool.version}</version>
<scope>compile</scope>
</dependency>
@@ -356,13 +384,18 @@ ${uimaASNoticeText}
<version>${log4j.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>${http.client.version}</version>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>commons-httpcore</groupId>
+ <artifactId>commons-httpcore</artifactId>
+ <version>${http.coreh.version}</version>
+ </dependency-->
+ <dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>${xpp3.version}</version>
@@ -396,8 +429,8 @@ ${uimaASNoticeText}
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
</plugins>
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=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/pom.xml Tue Dec 8 21:16:27 2015
@@ -15,12 +15,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-activemq</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<description>UIMA-AS ActiveMQ incorporation</description>
<url>${uimaWebsiteUrl}</url>
@@ -57,7 +57,12 @@
<!-- Active MQ Stuff -->
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
@@ -67,6 +72,16 @@
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-console</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-web</artifactId>
<exclusions>
<exclusion>
@@ -85,7 +100,7 @@
<artifactId>activemq-spring</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-optional</artifactId>
<exclusions>
@@ -94,13 +109,20 @@
<artifactId>axis</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>kahadb</artifactId>
+ <artifactId>activemq-kahadb-store</artifactId>
</dependency>
+<dependency>
+ <groupId>org.fusesource.hawtbuf</groupId>
+ <artifactId>hawtbuf</artifactId>
+</dependency>
+
+
+
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
@@ -143,10 +165,10 @@
<artifactId>spring-core</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- </dependency>
+ <artifactId>spring-web</artifactId>
+ </dependency-->
<dependency>
<groupId>org.springframework</groupId>
@@ -195,7 +217,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<!-- Jetty -->
@@ -209,6 +231,10 @@
<artifactId>httpclient</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
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=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-camel/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-camel/pom.xml Tue Dec 8 21:16:27 2015
@@ -15,13 +15,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-camel</artifactId>
<packaging>jar</packaging>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<description>Apache UIMA-AS Camel Driver</description>
<url>${uimaWebsiteUrl}</url>
@@ -74,10 +74,10 @@
<artifactId>spring-core</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.springframework</groupId>
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=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-core/pom.xml Tue Dec 8 21:16:27 2015
@@ -15,13 +15,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<url>${uimaWebsiteUrl}</url>
@@ -56,8 +56,8 @@
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
<scope>compile</scope>
</dependency>
@@ -81,10 +81,10 @@
<artifactId>spring-core</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- </dependency>
+ <artifactId>spring-web</artifactId>
+ </dependency-->
<dependency>
<groupId>org.springframework</groupId>
@@ -187,4 +187,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
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=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-jms/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-jms/pom.xml Tue Dec 8 21:16:27 2015
@@ -15,12 +15,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-jms</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<url>${uimaWebsiteUrl}</url>
@@ -56,7 +56,7 @@
<!-- Active MQ Stuff -->
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-client</artifactId>
</dependency>
@@ -81,10 +81,10 @@
<artifactId>spring-core</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- </dependency>
+ <artifactId>spring-web</artifactId>
+ </dependency-->
<dependency>
<groupId>org.springframework</groupId>
@@ -120,4 +120,4 @@
<build>
<finalName>${project.artifactId}</finalName>
</build>
-</project>
\ No newline at end of file
+</project>
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=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml Tue Dec 8 21:16:27 2015
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-osgi-runtime</artifactId>
<packaging>jar</packaging>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache UIMA AS: ${project.artifactId}</name>
<description>Apache UIMA AS runtime code packaged for osgi use</description>
<url>${uimaWebsiteUrl}</url>
@@ -195,4 +195,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
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=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml Tue Dec 8
21:16:27 2015
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-eclipse-feature-deployeditor</artifactId>
<packaging>jar</packaging>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache UIMA Eclipse: ${project.artifactId}</name>
<description>UIMA Eclipse Plugin Feature for the uima-as deploy
editor</description>
<url>${uimaWebsiteUrl}</url>
@@ -58,4 +58,4 @@
<uimaScmProject>${project.artifactId}</uimaScmProject>
</properties>
-</project>
\ No newline at end of file
+</project>
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=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml Tue Dec 8 21:16:27 2015
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-deployeditor</artifactId>
<packaging>jar</packaging>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache 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=1718706&r1=1718705&r2=1718706&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml Tue Dec 8
21:16:27 2015
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-runtime-deployeditor</artifactId>
<packaging>jar</packaging>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.8.1-SNAPSHOT</version>
<name>Apache 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>
