10832 Commits

Author SHA1 Message Date
Robbie Gemmell
d719a8bed1 NO-JIRA: update RAT plugin to 0.13
(cherry picked from commit 01af3e87d78adbca7f6f46b9ba94a924d046c3ee)
2022-02-11 14:02:59 +01:00
Jean-Baptiste Onofré
fdee757fcd
Merge pull request #765 from jbonofre/AMQ-8410
[AMQ-8410] Fix OSGi imports
2022-02-10 18:32:34 +01:00
Jean-Baptiste Onofré
ff601a5122 [AMQ-8410] Fix OSGi imports 2022-02-10 14:21:58 +01:00
Jean-Baptiste Onofré
cade46f4a4
Merge pull request #754 from coheigea/AMQ-8472
AMQ-8472 - Switch to reload4j for logging
2022-02-10 06:07:25 +01:00
Matt Pavlovich
0b7ebc5ad1 [AMQ-8443] Add unit test
(cherry picked from commit 09458713aacfa026f660591230dc52854b0203bc)
2022-02-09 10:50:23 -05:00
Matt Pavlovich
acc3c694ab [AMQ-8397] Add unit tests for AMQ-8397
(cherry picked from commit 9d8ee0d3b73d214aedcb0e806daf32c3c2ff69db)
2022-02-09 06:35:57 -05:00
Colm O hEigeartaigh
1f01a61426
AMQ-8472 - Switch to reload4j for logging 2022-02-08 14:02:31 +00:00
Matt Pavlovich
3b5ebd0bb7 [AMQ-8413] NetworkConnectore remote user and pass unit test
(cherry picked from commit 2a9f777aabda6c866924295ba530bfa9b18d0873)
2022-02-07 11:28:28 -05:00
Christopher L. Shannon (cshannon)
5f71b848a5 [AMQ-8412] - Add some comments for maxFrameSizeEnabled
(cherry picked from commit 19949e36bce4ad19ee811093b141db2f616090b9)
2022-02-07 08:53:49 -05:00
Matt Pavlovich
c1cf24cb2a [AMQ-8053] UserIDBroker unit tests
(cherry picked from commit 49f1b2c90349db9a365fb750eb2f65133ac30765)
2022-02-07 08:29:09 -05:00
Christopher L. Shannon (cshannon)
42e65f88e3 AMQ-8412 - Add wireformat negotiation test for maxFrameSizeEnabled
Verify that maxFrameSizeEnabled being configured on the client or the
server is not negotiated and won't affect the other

(cherry picked from commit 26a3c55833bf5a0534f7a5b841fd274d61355435)
2022-02-07 08:04:42 -05:00
Matt Pavlovich
e630a3cc61 [AMQ-8412] Update client-side maxFrameSize handling to be more symetrical with server-side
- Handle in the OpenWireFormat class
 - Add unit tests to confirm
 - Verify compression is accounted for
 - Verify the ability to disable using wireFormat.maxFrameSizeEnabled=false
 - [cshannon] Reworked max frame size test case to add in all transports and all client/server cases

(cherry picked from commit 67a2edbf0d7d3d43726a50743270b15b29759dec)
2022-02-07 08:04:33 -05:00
Jean-Baptiste Onofré
90b29cd0a5 Fix maven plugins version and options 2022-02-01 18:07:22 +01:00
Jean-Baptiste Onofré
369696892c Downgrade to Apache POM 20 to avoid javadoc generation error (it will be
fixed on main/5.17)
2022-02-01 15:21:28 +01:00
Jean-Baptiste Onofré
3d55f2d452 Update schema location in preparation for 5.16.4 release 2022-02-01 14:35:39 +01:00
Colm O hEigeartaigh
b572d0cd5a AMQ-8648 - CVE-2022-23437: Infinite loop within Apache XercesJ xml parser
(cherry picked from commit 70915ea5c078d796a81be7d0d2b511330fd150d4)
2022-02-01 14:26:56 +01:00
Jean-Baptiste Onofré
3bebc11229 Fix javadoc generation related to reproducible build 2022-01-31 18:17:42 +01:00
Jean-Baptiste Onofré
fbdf3c5061 [AMQ-8467] Upgrade to xstream 1.4.19
(cherry picked from commit 2206eb3ad620bb1bc66cf49a101d3cd0a3bc355c)
2022-01-31 17:23:16 +01:00
Endre Stølsvik
c81740592b StatisticsBrokerPlugin: Add feat: request destination firstMessageTimestamp
Adding a feature (STATS_FIRST_MESSAGE_TIMESTAMP) to the
StatisticsBrokerPlugin's destination-statistics for getting the
timestamp of the first message in the destination(s) being requested: If
you on the query-message set the property
StatisticsBroker.STATS_FIRST_MESSAGE_TIMESTAMP to anything (e.g. boolean
true), a long value "firstMessageTimestamp" will be added to the
statistics reply message(s). Since the reply message has JMSTimestamp
set, which is the broker's now-timestamp, you may also on the query side
calculate the age of the first message in milliseconds. The key name was
chosen since that is the name of the corresponding feature in Artemis.

