10180 Commits

Author SHA1 Message Date
Jean-Baptiste Onofré
eb7f50316e [AMQ-7380] Upgrade to commons-pool2 2.8.0
(cherry picked from commit f9fd5f459ee4e9c540619adf614399f44fdea0f1)
2020-02-03 16:19:38 +01:00
Colm O hEigeartaigh
7793a952e2 AMQ-7231 - Fix XSS in WebConsole
(cherry picked from commit 81bd743eaa243f0cc5dfbb1342cee1fef1fc5df2)
2020-02-03 16:16:01 +01:00
Jean-Baptiste Onofré
47be319b39 [AMQ-7391] Minor typo fixed
Credit: Alexandre Fruchaud <mmacphail>

(cherry picked from commit 85851f7ce830b64392e1a63cd5d8c20b4ca35125)
2020-01-28 10:48:22 +01:00
Jean-Baptiste Onofré
63675b493b [AMQ-7389] Upgrade to jasypt 1.9.3
(cherry picked from commit afe67ddb6981c186e35ac0fdad7309fe4605dfac)
2020-01-27 13:45:43 +01:00
Colm O hEigeartaigh
dae85b3dcc AMQ-7142 - Inserting Bouncy Castle Provider Early in Java Security Provider Chain Breaks KeyStore Loading
(cherry picked from commit 127852d2e7098436e99c573bc7b30e3facdb634b)
2020-01-27 13:42:42 +01:00
Colm O hEigeartaigh
59756ff85b AMQ-7348 - Update Apache Shiro
(cherry picked from commit 46b3dfa9429af793ce76b2615b20e9e62a4c833a)
2020-01-27 09:28:33 +01:00
Colm O hEigeartaigh
ba75732639 AMQ-7349 - Update some javascript libraries
(cherry picked from commit 23b21105e8bd97db250f2df0d5a3aa328e9083b5)
2020-01-27 09:26:57 +01:00
Colm O hEigeartaigh
40d5b9131a [AMQ-7357] Update to Pax URL 2.6.2
(cherry picked from commit 0891526c26bd2f549dc6f3271466cd392a752068)
2020-01-23 08:13:58 +01:00
Colm O hEigeartaigh
48bbc9e288 AMQ-7375 - Update Spring
(cherry picked from commit 696561c4bc1680f6714d52e017947c22ef98d46d)
2020-01-23 05:45:59 +01:00
Colm O hEigeartaigh
0fc5227c02 AMQ-7373 - Updating Jolokia
(cherry picked from commit 08267c4f67426509eacb91993849c0eca07d962ct)
2020-01-22 13:45:15 +01:00
Timothy Bish
0f5e113af8 AMQ-7365 Update Qpid JMS and proton-j to latest releases
Update to Qpid JMS 0.48.0 and proton-j 0.33.3

(cherry picked from commit d41658715bba77aaa56f46b4b2a0c0adc1107961)
2019-12-11 12:55:33 -05:00
Christopher L. Shannon (cshannon)
34101937e0 AMQ-7352 - Add support for anonymous producer advisories
By default this behavior is turned off but can be enabled by setting
anonymousProducerAdvisorySupport on the BrokerService to true

