You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/09/22 15:19:11 UTC

[activemq-artemis] branch new-logging updated (b798d7bc75 -> d99794e523)

This is an automated email from the ASF dual-hosted git repository.

robbie pushed a change to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


 discard b798d7bc75 Revert "Adding Step to verify if the broker has a log4j.properties configuration. if it does not the broker will install one by default"
 discard 64d188ba57 Adding Step to verify if the broker has a log4j.properties configuration. if it does not the broker will install one by default
 discard 0faa7305f5 Logging changes on BridgeImpl I used on real debug, squash with everything else please
 discard 322817f9e8 fix application of filtered version ref previously added in logging docs
 discard b18d3e9f82 some more doc updates around monitorInterval
 discard 319c1e28ce add a 5sec monitorInterval to the default log4j2.properties file, aligning with previous log config refresh behaviour. Update notes and versions detail.
 discard ffc1fb957a fixup after rebase to main at 3aeb24ae01f19a37d9378820a40d36624c28288b
 discard c03b221456 NO-JIRA some real debug I made with the new logging - just squash with everything else
 discard 6293f3ebfe fixup after rebase against main at a254e50aae5487148e3a1a3f7dfe54ff5139f88b
 discard 493604b1aa update notes, remove old comparison files
 discard 300125b3b1 remove arg that isnt being used anymore
 discard 08d0b4703d add notes
 discard 151184ab4d try out simplifying to use auto-detected log4j2.properties config file
 discard f4c03eec40 repeat removal to undo compensating commits
 discard fd2b48b66e suppress unnecessary log4j2.properties file from console war overlay files
 discard 0a95734090 update documentation around logging
 discard e6b9ffef6b replace jbl reference with slf4j
 discard 4f05911a5f add outline of details for versions.md to cover
 discard 0eb293e0cd remove some remaining logging.properties files
 discard ba62362eda remove comparison logging-CI.properties file as the CI specific config has gone away entirely
 discard a687a65ab0 update notes
 discard 464d0981a0 remove examples config files that seem not to be referenced anywhere, and reference things that dont seem to exist
 discard 3c5705960f restore comment
 discard 217a5ccebb adjusting defaults
 discard 68d77ba483 add note from some looking at the handling
 discard aac2dd100e some consolidation and simplification of the processor to make following easier and verification more consistent
 discard beb5a4d0c9 Replacing JBL by slf4j on rest
 discard 566e365b9a Fix stacktraces of generated exceptions to not include the generated logmessage method
 discard 93470c49b1 WIP: fixups after rebase onto main at 11eab605842716487b0ca2cd5b019ba71bcc313d
 discard 995f52681d add note
 discard 17f541c53d action some TODOs, add some others
 discard 08627625ef some notes around reload
 discard 4b28251743 remove a couple TODOs not needed
 discard 97872fedc6 fixups after rebase to main at a0f39a4b28545f4010e07d950c34fe9f1f228b68
 discard a4770530b5 fixup header comments
 discard 6939875628 fix some file references and update notes
 discard e9b369a80d convert some more test loggers
 discard 8ba403dab0 remove slf4j->jbl bridge from example
 discard 16605cd0a8 replace a couple of examples logging.properties that enable audit logger output
 discard 1de76667f4 add a note
 discard 1393cc311b remove exclusion that is no longer needed
 discard 203c870b9c switch another logger missed previously
 discard bc390d1324 fixups after rebase to main at 0ca44c0e6972991cf80e5feda34f6d02cf94dea0
 discard c6615fd169 remove uses of JBL from compatibility tests, add artemis-unit-test-support to snapshots CP to ensure test appender class is found and avoids stacktracing
 discard 8d11f51738 add another TODO note
 discard 40d345497a move another old log config file out to root, for any later comparisons needed
 discard 4ebc54e5cb replace logging.properties files for e2e-tests server configs
 discard ee57cfd0dc remove commons-logging slf4j bridge now the karaf bits dont cause beanutils log spam
 discard a55e29ee9a move karaf server feature test to its own module, its logging deps mess with the commons-config handling
 discard e8c92af141 delete old Log4J 1.x log4j.properties files that shouldnt be doing anything, build isnt using log4j 1.x / reload4j anymore
 discard eba24c0cc1 update deps to match actual SLF4J base usage and simplify
 discard d92832a08c use latest log4j version
 discard f26ded2d1f remove now-unused import
 discard 25a4010026 update notes
 discard e17d524e1f remove rather than reinstate a couple of unnecesarry level manipulations
 discard 8ce1467464 ensure method or class based cleanups for AssertionLoggerHandler exist or will be effective, where startCapture() has been called previously
 discard 98ab4ba7d7 reinstate another test manipulating levels
 discard f8acade5f3 restore one of the remaining tests using JBL, manipulating levels
 discard 9ddd8209fa Revert "add commons-logging -> SLF4J bridge and exclude commons-logging, suppresses unconfigured log spam from beanutils etc"
 discard 9c76c1768d Revert "Moving dependencies as test"
 discard bc466d321b Revert "Remove slf4j bridge depedencies from libs", towards getting build back to consistent deps state and to more easily revert original addition leading to issue.
 discard 1417d31931 fixing build after rebase
 discard 51049315e3 Rebased upstream/1662bc740eb4435f5236a70e310825c1daef2e08
 discard 4ffe8c54ff fixing test
 discard 5a44965ce3 Moving dependencies as test
 discard b1974ef59a Remove slf4j bridge depedencies from libs
 discard 106c183383 Removing log facade package
 discard fe626a75ac make start on updating remaining integration tests, manipulating levels etc
 discard 9914b9074d remove various mentions of jblm and wildfly-common from scripts etc, update service config logging details..now to see what it breaks
 discard 1277a9146b also move the old main tests logging.config file
 discard 5ff5829026 move old base logging.properties out of artemis-cli, but leave it in root for comparison to see needed config updates as others replaced
 discard 2e85e807f6 add some TODOs for area cleanup still needed
 discard b901353bd9 change remaining integration tests except those with TODOs
 discard 0947226caf Adding safeguard against {?} on LogProcessor
 discard 495dade97d fix compile issues IDE somehow decided not to show
 discard 4623dbadba more test changes
 discard 382bc041af more test updates
 discard 4560ccca38 some more integration test updates
 discard e4ca3313b2 make start on updating integration tests
 discard 4a89ad7980 add note about e2e-test fixups needed
 discard 743d3374c6 add artemis-unit-test-support dep to various modules that have tests, avoid stacktrace on not finding appender from shared logging config
 discard 938355e5dc Verifying JMX Security and setting up javax.management.builder.initial before Log4J starts its own JMX
 discard e02062bb12 add artemis-unit-test-support dep to various modules that have tests, and will stacktrace if the appender isnt found which is referenced in their shared logging test config
 discard 6014cf0148 fix dep scope
 discard c8b73c92aa add note about many integration-tests etc still using JBL
 discard 940e461504 fix other files similar to commit titled 'Fixing duplicate properties'
 discard 187904ca95 Fixing duplicate properties
 discard d86294e634 Setting version as 3.0.0
 discard 9db426665c updating version after rebasing
 discard e951cb89cf add log config to get NettyNativeTest working
 discard 4695733d1f simplify test logging config again, adjust assertion to be more specific and take into account change in output from 07329118c10d14bce018a580b0dadbcf081233a8
 discard bd31f72f8a add log config for AuditLoggerAMQPMutualSSLTest
 discard 1769866d56 ARTEMIS-3902 Adding Reason to Security Exception
 discard e24d92f461 add some TODO notes from memory
 discard 19596297a1 add some [in-flux] config to get more failing audit log smoke tests passing
 discard 5389dcf06b apply needed change only, and remove old unused logging.properties file
 discard 6cbb4bd0ed reset smoke test config to current base assembly config
 discard c1d3cffd66 some more helper additions to bring default assembly logging config into line with prior config
 discard d3182fc90a Adding a test with no argument on exception (just to be sure)
 discard 9ddac06610 Removing @Cause annotation
 discard 4cb81b6025 fix up errorprone error and an IDE warning
 discard c35c2e64c1 ensure exceptions/causes are the last arg passed, as the logging framework expects, and processor now enforces
 discard 4c0ebaf3fb fix checkstyle on processor
 discard 8b08410ec0 small tweak on test
 discard 49843fcad0 Enforcing exception as the last argument
 discard 2cfe53275b log processing improvement with exceptions
 discard e02180fba6 flesh out assembly default logging config, give output like previous behaviour
 discard de7c4720d2 Removing Reload4J
 discard 479ecb993a fix some more placeholders missed previously
 discard 7117643170 make basic start on audit log file config, add [unfinished] config changes to get AuditLoggerResourceTest smoke test passing
 discard a96407d09c reorder args to match previously out-of-order placeholders, ensure new output matches previous
 discard 885ec533ed remove now-unnecessary quote escaping from log/message bundle format strings, giving same output as before switch to slf4j formatter
 discard d640244310 switch to released 2.0.0 artemis-native dep
 discard 24d45872b5 Fixing up some {0} versus {}
 discard 31ee32d48b re-enable GHA CI runs in the main repo, build now in state it can pass the PR test subset (except for d153efde4e04703875c92fdcb45f9f65b87a215b needing reverted which would make it fail)
 discard 847e64605f add TODO for another fun task
 discard 4acd7d971e fix various test failures due to unexpected message string; also make some tests indicate why they failed
 discard 4f6d920dd4 temporarily remove test to allow concentrating on other issues
 discard cfdb0d02d2 fix test missed in prior change
 discard 782541539b fix format of code prefix in messages, pointed out by failing test
 discard 4542e32a2b make a start on a basic loging config for distribution
 discard d51fcf2079 add some more needed deps; essentially every module with tests (or without specific log test config) will need this to avoid a stacktrace from logging setup issues
 discard 39aee04298 avoid NPE in a unit test due to audit loggers still being enabled, unlike prior test logging config
 discard f0aa684bcf Using Artemis Native 2.1.0 snapshot until 2.0.0 is released
 discard a304d1eb00 add some deps needed/used already, look into test failure
 discard 3b6983b71f fixup for release profile following prior rebases+squashes
 discard 343e5a4969 add commons-logging -> SLF4J bridge and exclude commons-logging, suppresses unconfigured log spam from beanutils etc
 discard 6edb27ecd8 basic logging config and some more on AssertionLoggerHandler to get some tests using it working
 discard ae0d8bded9 make a start on restoring AssertionLoggerHandler to get tests going
 discard d3a6f0287c Artemis native at 2.0 snapshot
 discard 257684d9e8 squashed logging changes from Clebert + me, rebased onto main at 4ab947f2d9142f40a0628c3136f2ab8f8e5104f9
 discard 21a8df7b0b compensating commit, Revert "Bumping artemis as 3.0"
 discard 7fb400a546 comensating commit, Revert "ARTEMIS-3987 Removing ActiveMQ Artemis Rest from the codebase."
    omit 4ab947f2d9 ARTEMIS-4008: update to qpid-jms 1.7.0
    omit 92964e4f00 ARTEMIS-3934 restore settings equivalent to -XX:+AggressiveOpts
    omit 202a16b653 ARTEMIS-3970: update keycloak example to use 19.0.2
    omit dfa797f906 ARTEMIS-4006: remove repackaged/partial-shaded -all uber client artifacts from the assembly
    omit 3403f9a5ea This closes #4227
    omit d8cdc24112 ARTEMIS-4005 - Fix e2e-test execution
    omit d7d1c2ee42 ARTEMIS-4001 - add properties url to the reload manager watch list, validate queue creation on reload with new test
    omit 1974ec5289 This closes #4221
    omit 5e08540b8a ARTEMIS-3980 Drop website dependencies from artemis-distribution
    omit 9a0669e282 This closes #4194
     new 2a8550a8c5 ARTEMIS-3980 Drop website dependencies from artemis-distribution
     new fdea536305 ARTEMIS-4001 - add properties url to the reload manager watch list, validate queue creation on reload with new test
     new afebc39e7b ARTEMIS-4005 - Fix e2e-test execution
     new 8cfabe0586 ARTEMIS-4006: remove repackaged/partial-shaded -all uber client artifacts from the assembly
     new 5d2b183f9a ARTEMIS-3970: update keycloak example to use 19.0.2
     new 0ef27c010e ARTEMIS-3934 restore settings equivalent to -XX:+AggressiveOpts
     new e21c81ce6b ARTEMIS-4008: update to qpid-jms 1.7.0
     new deeb36f63a ARTEMIS-4007 - expose status attribute on configuration that can hold version or error state and reflect modifications via refresh
     new 120effed8d Version.md update before the release
     new 4d1a31c8e4 [maven-release-plugin] prepare release 2.26.0
     new f96b4f29d0 [maven-release-plugin] prepare for next development iteration
     new 957c2d8bcd ARTEMIS-3264 handle core-to-AMQP conversion failures more gracefully
     new ee12200820 compensating commit - Revert "[maven-release-plugin] prepare for next development iteration"
     new 1d96cdd9c1 compensating commit - Revert "[maven-release-plugin] prepare release 2.26.0"
     new 20258d3a86 compensating commit, Revert "ARTEMIS-3987 Removing ActiveMQ Artemis Rest from the codebase."
     new 8edd67c407 compensating commit, Revert "Bumping artemis as 3.0"
     new e7e2180b06 squashed logging changes from Clebert + me, rebased onto main at cd7555c523297ec77d74feff465cb8984bf8c3c4
     new d9536e959f Artemis native at 2.0 snapshot
     new 5a28aa826a make a start on restoring AssertionLoggerHandler to get tests going
     new 2b2b5174e2 basic logging config and some more on AssertionLoggerHandler to get some tests using it working
     new 4c08e8e07d add commons-logging -> SLF4J bridge and exclude commons-logging, suppresses unconfigured log spam from beanutils etc
     new 76282272fb fixup for release profile following prior rebases+squashes
     new 39b7124040 add some deps needed/used already, look into test failure
     new 9760dbc0f0 Using Artemis Native 2.1.0 snapshot until 2.0.0 is released
     new 7d4604f09b avoid NPE in a unit test due to audit loggers still being enabled, unlike prior test logging config
     new 839ff7dac1 add some more needed deps; essentially every module with tests (or without specific log test config) will need this to avoid a stacktrace from logging setup issues
     new 89090de411 make a start on a basic loging config for distribution
     new c486473dae fix format of code prefix in messages, pointed out by failing test
     new 3986592883 fix test missed in prior change
     new e9e602db27 temporarily remove test to allow concentrating on other issues
     new 9d52dfe334 fix various test failures due to unexpected message string; also make some tests indicate why they failed
     new 1de93c84e0 add TODO for another fun task
     new 26641053fa re-enable GHA CI runs in the main repo, build now in state it can pass the PR test subset (except for d153efde4e04703875c92fdcb45f9f65b87a215b needing reverted which would make it fail)
     new e01a3cfec5 Fixing up some {0} versus {}
     new 8c55b90b6a switch to released 2.0.0 artemis-native dep
     new a34a200ed8 remove now-unnecessary quote escaping from log/message bundle format strings, giving same output as before switch to slf4j formatter
     new 5980b647b0 reorder args to match previously out-of-order placeholders, ensure new output matches previous
     new f5b977e8fb make basic start on audit log file config, add [unfinished] config changes to get AuditLoggerResourceTest smoke test passing
     new 794b52f61b fix some more placeholders missed previously
     new 35827a44e4 Removing Reload4J
     new b6d6487788 flesh out assembly default logging config, give output like previous behaviour
     new 2a6a4086d4 log processing improvement with exceptions
     new 8bcc0e992d Enforcing exception as the last argument
     new a6f3f16f4b small tweak on test
     new f97cb87b5a fix checkstyle on processor
     new 2e09ec5826 ensure exceptions/causes are the last arg passed, as the logging framework expects, and processor now enforces
     new d16c3c85f4 fix up errorprone error and an IDE warning
     new 9db5beb856 Removing @Cause annotation
     new 26924cb4a8 Adding a test with no argument on exception (just to be sure)
     new 7660a6180c some more helper additions to bring default assembly logging config into line with prior config
     new 9e12d54ee0 reset smoke test config to current base assembly config
     new f92133ba12 apply needed change only, and remove old unused logging.properties file
     new 7989109b81 add some [in-flux] config to get more failing audit log smoke tests passing
     new c68ecec14b add some TODO notes from memory
     new 9682423589 ARTEMIS-3902 Adding Reason to Security Exception
     new 676d64e495 add log config for AuditLoggerAMQPMutualSSLTest
     new 07d70bff6a simplify test logging config again, adjust assertion to be more specific and take into account change in output from 07329118c10d14bce018a580b0dadbcf081233a8
     new 39a1f19a6c add log config to get NettyNativeTest working
     new 66d48e4fca updating version after rebasing
     new 58ad21785a Setting version as 3.0.0
     new 116ed61d92 Fixing duplicate properties
     new d2f6e389a0 fix other files similar to commit titled 'Fixing duplicate properties'
     new 934df8a5c3 add note about many integration-tests etc still using JBL
     new d15b91fbe5 fix dep scope
     new 9a575d005a add artemis-unit-test-support dep to various modules that have tests, and will stacktrace if the appender isnt found which is referenced in their shared logging test config
     new 2db256d347 Verifying JMX Security and setting up javax.management.builder.initial before Log4J starts its own JMX
     new 8c5274d8e8 add artemis-unit-test-support dep to various modules that have tests, avoid stacktrace on not finding appender from shared logging config
     new 3fc114e547 add note about e2e-test fixups needed
     new 50dabc8283 make start on updating integration tests
     new 262cdcfa0f some more integration test updates
     new 49ae327dc4 more test updates
     new 3404353077 more test changes
     new e54deb5881 fix compile issues IDE somehow decided not to show
     new 605d4e6e00 Adding safeguard against {?} on LogProcessor
     new 07bcc06351 change remaining integration tests except those with TODOs
     new 3dbc385e2f add some TODOs for area cleanup still needed
     new bac95d6a28 move old base logging.properties out of artemis-cli, but leave it in root for comparison to see needed config updates as others replaced
     new e9221d8f15 also move the old main tests logging.config file
     new 4de9d19911 remove various mentions of jblm and wildfly-common from scripts etc, update service config logging details..now to see what it breaks
     new cce972a590 make start on updating remaining integration tests, manipulating levels etc
     new 5dda88a342 Removing log facade package
     new 7c1c73b043 Remove slf4j bridge depedencies from libs
     new 79211e11cb Moving dependencies as test
     new d96cc931af fixing test
     new f30b74c241 Rebased upstream/1662bc740eb4435f5236a70e310825c1daef2e08
     new 41012a3e8d fixing build after rebase
     new 6ec458eac3 Revert "Remove slf4j bridge depedencies from libs", towards getting build back to consistent deps state and to more easily revert original addition leading to issue.
     new 1683b1dd84 Revert "Moving dependencies as test"
     new 3c761212f8 Revert "add commons-logging -> SLF4J bridge and exclude commons-logging, suppresses unconfigured log spam from beanutils etc"
     new 37e271a941 restore one of the remaining tests using JBL, manipulating levels
     new dd08e9af74 reinstate another test manipulating levels
     new ef4e415126 ensure method or class based cleanups for AssertionLoggerHandler exist or will be effective, where startCapture() has been called previously
     new 031a461302 remove rather than reinstate a couple of unnecesarry level manipulations
     new a929f163bb update notes
     new 3be9d84c6b remove now-unused import
     new ab677d0a7c use latest log4j version
     new 5c5b06eb87 update deps to match actual SLF4J base usage and simplify
     new 2f22e3fe05 delete old Log4J 1.x log4j.properties files that shouldnt be doing anything, build isnt using log4j 1.x / reload4j anymore
     new c4985a68bc move karaf server feature test to its own module, its logging deps mess with the commons-config handling
     new fc4f551d33 remove commons-logging slf4j bridge now the karaf bits dont cause beanutils log spam
     new 5d245e1c2a replace logging.properties files for e2e-tests server configs
     new f8ed7c9a25 move another old log config file out to root, for any later comparisons needed
     new f162075ab5 add another TODO note
     new aab14ac010 remove uses of JBL from compatibility tests, add artemis-unit-test-support to snapshots CP to ensure test appender class is found and avoids stacktracing
     new 8c317dc84f fixups after rebase to main at 0ca44c0e6972991cf80e5feda34f6d02cf94dea0
     new 0988234a43 switch another logger missed previously
     new e2b4bf1949 remove exclusion that is no longer needed
     new 7cad637c1c add a note
     new ad6e4e12d1 replace a couple of examples logging.properties that enable audit logger output
     new 98195a3bfd remove slf4j->jbl bridge from example
     new 7996eeaa8b convert some more test loggers
     new 6c42286354 fix some file references and update notes
     new 9cb4610876 fixup header comments
     new 3fac5f4079 fixups after rebase to main at a0f39a4b28545f4010e07d950c34fe9f1f228b68
     new c26202ac18 remove a couple TODOs not needed
     new 11fcc7cd55 some notes around reload
     new 886731a5bb action some TODOs, add some others
     new a7cb05f8f1 add note
     new d53a087631 WIP: fixups after rebase onto main at 11eab605842716487b0ca2cd5b019ba71bcc313d
     new 33b814b4e5 Fix stacktraces of generated exceptions to not include the generated logmessage method
     new e6e684b7cb Replacing JBL by slf4j on rest
     new 0774e0f0bb some consolidation and simplification of the processor to make following easier and verification more consistent
     new 5955d0c149 add note from some looking at the handling
     new edc4b85618 adjusting defaults
     new 89c3436768 restore comment
     new c06c9fc4e8 remove examples config files that seem not to be referenced anywhere, and reference things that dont seem to exist
     new 3628681e58 update notes
     new 296ac2acae remove comparison logging-CI.properties file as the CI specific config has gone away entirely
     new 8eb002e5f1 remove some remaining logging.properties files
     new 84327867c7 add outline of details for versions.md to cover
     new c92090883c replace jbl reference with slf4j
     new 99036d2759 update documentation around logging
     new a26201fe0d suppress unnecessary log4j2.properties file from console war overlay files
     new 6f38d533fc repeat removal to undo compensating commits
     new 3a31e11641 try out simplifying to use auto-detected log4j2.properties config file
     new 2fac3a8e86 add notes
     new 9ab06af283 remove arg that isnt being used anymore
     new 2dcd868dc5 update notes, remove old comparison files
     new 406a9cbc6b fixup after rebase against main at a254e50aae5487148e3a1a3f7dfe54ff5139f88b
     new 8800fb65d4 NO-JIRA some real debug I made with the new logging - just squash with everything else
     new dd9dd19817 fixup after rebase to main at 3aeb24ae01f19a37d9378820a40d36624c28288b
     new d42f390f58 add a 5sec monitorInterval to the default log4j2.properties file, aligning with previous log config refresh behaviour. Update notes and versions detail.
     new df9f3d5e9a some more doc updates around monitorInterval
     new 39e9ace48a fix application of filtered version ref previously added in logging docs
     new 7d4ce65494 Logging changes on BridgeImpl I used on real debug, squash with everything else please
     new 9309cac3e2 Adding Step to verify if the broker has a log4j.properties configuration. if it does not the broker will install one by default
     new d38c22c4fa Revert "Adding Step to verify if the broker has a log4j.properties configuration. if it does not the broker will install one by default"
     new 04851f7efa restore Travis config
     new d99794e523 update to Log4J 2.19.0

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (b798d7bc75)
            \
             N -- N -- N   refs/heads/new-logging (d99794e523)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 149 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml                                        |  32 ++
 TODO-new-logging.txt                               |   1 -
 .../apache/activemq/artemis/logs/AuditLogger.java  |   7 +
 .../api/core/management/ActiveMQServerControl.java |   3 +
 .../protocol/amqp/converter/CoreAmqpConverter.java | 389 +++++++++++----------
 .../amqp/logger/ActiveMQAMQPProtocolLogger.java    |   7 +
 .../amqp/proton/ProtonServerSenderContext.java     |  13 +
 .../artemis/core/config/Configuration.java         |   7 +
 .../core/config/impl/ConfigurationImpl.java        |  11 +
 .../management/impl/ActiveMQServerControlImpl.java |  10 +
 .../artemis/core/server/ActiveMQServer.java        |   4 +
 .../artemis/core/server/ActiveMQServerLogger.java  |  12 +-
 .../artemis/core/server/impl/QueueImpl.java        |   6 +-
 docs/user-manual/en/versions.md                    |  11 +-
 pom.xml                                            |   2 +-
 .../integration/amqp/interop/AmqpCoreTest.java     |  51 ++-
 .../ActiveMQServerControlUsingCoreTest.java        |   5 +
 .../integration/server/ConfigurationTest.java      |   5 +
 18 files changed, 370 insertions(+), 206 deletions(-)