Commit Graph

11537 Commits

Author SHA1 Message Date
Christopher L. Shannon 6f2b70d8d5 AMQ-8398 - Fix Stomp to OpenWire UTF-8 translation
This commit fixes conversion of messages that are sent or received
using Stomp when the body contains characters that require 4 bytes
for encoding using standard UTF-8.

ActiveMQ and OpenWire currently use a modified UTF-8
encoding that only uses 3 bytes so the conversion previously was
breaking because the body was encoded using standard JDK UTF-8 encoding
and set directly on an ActiveMQText message which was leading to
decoding errors later when the ActiveMQMessage tried to decode using the
modified encoder. The reverse was also was true and was breaking
in some cases.

The fix now makes sure to correctly decode the Stomp message back to a
String first and set that on the ActiveMQ message so it can be
re-encoded correctly. The reverse is fixed as well so both
conversion from Stomp -> OpenWire and OpenWire -> Stomp work. Tests have
been added for Stomp -> OpenWire, OpenWire -> Stomp, and Stomp -> Stomp
which is really Stomp -> OpenWire -> Stomp.

(cherry picked from commit 3ddf515597)
(cherry picked from commit 73a8d5ca67)
2024-08-28 15:06:34 -04:00
Christopher L. Shannon e4ec7c5360 AMQ-9547 - Remove setLength() and usage from RecoverableRandomAccessFile
This method always throws an exception so it should be removed and no
longer used. Places in PageFile that called the method have been updated
to either remove the usage or throw an error.

(cherry picked from commit 5f79b651c2)
2024-08-08 16:15:33 -04:00
JB Onofré 5bc3a1ec05 [maven-release-plugin] prepare for next development iteration 2024-07-18 14:53:29 +02:00
JB Onofré 65d92a61ce [maven-release-plugin] prepare release activemq-5.18.5 2024-07-18 14:53:17 +02:00
JB Onofré 4caaa1e827 Update spring schemas version in preparation for 5.18.4 release 2024-07-17 07:53:06 +02:00
Matt Pavlovich c719f4d789
[AMQ-9535] Upgrade slf4j 2.0.13
(cherry picked from commit 8ae41a4a37)
2024-07-16 12:53:10 -05:00
Matt Pavlovich 82abe633e6
[AMQ-9523] Upgrade Jackson 2.17.2
(cherry picked from commit 382dfa5679)
2024-07-16 09:09:59 -05:00
Matt Pavlovich 2c6723f97d
[AMQ-9534] 5.18.x backport fixes for kahadb recovery with offset (ref: AMQ-9484)
(cherry picked from commit 034434836b02030d9a0a9beb14b4fb9373c7e6b1)
2024-07-16 08:58:11 -05:00
Matt Pavlovich 3b9d86bb80
[AMQ-9484] Support exporting kahadb messages from a queue with an offset
(cherry picked from commit 1a1b42f0c9)
(cherry picked from commit dad947fe4a)
2024-07-16 08:22:58 -05:00
Matt Pavlovich 6a0b95494f
[AMQ-9533] Add Backup command that uses activemq-protobuf (to replace export)
(cherry picked from commit 5309352e12)
2024-07-16 08:22:48 -05:00
Matt Pavlovich e184db0ae5 [AMQ-9531] Fix regression causing export command to fail
(cherry picked from commit d9673c76fa)
2024-07-14 06:35:30 +02:00
JB Onofré c47d897e2d
Merge pull request #1259 from jbonofre/AMQ-9507
AMQ-9507: Upgrade to commons-daemon 1.4.0
2024-07-13 07:07:12 +02:00
JB Onofré d5d8988ce4 AMQ-9507: Upgrade to commons-daemon 1.4.0 2024-07-12 08:17:07 +02:00
JB Onofré c07ffa1479
Merge pull request #1253 from jbonofre/AMQ-9489
AMQ-9489: Upgrade to commons-io 2.16.1
2024-07-11 17:09:17 +02:00
JB Onofré f55921a0a9
Merge pull request #1252 from jbonofre/AMQ-9508
AMQ-9508: Upgrade to commons-logging 1.3.3
2024-07-11 17:07:10 +02:00
JB Onofré b53eb3c377 AMQ-9489: Upgrade to commons-io 2.16.1 2024-07-11 08:47:35 +02:00
JB Onofré 4f202fdb20 AMQ-9508: Upgrade to commons-logging 1.3.3 2024-07-11 06:42:43 +02:00
JB Onofré 259b35cb3e
Merge pull request #1249 from jbonofre/AMQ-9518
AMQ-9518: Upgrade to Jetty 9.4.55.v20240627
2024-07-11 06:39:29 +02:00
JB Onofré b189c30e79
Merge pull request #1250 from jbonofre/AMQ-9498
AMQ-9498: Upgrade to xbean 4.25
2024-07-11 06:37:49 +02:00
JB Onofré 5b391e0550
Merge pull request #1248 from jbonofre/AMQ-9529
AMQ-9529: Upgrade to Spring 5.3.37
2024-07-11 06:32:48 +02:00
Matt Pavlovich 6cc7658b94
[AMQ-9455] DestinationPolicy support for MessageInterceptorStrategy
(cherry picked from commit c465330be5)
2024-07-10 09:12:08 -05:00
JB Onofré e02312a4e6 AMQ-9498: Upgrade to xbean 4.25 2024-07-10 09:00:51 +02:00
JB Onofré 976fa6a7e4 AMQ-9518: Upgrade to Jetty 9.4.55.v20240627 2024-07-10 08:56:40 +02:00
JB Onofré 67c80edf67 AMQ-9529: Upgrade to Spring 5.3.37 2024-07-10 08:12:32 +02:00
Christopher L. Shannon a12f030090 AMQ-9504 - Add missing license header
(cherry picked from commit 527d245831)
2024-05-22 10:12:18 -04:00
Christopher L. Shannon c71965176a AMQ-9504 - Prevent registering duplicate mKahadb adapters
This fixes an issue on start up of a broker that is configured with
multiple mKahaDB filtered adapters and one is configured with
perDestination=true. Before this fix a duplicate persistence adapter
could be created because the filter did not check for existing matches.