(cherry picked from commit 0c6f9a9a1e253d50dac6b265f04c0a458ac535ee)
2019-11-22 13:37:18 -05:00
Jean-Baptiste Onofré
a8dd09074b [maven-release-plugin] prepare for next development iteration 2019-11-20 17:00:29 +01:00
Jean-Baptiste Onofré
40c6ea515e [maven-release-plugin] prepare release activemq-5.15.11 activemq-5.15.11 2019-11-20 17:00:05 +01:00
Jean-Baptiste Onofré
501223afdd Fix build of ActiveMQ OSGi bundle 2019-11-20 16:51:46 +01:00
Jean-Baptiste Onofré
af72eb1850 NO-JIRA: Add schemas for 5.15.11 2019-11-19 15:37:41 +01:00
Jean-Baptiste Onofré
a152a6c327 [AMQ-7329] Fix exclusion in activemq-osgi
(cherry picked from commit ce0fc359ef6868f3d58cb88a34d0cfb0ec2b668e)
2019-11-19 11:23:28 +01:00
Jean-Baptiste Onofré
abc37071d7 [AMQ-7008] Add index on messages table to speed up browsing
(cherry picked from commit 3c10f6ef863f0eac713de0869c753cee5b607dae)
2019-11-19 11:14:38 +01:00
Jean-Baptiste Onofré
d7f5a9d01e [AMQ-7345] Upgrade to jackson-databind 2.9.10.1
(cherry picked from commit 6cf846e0509ddedbd2d3d1f5697b07e5ff36a8a0)
2019-11-18 21:55:15 +01:00
Jean-Baptiste Onofré
ac48fa7429 [AMQ-7310] Upgrade to Tomcat API 9.0.27
(cherry picked from commit 43ffe7eac85f7e84f74011c5fbafd57bed3dcfe0)
2019-11-18 21:22:23 +01:00
Jean-Baptiste Onofré
8434f86de8 [AMQ-7252] Upgrade to Velocity 2.1
(cherry picked from commit 4f07dc5b49fbdc422349abc10c89323fdbdce059)
2019-11-18 21:19:59 +01:00
asutosh936
86e09813ae AMQ-6905 : Upgraded ActivationConfigProperty as per API Documentation
(cherry picked from commit a1f15f45111aacdde2ff883116d32aa8c14e4adc)
2019-11-18 17:49:39 +01:00
Pascal Schumacher
dbec15b21d BrokerService: fix typo in field and parameter name
(cherry picked from commit ecb404b3ebf66a9d2182f28312cb0664d44814b3)
2019-11-18 17:45:00 +01:00
Jean-Baptiste Onofré
47b4f9f238
Merge pull request #277 from amarkevich/activemq-5.15.x
[AMQ-6556] Support system property proxy settings for HTTP(S) client
2019-11-18 17:05:44 +01:00
Ilya Shipitsin
0b28cb5aee AMQ-6904 add overrides for ms sql
(cherry picked from commit ee9921bd970e84a1ef1dc7497f152b5fc23754e7)
2019-11-18 17:03:22 +01:00
Jean-Baptiste Onofré
a393b8c106
Merge pull request #280 from alvinlin123/amq-6908
AMQ-6908 Use WebClient in QueueBrowseQuery
2019-11-18 16:59:49 +01:00
saivr1t
fd61bb62bd AMQ-6963 Fix calling the toString() method in case of different log level.
(cherry picked from commit 191e4ffbe6ce863980f6d239c49589055dd5535b)
2019-11-18 05:51:02 +01:00
Sean C. Sullivan
86f2dcebf7 maven-compiler-plugin 3.8.1
(cherry picked from commit 06af6c3e489e53c38a330d881badc9e14c5d6b64)
2019-11-18 05:43:16 +01:00
amarkevich
b1ba575037 AMQ-7069 HTTP client don't handle XStream deserialization exception
(cherry picked from commit b830894e690d317ba32019c00d7d4db01eadcc5d)
2019-11-17 17:44:24 +01:00
Johannes Bäurle
614e55d04e [AMQ-7068] Advisory messages are empty when received with a AMQP subscription (#312)
(cherry picked from commit 6f338aa2817c221c16b6a97b7d3377daeaf42726)
2019-11-17 17:40:51 +01:00
Hoan Nguyen
4fb925d915 close DataByteArrayOutputStream buff of WriteBatch
(cherry picked from commit 0262338687d7bf811ad9ee0620f77806bd7e08ad)
2019-11-17 06:46:28 +01:00
Jean-Baptiste Onofré
a6a83b50e1 [AMQ-7327] Updated unit test around maxFrameSize support on the http transport connector
(cherry picked from commit 397ede661f505eac82cebcd63e40c06925a7889d)
2019-11-12 17:33:35 +01:00
Jean-Baptiste Onofré
006efab559 [AMQ-7327] Use maxFrameSize to limit HTTP content length
(cherry picked from commit 50a94cbf12f6a4b9d623b07515b9fd86c53efb13)
2019-11-12 17:31:48 +01:00
Jean-Baptiste Onofré
8212b69fa9 [AMQ-7301] Don't display stack trace on connection error, just the cause 2019-11-12 15:18:18 +01:00
Colm O hEigeartaigh
6675ddfe28 AMQ-7339 - Fix possible XSS attack in the HttpTunnelServlet
(cherry picked from commit 7441c6b6035e4a86d6a32b39445d75a33802ec3e)
2019-11-08 14:45:28 +01:00
Jean-Baptiste Onofré
23a8f2e2fc Revert "[AMQ-7333] Upgrade to Camel 2.24.2"
This reverts commit 225018c3d0e3d7546e7bdd00ffd20452d25b6b5e.
2019-11-08 10:43:00 +01:00
Colm O hEigeartaigh
0325fd2eff Update owasp plugin (and enable it to run correctly)
(cherry picked from commit 222edf4756fc9fca29f234dcfcafbf41b1de11e5)
2019-11-06 13:58:03 +01:00
Timothy Bish
1b9c21a8ce AMQ-7335 Update Qpid JMS to 0.47.0 netty to 4.1.43.Final
(cherry picked from commit 0c0e8061fb19b8341c684124a4ebf02e30e70cf3)
2019-11-05 11:40:50 -05:00
Jean-Baptiste Onofré
f851abd5d1 [AMQ-7321] Reduce the number of messages in MQTT SSL offline test to limit timing issue
(cherry picked from commit d340e0902b8abf6c551486306c1db1dbe3562b9b)
2019-11-03 15:19:38 +01:00
Colm O hEigeartaigh
f3112be3e0 AMQ-7295 - Update JTA spec
(cherry picked from commit 892c9e2a2d3962232a3a17a0a321e09d5d0df615)
2019-11-02 07:14:41 +01:00
Jean-Baptiste Onofré
225018c3d0 [AMQ-7333] Upgrade to Camel 2.24.2
(cherry picked from commit 5568a09c3c1cd4a33d1ef8e9ae254996b650225d)
2019-11-02 07:12:00 +01:00
Jean-Baptiste Onofré
1e5a90a912 [AMQ-7332] Upgrade to ant 1.10.7
(cherry picked from commit d50ab4b36625781e5a4b32de525445601a050ac2)
2019-11-02 07:10:13 +01:00
Jean-Baptiste Onofré
978acba43c [AMQ-7331] Upgrade to commons-daemon 1.2.2
(cherry picked from commit a127d5cef62d0836cc4f3e0cd7c461533eb8c001)
2019-11-02 06:15:01 +01:00
Jean-Baptiste Onofré
c03d24e50d [AMQ-7324] Upgrade to commons-dbcp2 2.7.0 and commons-pool2 2.7.0
(cherry picked from commit 45601effea244927018d1b12db2df235574b738e)
2019-11-01 08:13:47 +01:00
Jean-Baptiste Onofré
44f6779b2b [AMQ-7330] Upgrade to Jetty 9.4.22.v20191022
(cherry picked from commit ed17d6284373188576f0fb0276dd1763766181cb)
2019-11-01 06:29:22 +01:00
Jean-Baptiste Onofré
3041623cd7 [AMQ-7323] Upgrade to rome 1.12.2
(cherry picked from commit c5db284c4783bfe48e5479ea7b3ac79d176343a1)
2019-10-30 17:27:56 +01:00
J. Lewis Muir
d3be100dbf Improve activemq init JAVACMD auto detection
If JAVACMD is set to "auto" (the default from the "env" file) and
the current working directory contains a directory named "auto", the
activemq init script will incorrectly detect the "auto" directory as the
"java" binary thus leaving JAVACMD set to "auto" which is incorrect and
will obviously fail to execute the Java VM.

To fix this, in the second attempt to detect the "java" binary, repeat
the tests for a zero-length JAVACMD or a JAVACMD equal to "auto" before
testing whether JAVACMD does not exist or is not executable.  This is
necessary because when JAVA_HOME's length is zero, the first attempt to
detect the location of the "java" binary will not set JAVACMD (so it
will still be "auto" when it reaches the second auto-detection attempt).

(cherry picked from commit 3df12a15b1a21747ac51548e7be95ba72e55d449)
2019-10-18 19:11:43 +02:00
Dany LECOQ
1d8ae314bd AMQ-7312 virtualSelectorCacheBrokerPlugin addConsumer issue
(cherry picked from commit 86a069ac5db9742ae58e396e162a0b3e2bdc66c3)
2019-10-18 19:10:03 +02:00
Gabriel Medeiros Coelho
9c994d98cf Remove out-of-bounds index comparison
(cherry picked from commit 44cae0e8733d2fa6780067c41d915a2f2e70fc04)
2019-10-18 19:07:29 +02:00
Colm O hEigeartaigh
506ededc32 AMQ-7130 Update AMQ doap
(cherry picked from commit d525096cac444189c2d233e1de47342f1916c82d)
2019-10-18 19:06:06 +02:00