activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [activemq] branch master updated: Updating Shiro plus some other minor updates
Date Mon, 15 Jul 2019 05:10:10 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
     new 1d7ffa1  Updating Shiro plus some other minor updates
     new f88b0ba  Merge pull request #373 from coheigea/misc_updates
1d7ffa1 is described below

commit 1d7ffa1cd0082dde0a64df2216e9d38a7ea56ed6
Author: Colm O hEigeartaigh <coheigea@apache.org>
AuthorDate: Thu Jul 11 16:27:57 2019 +0100

    Updating Shiro plus some other minor updates
---
 activemq-osgi/pom.xml |  3 ++-
 pom.xml               | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 35ffcb1..c7cdac6 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -164,7 +164,8 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
       <exclusions>
-      <exclusion>
+        <exclusion>
+          <groupId>${project.groupId}</groupId>
           <artifactId>activemq-all</artifactId>
         </exclusion>
       </exclusions>
diff --git a/pom.xml b/pom.xml
index 3749cb0..d3053b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,8 @@
     <httpclient-version>4.5.6</httpclient-version>
     <httpcore-version>4.4.10</httpcore-version>
     <insight-version>1.2.0.Beta4</insight-version>
-    <jackson-version>2.9.8</jackson-version>
+    <jackson-version>2.9.9</jackson-version>
+    <jackson-databind-version>2.9.9.1</jackson-databind-version>
     <jasypt-version>1.9.2</jasypt-version>
     <jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
     <jetty9-version>9.2.26.v20180806</jetty9-version>
@@ -105,16 +106,16 @@
     <zookeeper-version>3.4.6</zookeeper-version>
     <qpid-proton-version>0.33.1</qpid-proton-version>
     <qpid-jms-version>0.43.0</qpid-jms-version>
-    <qpid-jms-netty-version>4.1.36.Final</qpid-jms-netty-version>
+    <qpid-jms-netty-version>4.1.37.Final</qpid-jms-netty-version>
     <qpid-jms-proton-version>0.33.1</qpid-jms-proton-version>
-    <netty-all-version>4.1.36.Final</netty-all-version>
+    <netty-all-version>4.1.37.Final</netty-all-version>
     <regexp-version>1.3</regexp-version>
-    <rome-version>1.12.0</rome-version>
+    <rome-version>1.12.1</rome-version>
     <saxon-version>9.5.1-5</saxon-version>
     <saxon-bundle-version>9.5.1-5_1</saxon-bundle-version>
     <scala-plugin-version>3.1.0</scala-plugin-version>
     <scala-version>2.11.0</scala-version>
-    <shiro-version>1.2.6</shiro-version>
+    <shiro-version>1.4.1</shiro-version>
     <scalatest-version>2.1.5</scalatest-version>
     <slf4j-version>1.7.25</slf4j-version>
     <snappy-version>1.1.2</snappy-version>
@@ -671,7 +672,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>${jackson-version}</version>
+        <version>${jackson-databind-version}</version>
       </dependency>
 
       <!-- Used to configure the activemq logs -->


Mime
View raw message