This extension of the existing feature is implemented to be as
non-intrusive as possible, adding very little runtime cost if not
requested. It also seems like the runtime cost for enabling this
feature, thus finding and adding the firstMessageTimestamp, is small.

While at it, also slightly improving an existing feature
(STATS_DENOTE_END_LIST) where a reply to a destination query can be
"null terminated": After sending the relevant replies, the
StatisticsBroker also sends an empty message. This feature is relevant
if the query is a wildcard query, thus returning multiple messages: The
empty message denotes the end of the replies. However, to activate this
feature, a somewhat complicated query destination had to be constructed.
Adopting the solution for the other StatisticsBroker feature where you
may reset the broker statistics by adding a property to the query
message, this null-termination feature now /also/ checks for the
presence of this query modifier STATS_DENOTE_END_LIST as a property.
(This property based solution was thus also adopted for the present
'firstMessageTimestamp' solution, as it was found much more intuitive).

Added tests for both the STATS_FIRST_MESSAGE_TIMESTAMP query modifier,
and the improved STATS_DENOTE_END_LIST property-based query modifier.

Had to make the Topic.doBrowse(List browseList, int max) public - the
corresponding method for Queue was already public.

Made the evaluation of whether this is a StatisticsBroker-relevant
message a microscopic bit more performant (exiting faster if not
relevant): To the initial test of whether the message is relevant, which
only checked for replyTo being set, a check for 'destination.
startsWith("ActiveMQ.Statistics")' was added. Only if so, the rest of
the evaluations kick in. Also using 'string.startsWith(..)' instead of
the verbose 'string.regionMatches(..)'.

Removed an unused import on PartitionBrokerTest.java, as IntelliJ
complained about not finding it.

(cherry picked from commit 9167a79b79e4c121cfe0a5b82456f52bf3ecc3c7)
2022-01-30 16:07:11 +01:00
Matt Pavlovich
afc50ee727 [AMQ-8412] Client-side management of max frame size
- Store maxFrameSize on client-side
 - Check messages on outbound send to send an actionable exception to the caller
 - Add a reason code for max message size exceeded (client-side)

(cherry picked from commit 48d0fb11716d3490b1d76f7e8860b61324d4e82f)
2022-01-29 07:08:34 +01:00
Matt Pavlovich
f1b37e0a4f [AMQ-8462] Remove double call to listConnectionStates during connection close
(cherry picked from commit 6a944a05d90b3f2d44c9890a5724e7a6a702a0eb)
2022-01-24 18:48:05 +01:00
Alexej Timonin
7a8d517436 Allow custom delimiter when sending TextMessages via MBean
This enables possibility to send messages containing commas in the body
with tools such as jconsole.
Example simple text as body: body=Hello, world!
Example json as body: body={"a":"b","c":"d"}

