Author: cwiklik
Date: Mon Feb 12 20:57:09 2018
New Revision: 1824068
URL: http://svn.apache.org/viewvc?rev=1824068&view=rev
Log:
UIMA-5722 upgraded uima, uima-as, amq, spring, camel, xstream
Modified:
uima/uima-ducc/trunk/uima-ducc-parent/pom.xml
Modified: uima/uima-ducc/trunk/uima-ducc-parent/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-parent/pom.xml?rev=1824068&r1=1824067&r2=1824068&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-parent/pom.xml (original)
+++ uima/uima-ducc/trunk/uima-ducc-parent/pom.xml Mon Feb 12 20:57:09 2018
@@ -130,21 +130,21 @@
<jiraVersion>12339667</jiraVersion>
<maven.build.timestamp.format>MM-dd-yyyy
HH:mm</maven.build.timestamp.format>
<ducc.version>${project.version}</ducc.version>
-
<org.springframework.version>4.1.9.RELEASE</org.springframework.version>
-
<org.apache.activemq.version>5.14.0</org.apache.activemq.version>
- <org.apache.camel.version>2.16.2</org.apache.camel.version>
- <org.apache.uima.version>2.9.0</org.apache.uima.version>
<!--Same as uima-as-->
- <org.apache.uima.as.version>2.9.0</org.apache.uima.as.version>
+
<org.springframework.version>4.3.9.RELEASE</org.springframework.version>
+
<org.apache.activemq.version>5.15.2</org.apache.activemq.version>
+ <org.apache.camel.version>2.19.3</org.apache.camel.version>
+ <org.apache.uima.version>2.10.2</org.apache.uima.version>
<!--Same as uima-as-->
+ <org.apache.uima.as.version>2.10.2</org.apache.uima.as.version>
<com.google.guava.version>14.0.1</com.google.guava.version>
<!-- updated from r09 for cassandra -->
<commons.cli.version>1.2</commons.cli.version>
<joda.time.version>2.1</joda.time.version>
<jsch.version>0.1.29</jsch.version>
- <commons.codec.version>1.2</commons.codec.version>
- <commons.collections.version>3.2.1</commons.collections.version>
+ <commons.codec.version>1.9</commons.codec.version>
+ <commons.collections.version>3.2.2</commons.collections.version>
<commons.lang.version>2.6</commons.lang.version>
<commons.math.version>2.0</commons.math.version>
- <log4j.version>1.2.16</log4j.version>
- <slf4j.version>1.7.6</slf4j.version> <!--
updated from 1.6.4 for cassandra -->
+ <log4j.version>1.2.17</log4j.version>
+ <slf4j.version>1.7.25</slf4j.version> <!--
updated from 1.6.4 for cassandra -->
<xmlbeans.version>2.5.0</xmlbeans.version>
<junit.version>4.8.2</junit.version>
<servlet.api.version>2.5</servlet.api.version>
@@ -152,7 +152,7 @@
<commons.pool.version>2.4.2</commons.pool.version>
<geronimo.servlet-spec.version>1.0</geronimo.servlet-spec.version>
<xpp3.version>1.1.4c</xpp3.version>
- <xstream.version>1.4.8</xstream.version>
+ <xstream.version>1.4.10</xstream.version>
<xmlpull.version>1.1.3.1</xmlpull.version>
<mina.core.version>1.1.7</mina.core.version>
<aopalliance.version>1.0</aopalliance.version>
@@ -161,7 +161,7 @@
<libpam.version>1.7</libpam.version>
<jna.version>4.2.2</jna.version>
<datatables.version>1.9.1</datatables.version>
- <jetty.version>9.2.13.v20150730</jetty.version>
+ <jetty.version>9.2.22.v20170606</jetty.version>
<orbit-org-apache-jasper.version>2.1.0.v201110031002</orbit-org-apache-jasper.version>
<servlet-api.version>2.5</servlet-api.version>
@@ -176,9 +176,9 @@
<!-- end of cassandra client -->
<cassandra.server.version>2.1.11</cassandra.server.version>
<apache.httpcomponents.httpclient.version>4.3.5</apache.httpcomponents.httpclient.version>
- <http.commons.client.version>4.5.1</http.commons.client.version>
+ <http.commons.client.version>4.5.3</http.commons.client.version>
<http.commons.client-cache.version>4.3.5</http.commons.client-cache.version>
- <http.commons.core.version>4.4.4</http.commons.core.version>
+ <http.commons.core.version>4.4.6</http.commons.core.version>
<!-- Needed for NOTICE file packaged in each jar under META-INF -->
<projectTimeSpan>2012</projectTimeSpan>
@@ -543,6 +543,11 @@ ${uimaDUCCNoticeText}
<artifactId>camel-jetty</artifactId>
<version>${org.apache.camel.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jetty9</artifactId>
+ <version>${org.apache.camel.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
