Commit Graph

11286 Commits

Author SHA1 Message Date
JB Onofré 4ee15561d8 [AMQ-9264] Upgrade to maven-javadoc-plugin 3.5.0
(cherry picked from commit d25660aeaa)
2023-06-12 10:37:00 +02:00
Jean-Baptiste Onofré 661330a48b Upgrade to maven-bundle-plugin 5.1.9 2023-06-10 06:33:33 +02:00
JB Onofré 47343ba0ce [AMQ-9268] Upgrade to maven-source-plugin 3.3.0
(cherry picked from commit b6fc389838)
2023-06-08 17:35:08 +02:00
JB Onofré 0c9bf6d507 [AMQ-9263] Upgrade to maven-compiler-plugin 3.11.0
(cherry picked from commit e292f3b505)
2023-06-08 17:31:58 +02:00
JB Onofré 91ba342d94 [AMQ-9265] Upgrade to maven-plugin-plugin 3.9.0
(cherry picked from commit 580a1536ad)
2023-06-08 15:30:02 +02:00
Matt Pavlovich cda1007ef6 [AMQ-9257] Disabled expire message checking when pauseDispatch=true (#1005)
(cherry picked from commit 9a5b61f6a2)
2023-06-08 08:25:03 -05:00
JB Onofré 749e28d35e [AMQ-9266] Upgrade to maven-project-info-reports-plugin 3.4.5
(cherry picked from commit 3df605c37b)
2023-06-08 14:27:44 +02:00
JB Onofré 5ce4e38869 Update several maven plugins 2023-06-08 10:03:18 +02:00
JB Onofré e07950ba9d [AMQ-9260] Upgrade to maven-assembly-plugin 3.6.0
(cherry picked from commit 6dacd4875d)
2023-06-08 09:48:23 +02:00
Christopher L. Shannon 1707cc194b AMQ-9262 - Fix network subscriptions for composite consumers (#1014)
This fixes network subscriptions that are generated on demand when a
consumer uses composite destinations. Before this fix conduit
subscriptions didn't work correctly. This fix now splits up the
composite dest and generates correct demand for each of the individual
destinations.

(cherry picked from commit 901956d4dd)
2023-06-07 07:20:43 -04:00
JB Onofré 483a3687e7 [AMQ-9261] Upgrade to maven-enforcer-plugin 3.3.0
(cherry picked from commit e64d10d78b)
2023-06-07 11:06:53 +02:00
JB Onofré 101d69f8b6 [AMQ-9245] Upgrade to Spring 5.3.27
(cherry picked from commit c247b17fbf)
2023-06-06 14:16:36 +02:00
JB Onofré 81558fbed0 [AMQ-9246] Upgrade to Jettison 1.5.4
(cherry picked from commit 2a5213c681)
2023-06-01 07:50:59 +02:00
Christopher L. Shannon (cshannon) 6a64a0817e AMQ-9254 - Rework data file size validation and add unit test
This isolates the validation on data file length on read and adds unit
tests to verify we properly fallback to the real file length on initial
size check failure

(cherry picked from commit bcc74f93fe)
2023-05-03 06:08:00 -04:00
Matt Pavlovich 053589eb04 [#9254] DataFile readRecord fallback to OS file.length in rare edge case
(cherry picked from commit 3e61a200d0)
2023-05-03 06:08:00 -04:00
JB Onofré dd95b2d874 [AMQ-9231] Upgrade to Jetty 9.4.51.v20230217
(cherry picked from commit f96343da7c)
2023-03-14 06:22:09 +01:00
JB Onofré e3487c46db [AMQ-9226] Upgrade to log4j 2.20.0
(cherry picked from commit 3ae1d9af56)
2023-03-11 07:31:15 +01:00
Jean-Baptiste Onofré ebab05897a [maven-release-plugin] prepare for next development iteration 2023-02-22 06:36:53 +01:00
Jean-Baptiste Onofré 720570e967 [maven-release-plugin] prepare release activemq-5.17.4 2023-02-22 06:36:43 +01:00
Jean-Baptiste Onofré 90eb34727f Upgrade schema in preparation for 5.17.4 release 2023-02-22 06:31:16 +01:00
Christopher L. Shannon (cshannon) 50943caa6e AMQ-9217 - Fix IndividualDeadLetter strategy rollback
This fixes the rollback after the latest changes by using the
originalDestination property to look up the correct message audit on
rollback

(cherry picked from commit 459388185a)
2023-02-16 11:00:33 -05:00
Matt Pavlovich 47962eea25 [AMQ-9217] Fix per-destination audits on IndividualDeadLetterStrategy
(cherry picked from commit 28f7eb7ee8)
2023-02-16 11:00:27 -05:00
Jean-Baptiste Onofré b7925d8437 Update copyright to include 2023 2023-02-11 07:28:35 +01:00
JB Onofré 06354186b4 [AMQ-9197] Upgrade to prototype.js 1.7.3
(cherry picked from commit c425618a07)
2023-02-08 17:22:07 +01:00
Matt Pavlovich a976830e10 [AMQ-9205] Upgrade to Jackson 2.14.2 (#962)
(cherry picked from commit 97bfc67332)
2023-02-06 21:48:14 +01:00
Jean-Baptiste Onofré c11a92a852 [AMQ-9185] Define jolokia.conf system property in the wrapper
(cherry picked from commit ed0177e445)
2023-02-05 07:33:28 +01:00
Matt Pavlovich a8bf0ae69a [AMQ-9204] Upgrade to jetty 9.4.50.v20221201 (#961)
(cherry picked from commit 2a119d32e5)
2023-02-04 07:15:41 +01:00
Matt Pavlovich 48c73d9638 [AMQ-9207] Upgrade various dependencies (#964)
com.thoughtworks.xstream:xstream .................... 1.4.19 -> 1.4.20
commons-daemon:commons-daemon ......................... 1.3.2 -> 1.3.3
org.apache.ant:ant ................................ 1.10.12 -> 1.10.13
org.apache.shiro:shiro-core ......................... 1.10.1 -> 1.11.0
org.apache.shiro:shiro-spring ....................... 1.10.1 -> 1.11.0
org.codehaus.jettison:jettison ........................ 1.5.2 -> 1.5.3
regexp:regexp ............................................. 1.3 -> 1.5
org.apache.httpcomponents:httpclient ................ 4.5.13 -> 4.5.14
org.apache.httpcomponents:httpcore .................. 4.4.15 -> 4.4.16

- regexp/regexp -> jakarta-regexp/jakarta/regexp

(cherry picked from commit 34454567c8)
2023-02-04 06:14:57 +01:00
Michał Janczykowski b1f5d6beb3 [AMQ-9199] reordered imports
(cherry picked from commit 13ec5d5b7a)
2023-02-02 14:44:54 +01:00
Michał Janczykowski c5ecf53bdc [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.

(cherry picked from commit 7de7ba2aa9)
2023-02-02 14:44:33 +01:00
Matt Pavlovich ce7782a06f [AMQ-9206] Upgrade to Spring 5.3.25
(cherry picked from 0f5e5e6337)
2023-02-02 14:42:11 +01:00
Christopher L. Shannon (cshannon) 6d91d71c1a 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()

(cherry picked from commit ed924cddac)
2023-02-01 11:33:14 -05:00
Christopher L. Shannon (cshannon) bf65929fdc AMQ-9201 - Update Jolokia default access configuration
(cherry picked from commit 6120169e56)
2023-02-01 07:25:59 -05:00
Christopher L. Shannon (cshannon) 5e12551a4a 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.

(cherry picked from commit a083ff4d23)
2023-01-11 06:23:05 -05:00
Christopher L. Shannon (cshannon) 164568aab4 NO-JIRA - Set tests to rerun failing tests 2 times
This should help reduce failures from flaky tests and make the build
more reliable

(cherry picked from commit 1b9bd133fd)
2023-01-10 16:24:16 -05:00
Christopher L. Shannon (cshannon) 4ac6065ace AMQ-9192 - Fix flaky AdvisoryTests
Properly shutdown broker for each test and speed up tests by sending
less messages

(cherry picked from commit 044f5346e9)
2023-01-10 15:31:01 -05:00
Jean-Baptiste Onofré 5926eee624 [maven-release-plugin] prepare for next development iteration 2022-11-29 14:49:59 +01:00
Jean-Baptiste Onofré 80a5ee343f [maven-release-plugin] prepare release activemq-5.17.3 2022-11-29 14:49:50 +01:00
Jean-Baptiste Onofré de44ca68aa [AMQ-9176] Upgrade to Apache POM 28
(cherry picked from commit 43c7c7c227)
2022-11-29 14:02:06 +01:00
Jean-Baptiste Onofré 982b5d7792 Update spring.schemas in preparation for 5.17.3 release 2022-11-29 08:04:25 +01:00
Dmytro Chebotarskyi c35687052a Added additional logging on BrokerService startup
(cherry picked from commit dc55028c00)
2022-11-29 08:02:52 +01:00
Jean-Baptiste Onofré 3f6ffd30d2 [AMQ-9126] Set jolokia.conf sys prop and escape cleanly on Windows platform
(cherry picked from commit 49626f07b6)
2022-11-29 07:42:27 +01:00
Jean-Baptiste Onofré 60e79ed3d5 [AMQ-9102] Add http.nonProxyHost support in HTTP transport
(cherry picked from commit 44a5539afc)
2022-11-25 18:25:10 +01:00
Jean-Baptiste Onofré b5126f6e7b [AMQ-9062] Fix Web-ContextPath with Pax Web 8.0.x
(cherry picked from commit c563f6e355)
2022-11-22 08:58:55 +01:00
Endre Stølsvik 2de859f758 AMQ-8617: RedeliveryPolicy:Exponential Backoff + NonBlockingRedelivery = too long delays
(cherry picked from commit 393a696955)

Scenario on client:

1. Employing RedeliveryPolicy with exponential backoff (keeping maximum
redeliveries at default 6)
2. Enabled non-blocking redelivery
3. Receiving e.g. 100 consecutive poison messages (which eventually
should DLQ after max redeliveries)

This will result in massive redelivery delays due to a logic bug.

The reason is that redeliveryDelay is a field variable kept on the
ActiveMQMessageConsumer, instead of being a property on the message - or
that the redelivery delay was calculated per message based on the
redelivery count.

When consecutive messages rollbacks multiple times, the redeliveryDelay
field is continuously multiplied by the backoff multiplier, resulting in
enormous delays.

Fix: Ditch the field variable, instead calculating the redeliveryDelay
per delivery from the redelivery count. (This happens to be identical to
how it is done in afterRollback() in ActiveMQSession:1004.)

Test is added - which fails with the previous code, and passes with
this. Added a debug log line for the calculated delay.
2022-11-22 08:56:09 +01:00
Christopher L. Shannon (cshannon) 20dc305a49 AMQ-9175 - Properly set broker on ConnectionContext inside
MemoryTransactionStores

This fixes a NPE when using the messageDelivered advisory and
transactions

(cherry picked from commit f83c5f1ba1)
2022-11-21 11:12:07 -05:00
Jean-Baptiste Onofré e31a168aa7 [AMQ-9174] Upgrade to groovy 4.0.6
(cherry picked from commit 1228fc4421)
2022-11-21 14:20:22 +01:00
Jean-Baptiste Onofré 91d6ddd1aa [AMQ-9172] Upgrade to jettison 1.5.2
(cherry picked from commit c79b71c2e7)
2022-11-21 09:36:11 +01:00
Jean-Baptiste Onofré 8408595fc8 [AMQ-9171] Upgrade to shiro 1.10.1
(cherry picked from commit 42e1bf7467)
2022-11-20 17:11:27 +01:00
Jean-Baptiste Onofré b00655efb2 [AMQ-9131] Upgrade to xbean 4.22
(cherry picked from commit 421a2dedbf)
2022-11-20 07:18:50 +01:00