Commit Graph

11648 Commits

Author SHA1 Message Date
Matt Pavlovich afe9e8d1f3
Merge branch 'mattrpav-AMQ-9426' 2024-01-30 15:11:33 -06:00
Matt Pavlovich 7c76bd9673
[AMQ-9426] Upgrade jmdns 3.5.9 2024-01-30 15:10:03 -06:00
Matt Pavlovich 7b9d0aefd3
Merge branch 'mattrpav-AMQ-9422' 2024-01-30 14:59:41 -06:00
Matt Pavlovich bee30f002f
[AMQ-9422] 2024-01-29 Maven plugin dependency updates 2024-01-30 14:57:58 -06:00
Matt Pavlovich 4793da1902
Merge branch 'mattrpav-AMQ-9425' 2024-01-30 14:21:49 -06:00
Matt Pavlovich 164ec09f41
[AMQ-9425] Upgrade slf4j 2.0.11 2024-01-30 14:18:07 -06:00
Matt Pavlovich c0fcbf66a3
Merge branch 'mattrpav-AMQ-9423' 2024-01-30 14:12:16 -06:00
Matt Pavlovich 066fcdeeb2
[AMQ-9423] Upgrade Jetty 11.0.19 2024-01-30 14:07:21 -06:00
Matt Pavlovich 066a7363fd
Merge branch 'mattrpav-AMQ-9424' 2024-01-30 13:46:06 -06:00
Matt Pavlovich c17beb1767
[AMQ-9424] Upgrade Jackson 2.16.1 2024-01-30 09:00:49 -06:00
Christopher L. Shannon 38b6d86ff8
Merge pull request #1142 from cshannon/AMQ-9420
AMQ-9420 - Don't decrement KahaDB durable sub metrics on duplicate ack
2024-01-23 10:34:28 -05:00
Christopher L. Shannon (cshannon) a0b8a1fe55 revert unnecessary change 2024-01-23 10:19:04 -05:00
Christopher L. Shannon (cshannon) f73cf2aaab AMQ-9420 - Don't decrement KahaDB durable sub metrics on duplicate ack
This adds a check in case a duplicate ack is passed to the store to make
sure that the subscription statistics (if enabled) for a durable sub do
not have the metrics decremented a second time
2024-01-23 10:02:19 -05:00
Jean-Baptiste Onofré 0b95f93449 AMQ-9412: fix docker entrypoiint script 2024-01-21 16:40:55 +01:00
Matt Pavlovich 43f1399697 Merge branch 'mattrpav-AMQ-9344' 2024-01-18 08:30:04 -06:00
Matt Pavlovich 50baf95bff
[AMQ-9344] Add configurable limit to uncommitted transaction 2024-01-17 13:25:27 -06:00
Christopher L. Shannon a2bf5b8adb
Merge pull request #1141 from cshannon/javax-jakarta-exception-conversion
AMQ-9418 - Support converting javax jms exceptions to jakarta
2024-01-16 15:30:31 -05:00
Christopher L. Shannon (cshannon) be64fdba51 AMQ-9418 - Support converting javax jms exceptions to jakarta
This fixes the OpenWire v12 marshaller so that if an exception is
received by a javax based broker the client will convert back to a
jakarta jms exception type.
2024-01-16 15:20:44 -05:00
Matt Pavlovich a2d5d28c1f
Merge pull request #1138 from mattrpav/AMQ-9417
[AMQ-9417] Update activemq-client-jakarta description to mention 6.x …
2024-01-11 11:09:12 -06:00
Matt Pavlovich 4780d8e065
[AMQ-9417] Update activemq-client-jakarta description to mention 6.x specifically 2024-01-11 11:03:39 -06:00
JB Onofré 343e3de555 This closes #1129 2023-11-29 16:08:41 +01:00
huiyang 7d6362da73 Improve test reliability by resolving nondeterministic order of Json 2023-11-29 15:55:59 +01:00
JB Onofré aeab06e93e
Merge pull request #1135 from jbonofre/AMQ-9408
AMQ-9408: fix jolokia-access.xml loading in Windows wrapper
2023-11-29 15:32:13 +01:00
JB Onofré 285b75dc12
Merge pull request #1136 from jbonofre/AMQ-9405
AMQ-9405: fix Jetty examples about secure connector
2023-11-29 15:25:52 +01:00
JB Onofré 5cd4cd2c1b AMQ-9405: fix Jetty examples about secure connector 2023-11-29 14:02:04 +01:00
JB Onofré d48f8ba201 AMQ-9408: fix jolokia-access.xml loading in Windows wrapper 2023-11-29 10:56:33 +01:00
JB Onofré 4baf997a3c
Merge pull request #1132 from jbonofre/AMQ-9406
AMQ-9406: Upgrade to Camel 4.2.0
2023-11-28 15:17:17 +01:00
JB Onofré dd02f21958
Merge pull request #1133 from jbonofre/AMQ-9407
AMQ-9407: Upgrade to log4j 2.22.0
2023-11-28 15:07:12 +01:00
Jean-Baptiste Onofré 32b737f3fc AMQ-9407: Upgrade to log4j 2.22.0 2023-11-27 21:00:06 +01:00
Jean-Baptiste Onofré 14e7bdd409 AMQ-9406: Upgrade to Camel 4.2.0 2023-11-27 20:58:48 +01:00
JB Onofré 58867f7c3c
Merge pull request #1127 from hyteio/AMQ-9403
[AMQ-9403] Upgrade Jackson 2.16.0
2023-11-24 15:34:15 +01:00
Matt Pavlovich 3b44979dc3 [AMQ-9403] Upgrade Jackson 2.16.0 2023-11-22 09:28:30 -06:00
JB Onofré dcf86d3916
Merge pull request #1123 from hyteio/AMQ-9398
[AMQ-9398] Fix activemq-ra/activemq-rar namespaces for Jakarta EE
2023-11-22 13:59:46 +01:00
JB Onofré 3132858aec
Merge pull request #1126 from fpapon/AMQ-9402
[AMQ-9402] Upgrade to Shiro 1.13.0
2023-11-22 13:55:50 +01:00
JB Onofré 98c62f6568
Merge pull request #1125 from hyteio/AMQ-9401
[AMQ-9401] Minor doc update referencing javax instead of jakarta
2023-11-22 13:49:14 +01:00
JB Onofré d0e2cce18f
Merge pull request #1124 from hyteio/AMQ-9399
[AMQ-9399] Fix OSGi headers for activemq-cf and activemq-jms-pool
2023-11-22 13:47:38 +01:00
Matt Pavlovich 799b802581 [AMQ-9398] Fix activemq-ra/activemq-rar namespaces for Jakarta EE 2023-11-21 12:00:00 -06:00
francois papon c9d18665c3
[AMQ-9402] Upgrade to Shiro 1.13.0 2023-11-21 18:46:14 +01:00
Matt Pavlovich 74b31ff11c [AMQ-9401] Minor doc update referencing javax instead of jakarta 2023-11-21 11:31:25 -06:00
Matt Pavlovich c404783737 [AMQ-9399] Fix OSGi headers for activemq-cf and activemq-jms-pool 2023-11-21 11:28:14 -06:00
Matt Pavlovich b424e3ee29 [AMQ-9389] Add JDK 22, arm and Windows to Jenkins build options 2023-11-21 11:10:51 -06:00
JB Onofré 1747acaf03 Set version to 6.1.0-SNAPSHOT 2023-11-20 17:19:09 +01:00
JB Onofré dfd35d89f6 [maven-release-plugin] prepare for next development iteration 2023-11-14 08:13:24 +01:00
JB Onofré 14bac13f40 [maven-release-plugin] prepare release activemq-6.0.0 2023-11-14 08:13:14 +01:00
Jean-Baptiste Onofré 6172baff35 Cancel 6.0.0 release 2023-11-14 07:52:21 +01:00
Christopher L. Shannon cbe7c6a832
Merge pull request #1117 from cshannon/AMQ-9388
AMQ-9388 - Exclude activemq-client-jakarta from camel-activemq
2023-11-13 19:27:16 -05:00
Christopher L. Shannon (cshannon) 3013a3ab35 AMQ-9388 - Exclude activemq-client-jakarta from camel-activemq
The current version of camel pulls in the activemq-client-jakarta jar
which is not necessary as it no longer exists with ActiveMQ 6.0.0

Furthermore the version being pulled in is 5.18.2 which contains a
critical CVE that was fixed in 5.18.3
2023-11-13 17:43:24 -05:00
JB Onofré 464efe0e6f [maven-release-plugin] prepare for next development iteration 2023-11-12 06:35:12 +01:00
JB Onofré 26b14ec994 [maven-release-plugin] prepare release activemq-6.0.0 2023-11-12 06:34:58 +01:00
JB Onofré 9aedca0067
Merge pull request #1114 from jbonofre/AMQ-9296
AMQ-9296: Add authentication support in docker images
2023-11-12 06:08:33 +01:00