Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #373 from coheigea/misc_updates 

Updating Shiro plus some other minor updates
This commit is contained in:
Jean-Baptiste Onofré 2019-07-15 07:10:04 +02:00 committed by GitHub
parent c7eff84058 1d7ffa1cd0
commit f88b0baef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-osgi/pom.xml
View File

@ -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>

13
pom.xml
View File

@ -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 -->