Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update branch up to OSS 6.1.4, included post release commit and update poms to 6.1.5-TT.1-SNAPSHOT #98

Merged
merged 52 commits into from
Dec 2, 2024
Merged

Update branch up to OSS 6.1.4, included post release commit and update poms to 6.1.5-TT.1-SNAPSHOT #98

merged 52 commits into from
Dec 2, 2024

Commits on Nov 29, 2024

  1. AMQ-9493: Upgrade to maven-plugin-plugin 3.13.1 

    (cherry picked from commit 7b49d0c)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    4cd12ae View commit details
    Browse the repository at this point in the history

  2. AMQ-9547 - Remove setLength() and usage from RecoverableRandomAccessFile 

    This method always throws an exception so it should be removed and no
longer used. Places in PageFile that called the method have been updated
to either remove the usage or throw an error.

(cherry picked from commit 5f79b65)
    @cshannon @cesarhernandezgt
    cshannon authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    102643e View commit details
    Browse the repository at this point in the history

  3. AMQ-8398 - Fix Stomp to OpenWire UTF-8 translation 

    This commit fixes conversion of messages that are sent or received
using Stomp when the body contains characters that require 4 bytes
for encoding using standard UTF-8.

ActiveMQ and OpenWire currently use a modified UTF-8
encoding that only uses 3 bytes so the conversion previously was
breaking because the body was encoded using standard JDK UTF-8 encoding
and set directly on an ActiveMQText message which was leading to
decoding errors later when the ActiveMQMessage tried to decode using the
modified encoder. The reverse was also was true and was breaking
in some cases.

The fix now makes sure to correctly decode the Stomp message back to a
String first and set that on the ActiveMQ message so it can be
re-encoded correctly. The reverse is fixed as well so both
conversion from Stomp -> OpenWire and OpenWire -> Stomp work. Tests have
been added for Stomp -> OpenWire, OpenWire -> Stomp, and Stomp -> Stomp
which is really Stomp -> OpenWire -> Stomp.

(cherry picked from commit 3ddf515)
    @cshannon @cesarhernandezgt
    cshannon authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    2f44e8d View commit details
    Browse the repository at this point in the history

  4. AMQ-8398 - Fix Stomp to Stomp Unicode UTF-8 test 

    The connection receive was out of order and causing failures in some of
the Stomp tests like StompNIOSSL

(cherry picked from commit f5fb6c9)
    @cshannon @cesarhernandezgt
    cshannon authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    8860dce View commit details
    Browse the repository at this point in the history

  5. AMQ-8398 - Add missing super.tearDown() call to Stomp NIOSSLLargeMess… 

    …ageTest

(cherry picked from commit f914001)
    @azotcsit @cesarhernandezgt
    azotcsit authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    f3cf668 View commit details
    Browse the repository at this point in the history

  6. Set cache-control to no-store by default for stronger security 

    (cherry picked from commit 2dab161)
    @kenliao94 @cesarhernandezgt
    kenliao94 authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    b1545e2 View commit details
    Browse the repository at this point in the history

  7. AMQ-9557: Upgrade to commons-logging 1.3.4 

    (cherry picked from commit 254d0fa)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    bdc928d View commit details
    Browse the repository at this point in the history

  8. AMQ-9510: Upgrade to jmock 2.13.1 

    (cherry picked from 6001e81)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    b21deae View commit details
    Browse the repository at this point in the history

  9. AMQ-9491: Upgrade to ASM 9.7 

    (cherry picked from commit f03443e)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    bf53eb8 View commit details
    Browse the repository at this point in the history

  10. Remove JDK_JAVA_OPTIONS usage in wrapper.conf. Moved to wrapper.java.… 

    …additional.x options.