Patch applied with thanks to Ritesh Adval

(cherry picked from commit ddfb36515c)
2024-05-22 09:31:44 -04:00
Christopher L. Shannon 827ad1012b AMQ-9481 - Correctly complete async servlet request on timeout
This fixes AsyncServletRequest to correctly call context.dispatch() when
the async request times out so that the consumer can be re-used.

(cherry picked from commit 72befc14fb)
2024-04-22 11:02:54 -04:00
Kartik Ganesh 479a0f981f Removed JRMS-1.1 dependency from assembly pom.xml
Signed-off-by: Kartik Ganesh <gkart@amazon.com>

(cherry picked from commit 1f89c1737e)
2024-04-12 10:59:31 +02:00
Matt Pavlovich abcc0dcde3 [AMQ-9430] RuntimeConfigPlugin wire in classloader to JAXBContext
(cherry picked from commit 1e314d8dfc)
2024-04-11 19:31:55 +02:00
JB Onofré 9b81a76010 AMQ-9473: Fix IntrospectionSupport to deal with SSLSocket properties
(cherry picked from commit 550cb9b2be)
2024-04-11 17:06:06 +02:00
Christopher L. Shannon dc892d3dfc AMQ-9330 - Return 204 code when polling empty destinations (#1203)
Previously a timeout was thrown and complete was not called so Jetty was
returning a 500 error

(cherry picked from commit 8b6072d03e)
(cherry picked from commit 45a1bd54d3)
2024-04-11 10:04:14 -04:00
Christopher L. Shannon a37c111a75 AMQ-9475 - ConsumerControl commands should not auto create wildcard
dests

This fixes an issue where wildcard destinations could be inadvertently
created by ConsumerControl commands which could lead to problems. The
processing logic for this command now will only look up existing
destinations if they exist.
2024-04-11 07:12:47 -04:00
JB Onofré fdc4a63476 [maven-release-plugin] prepare for next development iteration 2024-04-08 08:25:24 +02:00
JB Onofré ee0edaf1f2 [maven-release-plugin] prepare release activemq-5.18.4 2024-04-08 08:25:14 +02:00
JB Onofré f358bb7213
Merge pull request #1180 from jbonofre/AMQ-9458
AMQ-9458: Upgrade to Jetty 9.4.54.v20240208
2024-03-31 08:58:21 +02:00
JB Onofré 0b04b31053
Merge pull request #1179 from jbonofre/AMQ-9453
AMQ-9453: Upgrade to Spring 5.3.33
2024-03-31 08:42:58 +02:00
JB Onofré f1b219a111 AMQ-9466: Upgrade to log4j 2.23.1
(cherry picked from commit 55b5ae5ad8)
2024-03-26 06:17:16 +01:00
JB Onofré 84814b15ca AMQ-9465: Upgrade to slf4j 2.0.12
(cherry picked from commit 9d1cd325b5)
2024-03-26 06:14:52 +01:00
JB Onofré 72b18e1932 AMQ-9464: Upgrade to commons-dbcp2 2.12.0
(cherry picked from commit 98868995c2)
2024-03-25 14:33:20 +01:00
JB Onofré 14eacefc19 AMQ-9462: Upgrade to Jackson 2.16.2 2024-03-25 10:10:49 +01:00
Grzegorz Kochanski 3b0a646af2 AMQ-9452: unwrap BaseDestination to access queue/topic message
Change-Id: Ic05002ecb428e2aa5abeb9dc3e499e3aae550051

(cherry picked from commit 4d40023968)
2024-03-24 07:40:30 +01:00
JB Onofré b8763fc855 AMQ-9461: Upgrade copyrigth on the webconsole
(cherry picked from commit 13d131032c)
2024-03-23 11:56:54 +01:00
JB Onofré 58908661e8 [AMQ-9459]: Added JVM Arg to open sun.nio.ch 2024-03-22 17:49:48 +01:00
JB Onofré ec4bde01fb AMQ-9458: Upgrade to Jetty 9.4.54.v20240208 2024-03-17 11:56:15 +01:00
JB Onofré eb71c70e57 AMQ-9453: Upgrade to Spring 5.3.33 2024-03-17 11:47:03 +01:00
Matt Pavlovich c3ff7ef072 [AMQ-9450] Expose Job Scheduler views with destination via JMX
(cherry picked from commit 81e6b90ac8)
2024-03-09 11:33:01 +01:00
JB Onofré 4a3f55f7cc AMQ-9434: Fix ACTIVEMQ_CONFIGS loading 2024-03-08 17:16:22 +01:00
Jean-Baptiste Onofré f5ca67cd56 AMQ-9299: remove gram dependency
(cherry picked from commit e947a85be0)
2024-03-04 17:23:19 +01:00
Jean-Baptiste Onofré 98c04a4721 AMQ-9397: Add mysql_connector_j mapping for MySQL 8 (e.g. MySQL Connector/J driver name)
(cherry picked from commit 426ddf08a2)
2024-03-04 09:37:21 +01:00
Jean-Baptiste Onofré 012cac88dc AMQ-9431: Add org.apache.activemq.broker.BouncyCastleNotAdded system property to not load BouncyCastle in BrokerService
(cherry picked from commit 0a90f323ce)
2024-03-03 17:04:23 +01:00