INT-2643 Update OSGI Ranges 2.1.3
INT-2610
fixed the inability for convetional mappings to be overriden with payload expression
INT-2610 Fix Gateway Mapping Issue

Fix the inability for mappings by convention to be overriden with payload expression
[artifactory-release] Release version 2.1.3.BUILD
[artifactory-release] Next development version
Merge remote branch 'upstream/2.1.x' into 2.1.x
INT-2650 Don't Convert byte[]

Backport to 2.1.x

The problem reported by INT-2630 was more extensive. For example,
the unconditional parameter conversion causes arrays to be copied
unnecessarily.

The BeanFactoryTypeConverter now does a no-op conversion whenever
the source type is assignable to the target type.

This effectively reverts to the Spring 3.0 behavior, where this
assertion resulted in the argument not being added to the
argsRequiringConversion array.

Polishing

Add a couple more tests
INT-2652 Fix mget for FTP

FTP servers return full path from listNames() whereas SFTP
returns just the filename. mget logic assumed SFTP behavior.

Add a test to see if the filename already starts with the remote
directory and remove it before calling get() (which assumes just
the filename).

Includes an @Ignored test for FTP and SFTP that runs an mget
against a server.
INT-2666-2.1.x Fix NPE in SimpleMessageStore

INT-2666-2.1.x polished test

Polishing
INT-2677 Upgrade JMS Module to use ActiveMQ 5.6.0
INT-2751 Fix Reaper Race Condition

When the reaper runs, and finds a group that is in the
process of being completed, the reaper blocks on the
lock, but when the lock is released, goes ahead and
reaps the group.

Now, after obtaining the lock, the reaper checks to
see if the modified date changed and, if so, aborts
the reap of the group this time around.

Required adding lastModified accounting for SimpleMessageGroup
(accounting already exists for other message groups).

Test case reproduced the problem, demonstrating duplicate
output messages.

After the fix, it shows the reap was aborted in the debug
log.

INT-2751 Polishing

PR Comments
INT-2749 add'long' cast to SftpFileInfo

Add cast to (long) to a return value of getMTime methood called in SftpFileInfo.getModified()
INT-2751 Jdbc Message Store Group Id Issues

Jdbc Message Store always converts the correlation id
to a UUID string, even if it's already a String.

This causes reaper issues with the correlating message
handler because the reap occurs under
a different lock to normal group processing.

This change ensures the lock is properly mutually
exclusive.
Release version 2.1.4.RELEASE
updating gradle version to 1.2 and bundlor plugin to 1.2 (GA)

updated docbook plugin to version 0.1.6

adjustments for updated gradle wrapper
INT-2534 Fix Bundlor Versions for 2.1.5

2.1.4 Didn't update version range for S.I. modules.
Merge pull request #656 from garyrussell/INT-2534

  INT-2534 Fix Bundlor Versions for 2.1.5
INT-2801 Twitter: Fix Init. of Metadata Key

Key was not initialized unless authorized.
INT-2438 Fix Temporary Remote Directory

The final remote directory expression processor was being
used instead of the temporary directory expression processor.

Add a test to confirm the correct processors are used.