This is an automated email from the ASF dual-hosted git repository. cshannon pushed a commit to branch 6.1.x.AMF.x in repository https://gitbox.apache.org/repos/asf/activemq.git
commit 6765fa5ebbf5d458d5245f9b6d8c3b1bf8a6ca35 Merge: 8d39918983 5690826111 Author: Christopher L. Shannon <[email protected]> AuthorDate: Tue Apr 2 11:41:00 2024 -0400 Merge tag 'activemq-6.1.1' into 6.1.x.AMF.x [maven-release-plugin] copy for tag activemq-6.1.1 NOTICE | 2 +- .../apache/activemq/plugin/StatisticsBroker.java | 5 +++ activemq-client-jakarta/pom.xml | 40 ---------------------- .../src/main/resources/META-INF/spring.schemas | 2 ++ .../src/main/resources/META-INF/spring.schemas | 2 ++ .../plugin/BrokerStatisticsPluginTest.java | 19 ++++++++-- activemq-web-console/src/main/webapp/403.html | 2 +- activemq-web-console/src/main/webapp/404.html | 2 +- activemq-web-console/src/main/webapp/500.html | 2 +- .../src/main/webapp/decorators/footer.jsp | 2 +- activemq-web-console/src/main/webapp/login.html | 2 +- activemq-web-console/src/main/webapp/slave.jsp | 2 +- assembly/src/docker/Dockerfile | 4 ++- assembly/src/release/bin/activemq | 3 ++ assembly/src/release/bin/linux-x86-64/wrapper.conf | 2 +- assembly/src/release/bin/macosx/wrapper.conf | 2 +- assembly/src/release/bin/win64/wrapper.conf | 2 +- pom.xml | 15 ++++---- 18 files changed, 49 insertions(+), 61 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