(cherry picked from commit f1379cd)
    @cesarhernandezgt
    Paul Gale authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    177fe60 View commit details
    Browse the repository at this point in the history

  11. AMQ-8122 - Fix DataByteArrayInputStreamTest 

    (cherry picked from commit 736eb46)
    @azotcsit @cesarhernandezgt
    azotcsit authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    bd992a2 View commit details
    Browse the repository at this point in the history

  12. AMQ-9568: Upgrade to ant 1.10.15 

    (cherry picked from commit a86cee6)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    b074fd1 View commit details
    Browse the repository at this point in the history

  13. AMQ-9567: Upgrade to jmdns 3.5.12 

    (cherry picked from commit ada4041)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    9a50af7 View commit details
    Browse the repository at this point in the history

  14. AMQ-9494: Upgrade to maven-source-plugin 3.3.1 

    (cherry-picked from commit 7bc8b67)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    789cb9c View commit details
    Browse the repository at this point in the history

  15. AMQ-9495: Upgrade to maven-assembly-plugin 3.7.1 

    (cherry picked from commit 1428cf8)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    3bf6d49 View commit details
    Browse the repository at this point in the history

  16. AMQ-9496: Upgrade to maven-compiler-plugin 3.13.0 

    (cherry picked from commit 3d36570)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    2c62c64 View commit details
    Browse the repository at this point in the history

  17. AMQ-9576: Upgrade to maven-clean-plugin 3.4.0 

    (cherry picked from fba0a2e)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    bb18dec View commit details
    Browse the repository at this point in the history

  18. AMQ-9574: Upgrade to commons-io 2.17.0 

    (cherry picked from commit c33cdaf)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    ad35f00 View commit details
    Browse the repository at this point in the history

  19. AMQ-9577: Upgrade to maven-enforcer-plugin 3.5.0 

    (cherry picked from commit 50a73f9)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    70d2f8c View commit details
    Browse the repository at this point in the history

  20. AMQ-9579: Upgrade to maven-javadoc-plugin 3.10.0 

    (cherry picked from commit 4d0eb77)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    d76c634 View commit details
    Browse the repository at this point in the history

  21. AMQ-9578: Upgrade to maven-jar-plugin 3.4.2 

    (cherry picked from commit 8613198)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    06490ad View commit details
    Browse the repository at this point in the history

  22. AMQ-9580: Upgrade to maven-project-info-reports-plugin 3.7.0 

    (cherry picked from commit 4d75b20)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    9f5338f View commit details
    Browse the repository at this point in the history

  23. AMQ-9581: Upgrade to maven-release-plugin 3.1.1 

    (cherry picked from commit d2ae90d)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    f1ed21d View commit details
    Browse the repository at this point in the history

  24. AMQ-9582: Upgrade to maven-surefire-plugin 3.5.0 

    (cherry picked from commit ee271b6)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    a1ea7ba View commit details
    Browse the repository at this point in the history

  25. AMQ-9583: Upgrade to build-helper-maven-plugin 3.6.0 

    (cherry picked from commit ccfb85f)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    ebde181 View commit details
    Browse the repository at this point in the history

  26. AMQ-9584: Upgrade to javacc-maven-plugin 3.1.0 

    (cherry picked from commit d2b4f6f)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    cc7ff5d View commit details
    Browse the repository at this point in the history

  27. AMQ-9585: Upgrade to taglist-maven-plugin 3.1.0 

    (cherry picked from commit 47ee619)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    72be048 View commit details
    Browse the repository at this point in the history

  28. [AMQ-9595] Fix recoverNextMessages when there are messages consumed f… 

    …arther than maxBatchSize.

