Commit Graph

11476 Commits

Author SHA1 Message Date
JB Onofré c86cd20029
Merge pull request #957 from mjanczykowski/bugfix/AMQ-9199
[AMQ-9199] Fixed race condition in creating store directory
2023-02-02 14:43:40 +01:00
JB Onofré 874c96f16a
Merge pull request #963 from mattrpav/AMQ-9206
[AMQ-9206] Upgrade to Spring 5.3.25
2023-02-02 14:41:29 +01:00
Matt Pavlovich 0f5e5e6337 [AMQ-9206] Upgrade to Spring 5.3.25 2023-02-01 14:22:32 -06:00
Matt Pavlovich 3058e8fab6 [AMQ-9203] Upgrade various maven plugins
[INFO]   maven-antrun-plugin ................................ 3.0.0 -> 3.1.0
[INFO]   maven-assembly-plugin .............................. 3.3.0 -> 3.4.2
[INFO]   maven-enforcer-plugin .............................. 3.1.0 -> 3.2.1
[INFO]   maven-jar-plugin ................................... 3.2.2 -> 3.3.0
[INFO]   maven-javadoc-plugin ............................... 3.3.2 -> 3.4.1
[INFO]   maven-plugin-plugin ................................ 3.6.4 -> 3.7.1
[INFO]   maven-project-info-reports-plugin .................. 3.4.0 -> 3.4.2
[INFO]   maven-release-plugin ......................... 3.0.0-M5 -> 3.0.0-M7
[INFO]   maven-surefire-plugin ........................ 3.0.0-M6 -> 3.0.0-M8
[INFO]   org.apache.rat:apache-rat-plugin ..................... 0.13 -> 0.15
[INFO]   org.owasp:dependency-check-maven ................... 7.1.1 -> 8.0.2
2023-02-01 14:04:39 -06:00
Christopher L. Shannon 3f68f49939
Merge pull request #959 from cshannon/AMQ-9202
AMQ-9202 - Make sure Reentrant locks are acquired outside a try block
2023-02-01 11:32:35 -05:00
Christopher L. Shannon (cshannon) ed924cddac AMQ-9202 - Make sure Reentrant locks are acquired outside a try block
This is best practice and will prevent unlock from being attempted
inside of a finally block when the thread doesn't actually own the
lock which can happen when the lock attempt throws an exception
such as calling lockInterruptibly()
2023-02-01 11:19:24 -05:00
Christopher L. Shannon d8ce1d9ff0
Merge pull request #958 from cshannon/AMQ-9201
AMQ-9201 - Update Jolokia default access configuration
2023-02-01 07:23:11 -05:00
Christopher L. Shannon (cshannon) 6120169e56 AMQ-9201 - Update Jolokia default access configuration 2023-02-01 07:04:56 -05:00
Michał Janczykowski 13ec5d5b7a [AMQ-9199] reordered imports 2023-01-17 12:26:21 +01:00
Michał Janczykowski 7de7ba2aa9 [AMQ-9199] Fixed race condition in creating store directory
A store directory is created by MessageDatabase#getPageFile which
is called in two cases:
1. KahaDBStore.start() when creating a queue
2. KahaDBStore.size() which is performed when sending any persistent message