(cherry picked from commit 7c6322700389c013be50139ae5c087f3e7da9510)
2022-01-22 17:14:44 +01:00
Lucas Tétreault
fc7a68a8bc Use B+ Tree iterator instead of DFS to find scheduled jobs to be executed
(cherry picked from commit 60859b0b7fa93b001ca2b0ac2f2385386cb2f47d)
2022-01-19 19:02:09 +01:00
Anthony F
31a07c11aa [AMQ-8409] Fixed Unexpected \\r instead of \r in header property in incoming messages
(cherry picked from commit d9450cdd74aed1471388058e28c2b777db419e68)
2022-01-19 18:30:07 +01:00
Vilius Šumskas
ffc2aad6e3 https://issues.apache.org/jira/browse/AMQ-5388 Fix user permissions in web console
(cherry picked from commit c67ada04c77e9379ef25ac62d5ea1fcf20cf8b8f)
2022-01-19 17:48:11 +01:00
jbonofre
e5393b469b [AMQ-7351] Upgrade to Apache POM 24
(cherry picked from commit 53a69abe5e963b45d50bf2b59614fe626603f116)
2022-01-18 14:19:43 +01:00
Matt Pavlovich
d915c791aa [AMQ-8443] Allow reconnect command to work
(cherry picked from commit bc9ff5a09fb0aad28d94c2aa72b4e31011b61905)
2022-01-15 06:59:24 +01:00
Matt Pavlovich
7295bd85a5 [AMQ-8043] Do not override JMSXUserID when message comes across network connector
(cherry picked from commit bec734a133ef27327414f1fb75066d01b4bd039a)
2022-01-15 06:48:26 +01:00
Jean-Baptiste Onofré
ec6db10c7e [AMQ-8252] Introduce stackTraceEnabled flag on transport connector to define if the stack trace should be displayed or not in case of WARN messages
(cherry picked from commit 2f96b4a60c30f1d9a3ce047aa41a94d975324d83)
2022-01-15 06:46:33 +01:00
Jean-Baptiste Onofré
207591e94d [AMQ-8425] Get process from any user in bin/activemq script
(cherry picked from commit c246e0926c5f803341224000fe4391cdb3f00d76)
2022-01-15 06:43:52 +01:00
Jean-Baptiste Onofré
e52b1bd0ed [AMQ-8445] Fix SSLParameters set in the SSL transport
(cherry picked from commit c2e2c818b529ee45ff244564ea52206b81eaf783)
2022-01-12 11:20:32 +01:00
Matt Pavlovich
6a25d654f2 [AMQ-8397] Add a destination option to sendDuplicateFromStoreToDLQ (#724)
- Default 'true' to match existing behavior
 - Added counter to DestinationView
2021-12-20 09:11:25 -06:00
Matt Pavlovich
f2dbc92743 [AMQ-8400] Add synchronization handling for Transaction to prevent CME (#720) 2021-12-20 09:11:19 -06:00
Matt Pavlovich
c58e531584 [AMQ-8413] Add remoteUserName and remotePassword config fields to network connector (#725) 2021-12-20 09:10:53 -06:00
Jean-Baptiste Onofré
485d32fe40 [AMQ-8405] Upgrade to ASM 9.2
(cherry picked from commit f11e49b9b73cbb4e024ca8621379c6e67924cbe6)
2021-12-20 06:06:28 +01:00
Jean-Baptiste Onofré
ad1bb3db90 [AMQ-8404] Upgrade to jackson 2.13.0
(cherry picked from commit 0f62ec0fec98bd142564cfac7fa2a5380b2066bb)
2021-12-20 06:04:29 +01:00
Jonathan Gallimore
369c05fe77 AMQ-8275 eliminate use of reflection for SNI on SslTransport
(cherry picked from commit 34c4e186fe3d71c82866e89afd2706a3619ca2b4)
2021-12-19 08:02:03 +01:00
Jean-Baptiste Onofré
0a1a0046a3 [AMQ-8439] Exclude camel.xml from assembly validateExampleConfig test
(cherry picked from commit 359b410ffd9082861cea472fb1c85f8bf8c10ac6)
2021-12-19 07:46:26 +01:00
Jean-Baptiste Onofré
d9cc172d38 [AMQ-8428] Upgrade to httpcore 4.4.15
(cherry picked from commit a965c2e8dadb9b19c1a51a0dfb57f0878c543330)
2021-12-16 13:53:23 +01:00
Jean-Baptiste Onofré
176a921f71 [AMQ-8073] Upgrade to commons-dbcp2 2.9.0 2021-12-16 13:51:54 +01:00
Matt Pavlovich
ff9831a9fd [AMQ-8360] Update commons-pool2 to 2.11.1 (#704)
(cherry picked from commit d00d6ffa7106378f12bb1063bc13da212964ac1c)
2021-12-16 13:49:43 +01:00
Christopher L. Shannon (cshannon)
9b52279841 AMQ-8410: Update Guava version to 31.0.1
(cherry picked from commit 07c2704864e83576b6a008a91d948cce7db6d2b2)
2021-11-10 09:25:26 -05:00
Jean-Baptiste Onofré
57b1316d21 [AMQ-8395] Avoid possible NPE when sending advisory message
(cherry picked from commit f74992c1058eb8de051c1ce0779ba4f34ba39ed3)
2021-10-25 06:45:04 +02:00
Jean-Baptiste Onofré
0476091fee [AMQ-8394] Upgrade to shiro 1.8.0
(cherry picked from commit dc574d2a934df8b5bdb27de328934101e8d89b75)
2021-10-04 10:58:19 +02:00
Jean-Baptiste Onofré
7775fde002 [AMQ-8393] Upgrade to jackson 2.12.5
(cherry picked from commit 6dccfcd853b060b3526bcd199b05ed671adf257f)
2021-10-04 10:55:07 +02:00
Étienne H
bb3440658c upgrade jaxb-basics-version to 0.12.0
(cherry picked from commit 5d6c18f6362254c2d6ab2d95d44b743d87b82a5a)
2021-10-04 09:56:20 +02:00
Matt Pavlovich
dba95b7386 [AMQ-8359] Update slf4j to 1.7.32
(cherry picked from commit b515bbeeb9eceeaad2df8e28c2f58ff36d52d8b0)
2021-10-03 08:00:03 +02:00
Matt Pavlovich
a0080766ef [AMQ-8358] Update xstream to 1.4.18
(cherry picked from commit 7579f48e8a6f26f56b5027fa1813957e7ad67ac8)
2021-09-28 17:43:00 +02:00
Jean-Baptiste Onofré
a6556ae4a8 Use -fae for test execution on Jenkins 2021-08-23 18:24:16 +02:00
Jean-Baptiste Onofré
be8fc6e6eb [maven-release-plugin] prepare for next development iteration 2021-08-10 07:47:44 +02:00