(cherry picked from commit 6b08e10)
    @NikitaShupletsov @cesarhernandezgt
    NikitaShupletsov authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    d55d3c6 View commit details
    Browse the repository at this point in the history

  29. AMQ-9614: Upgrade to cxf-xjc-plugin 4.0.2 

    (cherry picked from commit 175b184)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    f831abf View commit details
    Browse the repository at this point in the history

  30. AMQ-9615: Upgrade to maven-shade-plugin 3.6.0 

    (cherry picked from commit 82a298d)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    fc689df View commit details
    Browse the repository at this point in the history

  31. AMQ-9613: Upgrade to xbean 4.26 

    (cherry picked from commit 9f6a100)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    b077628 View commit details
    Browse the repository at this point in the history

  32. AMQ-9612: Upgrade to dependency-check-maven 11.0.0 

    (cherry picked from commit 75114d7)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    39dbfa1 View commit details
    Browse the repository at this point in the history

  33. AMQ-9611: Upgrade to taglist-maven-plugin 3.2.1 

    (cherry picked from commit 0dc6fdb)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    4820b57 View commit details
    Browse the repository at this point in the history

  34. AMQ-9610: Upgrade to maven-surefire-plugin 3.5.1 

    (cherry picked from commit 2a884a4)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    281b621 View commit details
    Browse the repository at this point in the history

  35. AMQ-9609: Upgrade to maven-project-info-reports-plugin 3.8.0 

    (cherry picked from commit 987805e)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    3c48dfe View commit details
    Browse the repository at this point in the history

  36. AMQ-9608: Upgrade to maven-plugin-plugin 3.15.1 

    (cherry picked from commit 01f3b60)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    00d4515 View commit details
    Browse the repository at this point in the history

  37. AMQ-9607: Upgrade to maven-javadoc-plugin 3.10.1 

    (cherry picked from commit d9e3ee9)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    3512867 View commit details
    Browse the repository at this point in the history

  38. AMQ-9605: Upgrade to ASM 9.7.1 

    (cherry picked from commit dc998fb)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    36c0c90 View commit details
    Browse the repository at this point in the history

  39. AMQ-9604: Upgrade to Camel 4.8.1 

    (cherry picked from commit d206c53)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    0858dfb View commit details
    Browse the repository at this point in the history

  40. AMQ-9603: Upgrade to Jackson 2.18.0 

    (cherry picked from commit b1a18b4)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    af0cae1 View commit details
    Browse the repository at this point in the history

  41. AMQ-9612: Upgrade to dependency-check-maven 11.1.0 

    (cherry picked from commit b28d9e6)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    1309348 View commit details
    Browse the repository at this point in the history

  42. AMQ-9603: Upgrade to Jackson 2.18.1 

    (cherry picked from commit 1fddeda)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    c70c594 View commit details
    Browse the repository at this point in the history

  43. Update spring.schemas version in preparation for 6.1.4 release

    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    bc82c8c View commit details
    Browse the repository at this point in the history

  44. AMQ-9618: Upgrade to velocity 2.4.1 

    (cherry picked from commit 6a4d925)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    e3fdd5e View commit details
    Browse the repository at this point in the history

  45. AMQ-9619: Upgrade to groovy 4.0.23 

    (cherry picked from commit 5bdec7b)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    345fd0d View commit details
    Browse the repository at this point in the history

  46. AMQ-9620: Upgrade to maven-javadoc-plugin 3.11.1 

    (cherry picked from commit c41acb9)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    8cfabea View commit details
    Browse the repository at this point in the history

  47. AMQ-9621: Upgrade to maven-surefire-plugin 3.5.2 

    (cherry picked from commit 8cab398)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    8a17333 View commit details
    Browse the repository at this point in the history

  48. [AMQ-9530] Fix SelectorAwareVirtualTopicInterceptor ClassCastExceptio… 

    …n if next is not Topic.

(cherry picked from commit 473267b)
    @NikitaShupletsov @cesarhernandezgt
    NikitaShupletsov authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    af1d8be View commit details
    Browse the repository at this point in the history

  49. AMQ-9622: Upgrade to log4j 2.24.1 

    (cherry picked from commit 20a6b77)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    6193eec View commit details
    Browse the repository at this point in the history

  50. AMQ-9617: Adjust consumers timeout to avoid race condition on RestTest 

    (cherry picked from commit fa881ad)
    @jbonofre @cesarhernandezgt
    jbonofre authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    3496be9 View commit details
    Browse the repository at this point in the history

  51. AMQ-9625 - Prevent queue messages from becoming stuck 

    Fixes a race condition bug that can lead to a message being missed on
dispatch and stuck on a Queue until restart when caching and
concurrentStoreAndDispatch are enabled on a Queue and the cache becomes
disabled.

(cherry picked from commit 7f218fe)
    @cshannon @cesarhernandezgt
    cshannon authored and cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    d14f459 View commit details
    Browse the repository at this point in the history

  52. Update poms to 6.1.5-TT.1-SNAPSHOT

    @cesarhernandezgt
    cesarhernandezgt committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    a3c30b3 View commit details
    Browse the repository at this point in the history