You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2019/07/18 12:37:42 UTC

[activemq] branch activemq-5.15.x updated: AMQ-7236 - Update Spring and xstream to latest

This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
     new d065db5  AMQ-7236 - Update Spring and xstream to latest
d065db5 is described below

commit d065db5560cd50150f83bef06d658e7abee0ab1a
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
AuthorDate: Thu Jul 18 08:04:01 2019 -0400

    AMQ-7236 - Update Spring and xstream to latest
    
    (cherry picked from commit 61d141d350428819e1c569b2b0b29575e9a2507f)
---
 activemq-karaf/pom.xml | 2 +-
 pom.xml                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index 40883fd..45ef5b5 100644
--- a/activemq-karaf/pom.xml
+++ b/activemq-karaf/pom.xml
@@ -34,7 +34,7 @@
     <xpp3-bundle-version>1.1.4c_5</xpp3-bundle-version>
     <jodatime-bundle-version>2.9</jodatime-bundle-version>
     <dom4j-bundle-version>1.6.1_2</dom4j-bundle-version>
-    <xstream-bundle-version>1.4.8_1</xstream-bundle-version>
+    <xstream-bundle-version>1.4.11.1_1</xstream-bundle-version>
     <servicemix.specs.version>2.4.0</servicemix.specs.version>
   </properties>
 
diff --git a/pom.xml b/pom.xml
index 9f6102f..06b7760 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
     <scalatest-version>2.1.5</scalatest-version>
     <slf4j-version>1.7.25</slf4j-version>
     <snappy-version>1.1.2</snappy-version>
-    <spring-version>4.3.18.RELEASE</spring-version>
+    <spring-version>4.3.24.RELEASE</spring-version>
     <stax2-api-version>3.0.2</stax2-api-version>
     <taglibs-version>1.2.5</taglibs-version>
     <velocity-version>1.7</velocity-version>
@@ -129,7 +129,7 @@
     <xmlbeans-bundle-version>2.6.0_2</xmlbeans-bundle-version>
     <xmlresolver-bundle-version>1.2_5</xmlresolver-bundle-version>
     <xpp3-version>1.1.4c</xpp3-version>
-    <xstream-version>1.4.10</xstream-version>
+    <xstream-version>1.4.11.1</xstream-version>
     <xbean-version>4.2</xbean-version>
     <xerces-version>2.12.0</xerces-version>
     <jaxb-basics-version>0.6.4</jaxb-basics-version>