ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-04 17:53:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-1565 Upgrade Artemis version to latest. (#3557)

Browse Source 
* ENT-1565 Upgrade Artemis version to latest.

* Fix compiler errors.

* Add to changelog

* Additional commentary on Proton-J version
This commit is contained in:
Rick Parker 2018-07-13 10:10:26 +01:00 committed by GitHub
parent e90d7c69c5
commit ed25d8f1be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -22,7 +22,7 @@ buildscript {
ext.capsule_version = '1.0.1' ext.capsule_version = '1.0.1'
ext.asm_version = '5.0.4' ext.asm_version = '5.0.4'
ext.artemis_version = '2.5.0' ext.artemis_version = '2.6.2'
ext.jackson_version = '2.9.5' ext.jackson_version = '2.9.5'
ext.jetty_version = '9.4.7.v20170914' ext.jetty_version = '9.4.7.v20170914'
ext.jersey_version = '2.25' ext.jersey_version = '2.25'
@ -64,7 +64,7 @@ buildscript {
ext.proguard_version = constants.getProperty('proguardVersion') ext.proguard_version = constants.getProperty('proguardVersion')
ext.jsch_version = '0.1.54' ext.jsch_version = '0.1.54'
ext.commons_cli_version = '1.4' ext.commons_cli_version = '1.4'
ext.protonj_version = '0.27.1' ext.protonj_version = '0.27.1' // This is now aligned with the Artemis version, but retaining in case we ever need to diverge again for a bug fix.
ext.snappy_version = '0.4' ext.snappy_version = '0.4'
ext.fast_classpath_scanner_version = '2.12.3' ext.fast_classpath_scanner_version = '2.12.3'
ext.jcabi_manifests_version = '1.1' ext.jcabi_manifests_version = '1.1'

2
docs/source/changelog.rst
View File

@ -170,6 +170,8 @@ Unreleased
The log entry starts with `Cross-reference between MappedSchemas.`. The log entry starts with `Cross-reference between MappedSchemas.`.
API: Persistence documentation no longer suggests mapping between different schemas. API: Persistence documentation no longer suggests mapping between different schemas.
* Upgraded Artemis to v2.6.2.
.. _changelog_v3.1: .. _changelog_v3.1:
Version 3.1 Version 3.1

2
node-api/src/main/kotlin/net/corda/nodeapi/internal/MessageSizeChecksInterceptor.kt
View File

@ -22,7 +22,7 @@ class ArtemisMessageSizeChecksInterceptor(maxMessageSize: Int) : MessageSizeChec
} }
class AmqpMessageSizeChecksInterceptor(maxMessageSize: Int) : MessageSizeChecksInterceptor<AMQPMessage>(maxMessageSize), AmqpInterceptor { class AmqpMessageSizeChecksInterceptor(maxMessageSize: Int) : MessageSizeChecksInterceptor<AMQPMessage>(maxMessageSize), AmqpInterceptor {
override fun getMessageSize(packet: AMQPMessage?): Int? = packet?.length override fun getMessageSize(packet: AMQPMessage?): Int? = packet?.encodeSize
} }
/** /**

2
serialization/build.gradle
View File

@ -14,6 +14,8 @@ dependencies {
compile "org.ow2.asm:asm:$asm_version" compile "org.ow2.asm:asm:$asm_version"
compile "com.google.guava:guava:$guava_version"
// For AMQP serialisation. // For AMQP serialisation.
compile "org.apache.qpid:proton-j:$protonj_version" compile "org.apache.qpid:proton-j:$protonj_version"