If both methods are called concurrently it's possible to get an IOException
thrown from the IOHelper.mkdirs method.
2023-01-17 12:20:53 +01:00
Matt Pavlovich c58286487d
[#8133] Add s390x as a parameter for Jenkins (#956) 2023-01-14 14:14:00 -06:00
Matt Pavlovich 8ba765bbaf
[#9194] Add JDK 19 to Jenkins build (#955) 2023-01-12 09:06:29 -06:00
Christopher L. Shannon (cshannon) a083ff4d23 AMQ-9193 - Improve broker shutdown in unit tests
This should improve test reliability for the unit tests so brokers don't
hang around after the end of a test on error. Also increase the surefire
re-run count to 3 times before failing.
2023-01-11 06:21:21 -05:00
Christopher L. Shannon 05ffe8aca0
Merge pull request #954 from cshannon/rerun-tests
NO-JIRA - Set tests to rerun failing tests 2 times
2023-01-10 16:22:43 -05:00
Christopher L. Shannon (cshannon) 1b9bd133fd NO-JIRA - Set tests to rerun failing tests 2 times
This should help reduce failures from flaky tests and make the build
more reliable
2023-01-10 15:35:16 -05:00
Christopher L. Shannon 362d28cddf
Merge pull request #951 from cshannon/AMQ-9192
AMQ-9192 - Fix flaky AdvisoryTests
2023-01-10 15:29:10 -05:00
Christopher L. Shannon (cshannon) 044f5346e9 AMQ-9192 - Fix flaky AdvisoryTests
Properly shutdown broker for each test and speed up tests by sending
less messages
2023-01-10 12:29:33 -05:00
Jean-Baptiste Onofré 95bb3f3f49
Merge pull request #945 from jbonofre/AMQ-9176
[AMQ-9176] Upgrade to Apache POM 28
2022-11-29 14:01:40 +01:00
Jean-Baptiste Onofré 43c7c7c227 [AMQ-9176] Upgrade to Apache POM 28 2022-11-29 08:42:15 +01:00
Jean-Baptiste Onofré 8523eaeb07 Update spring.schemas 2022-11-29 08:06:21 +01:00
Jean-Baptiste Onofré 424be3ee8d This closes #943 2022-11-29 08:02:13 +01:00
Dmytro Chebotarskyi dc55028c00 Added additional logging on BrokerService startup 2022-11-29 07:51:20 +01:00
Jean-Baptiste Onofré 726cc68078
Merge pull request #944 from jbonofre/AMQ-9126
[AMQ-9126] Set jolokia.conf sys prop and escape cleanly on Windows platform
2022-11-29 07:41:43 +01:00
Jean-Baptiste Onofré 49626f07b6 [AMQ-9126] Set jolokia.conf sys prop and escape cleanly on Windows platform 2022-11-28 18:41:55 +01:00
Jean-Baptiste Onofré a530142fd5
Merge pull request #942 from jbonofre/AMQ-9102
[AMQ-9102] Add http.nonProxyHost support in HTTP transport
2022-11-25 18:24:14 +01:00
Jean-Baptiste Onofré 44a5539afc [AMQ-9102] Add http.nonProxyHost support in HTTP transport 2022-11-22 13:59:08 +01:00
Jean-Baptiste Onofré 75e6c5bddc
Merge pull request #941 from jbonofre/AMQ-9062
[AMQ-9062] Fix Web-ContextPath with Pax Web 8.0.x
2022-11-22 08:56:43 +01:00
Jean-Baptiste Onofré 9852cf1f49
Merge pull request #843 from stolsvik/main
AMQ-8617: RedeliveryPolicy:Exponential Backoff + NonBlockingRedelivery = too long delays
2022-11-22 08:55:43 +01:00
Christopher L. Shannon (cshannon) f83c5f1ba1 AMQ-9175 - Properly set broker on ConnectionContext inside
MemoryTransactionStores

This fixes a NPE when using the messageDelivered advisory and
transactions
2022-11-21 11:03:08 -05:00
Jean-Baptiste Onofré c563f6e355 [AMQ-9062] Fix Web-ContextPath with Pax Web 8.0.x 2022-11-21 14:51:45 +01:00
Jean-Baptiste Onofré 56d89303bd
Merge pull request #938 from jbonofre/AMQ-9174
[AMQ-9174] Upgrade to groovy 4.0.6
2022-11-21 14:19:28 +01:00
Jean-Baptiste Onofré 066aca6274
Merge pull request #939 from jbonofre/AMQ-9172
[AMQ-9172] Upgrade to jettison 1.5.2
2022-11-21 09:35:12 +01:00
Jean-Baptiste Onofré 1228fc4421 [AMQ-9174] Upgrade to groovy 4.0.6 2022-11-20 17:13:10 +01:00
Jean-Baptiste Onofré c79b71c2e7 [AMQ-9172] Upgrade to jettison 1.5.2 2022-11-20 17:12:46 +01:00
Jean-Baptiste Onofré c6e8267d4a
Merge pull request #940 from jbonofre/AMQ-9171
[AMQ-9171] Upgrade to shiro 1.10.1
2022-11-20 17:10:46 +01:00
Jean-Baptiste Onofré 42e1bf7467 [AMQ-9171] Upgrade to shiro 1.10.1 2022-11-20 07:44:11 +01:00
Jean-Baptiste Onofré 9381c67003
Merge pull request #936 from jbonofre/AMQ-9132
[AMQ-9132] Upgrade to mockito 4.8.1
2022-11-20 07:19:32 +01:00
Jean-Baptiste Onofré 20b6f3e3e1
Merge pull request #924 from jbonofre/AMQ-9131
[AMQ-9131] Upgrade to xbean 4.22
2022-11-20 07:18:24 +01:00
Jean-Baptiste Onofré e2b8e27f4c [AMQ-9132] Upgrade to mockito 4.8.1 2022-11-20 07:13:25 +01:00
Jean-Baptiste Onofré 421a2dedbf [AMQ-9131] Upgrade to xbean 4.22 2022-11-20 06:52:41 +01:00
Jean-Baptiste Onofré c8362b97f8
Merge pull request #934 from jbonofre/AMQ-9164
[AMQ-9164] Upgrade to jackson 2.14.0
2022-11-18 11:14:54 +01:00
Christopher L. Shannon (cshannon) 9f9a35eb29 AMQ-9157 - Add missing dispatched advisory topic to getAllDestinationAdvisoryTopics() method in AdvisorySupport
Adds missing dispached advisory topics to getAllDestinationAvisoryTopics()
method in AdvisorySupport which is used to clean up on destination removal
and also a note about virtual destination consumer advisories
2022-11-17 14:39:42 -05:00
Christopher L. Shannon (cshannon) f6e26085cf AMQ-9159 - Add a test case to verify inflight message stats for wildcard
consumer when a destination is removed
2022-11-17 09:02:43 -05:00
Jean-Baptiste Onofré 2b81946e34
Merge pull request #935 from jbonofre/AMQ-9120
[AMQ-9120] Upgrade to shiro 1.10.0
2022-11-17 05:03:57 +01:00
Jean-Baptiste Onofré a562b99431 [AMQ-9164] Upgrade to jackson 2.14.0 2022-11-16 18:49:43 +01:00
Jean-Baptiste Onofré f93c0ec4ee [AMQ-9120] Upgrade to shiro 1.10.0 2022-11-16 18:48:29 +01:00
Christopher L. Shannon (cshannon) b6540746a2 NO-JIRA: Add timeout for flaky test 2022-11-16 12:46:05 -05:00
Christopher L. Shannon (cshannon) 757a712890 AMQ-9168 - Send message expired advisory and not discard advisory when
Topic subscriptions expire a message

This fixes topic subs to send the right advisory type, if enabled, when
the server discards a message on dispatch to a topic sub. Also add some
more expiration tests for other subscription types
2022-11-16 06:43:21 -05:00
Christopher L. Shannon (cshannon) 8554a1464c (AMQ-9156, AMQ-9167) - Update TopicSubscription to use a new counter for
current dispatched count

The previous way of computing the count of using total dispatched minus
total dequeued didn't work in the case of destination removal and
messages were not acked. The counter is needed as the dispatched list is
optional unlike prefetch subs.
2022-11-15 16:59:01 -05:00
Christopher L. Shannon (cshannon) 85502a526d AMQ-9157 - Dispatched advisory should not fire for queue browsers
The dispatched advisory doesn't really make sense to send for queue
browsers, just like we don't send a consumed advisory, as it's more of
an admin type funtion to look at the contents of a queue but it's not a
real consumer that is receiving and acking messages.
2022-11-15 10:13:45 -05:00