From 0f45245b2becc19911dd82ec61e47e5ccef343df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 28 Jun 2023 11:17:41 +0200 Subject: [PATCH 001/117] Upgrade qpid.jms.client.version to 1.10.0 and add new repository In this commit, the version of qpid.jms.client has been updated from 1.6.0 to 1.10.0 to integrate the latest features and improvements. Furthermore, a new repository has been added for better dependency management. This repository is a staging one from Apache Qpid. --- cli-qpid-jms/pom.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cli-qpid-jms/pom.xml b/cli-qpid-jms/pom.xml index fef0ddbf..d6166c74 100644 --- a/cli-qpid-jms/pom.xml +++ b/cli-qpid-jms/pom.xml @@ -35,13 +35,20 @@ jms com.redhat.mqe.jms.Main - 1.6.0 + 1.10.0 ${qpid.jms.client.version} 2.0.52.Final linux-x86_64-fedora 1.8.0 + + + staging + https://repository.apache.org/content/repositories/orgapacheqpid-1262 + + + From 050b5b41c380df3150914f088ddedadce100dc1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Jun 2022 22:37:52 +0200 Subject: [PATCH 002/117] Bump tcnative.version from 2.0.52.Final to 2.0.53.Final (#403) Bumps `tcnative.version` from 2.0.52.Final to 2.0.53.Final. Updates `netty-tcnative-boringssl-static` from 2.0.52.Final to 2.0.53.Final - [Release notes](https://github.com/netty/netty-tcnative/releases) - [Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.52.Final...netty-tcnative-parent-2.0.53.Final) Updates `netty-tcnative` from 2.0.52.Final to 2.0.53.Final - [Release notes](https://github.com/netty/netty-tcnative/releases) - [Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.52.Final...netty-tcnative-parent-2.0.53.Final) --- updated-dependencies: - dependency-name: io.netty:netty-tcnative-boringssl-static dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-tcnative:linux-x86_64-fedora dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 7bba5aa60e5bb297ec38d150c43dfd551a75e995) --- cli-qpid-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-qpid-jms/pom.xml b/cli-qpid-jms/pom.xml index d6166c74..51cc9a32 100644 --- a/cli-qpid-jms/pom.xml +++ b/cli-qpid-jms/pom.xml @@ -37,7 +37,7 @@ com.redhat.mqe.jms.Main 1.10.0 ${qpid.jms.client.version} - 2.0.52.Final + 2.0.53.Final linux-x86_64-fedora 1.8.0 From c8112184d7bd1445f3a832880aab245d03783d4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Jun 2022 23:12:18 +0200 Subject: [PATCH 003/117] Bump maven-enforcer-plugin from 3.0.0 to 3.1.0 (#404) Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0...enforcer-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit e0388b4c745f0c8257c9bb83e2d4e44bf429baa2) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index d7d005bb..e1757be2 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -49,7 +49,7 @@ 3.10.1 3.1.0 - 3.0.0 + 3.1.0 3.2.2 0.8.8 3.3.0 From 121af280b3a45787b8a30100a96e887fe318fc06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jun 2022 12:38:27 +0200 Subject: [PATCH 004/117] Bump artemis.broker.version from 2.22.0 to 2.23.0 (#405) Bumps `artemis.broker.version` from 2.22.0 to 2.23.0. Updates `artemis-amqp-protocol` from 2.22.0 to 2.23.0 Updates `artemis-server` from 2.22.0 to 2.23.0 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.22.0...2.23.0) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-amqp-protocol dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.activemq:artemis-server dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 1f0c0434632bda05a03b353ae2f01fb59f753b4f) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index e1757be2..e9d8e5ab 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -45,7 +45,7 @@ 4.6.1 4.2.0 - 2.22.0 + 2.23.0 3.10.1 3.1.0 From dadcca781d3cbe1377e8ad94f516596b45cdb5b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jun 2022 10:42:41 +0000 Subject: [PATCH 005/117] Bump artemis.jms.client.version from 2.22.0 to 2.23.0 (#406) Bumps `artemis.jms.client.version` from 2.22.0 to 2.23.0. Updates `artemis-jms-client` from 2.22.0 to 2.23.0 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.22.0...2.23.0) Updates `artemis-commons` from 2.22.0 to 2.23.0 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.22.0...2.23.0) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-jms-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.activemq:artemis-commons dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit a8070b17be15508cd2391b5578a52bc298f01f75) --- cli-artemis-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-artemis-jms/pom.xml b/cli-artemis-jms/pom.xml index efa3baa2..590cc121 100644 --- a/cli-artemis-jms/pom.xml +++ b/cli-artemis-jms/pom.xml @@ -36,7 +36,7 @@ acc com.redhat.mqe.acc.Main false - 2.22.0 + 2.23.0 ${artemis.jms.client.version} From 415d9ebf811d042de040b6aba7210b6767db6e73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jun 2022 00:15:08 +0200 Subject: [PATCH 006/117] Bump checker-qual from 3.22.1 to 3.22.2 (#407) Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.22.1 to 3.22.2. - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.22.1...checker-framework-3.22.2) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit e3775d89f7ed2659ef36e912e52dfd2c8cef8713) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index e9d8e5ab..da7a105d 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -57,7 +57,7 @@ 2.7 23.0.0 - 3.22.1 + 3.22.2 From 54b53cfc5e76090ca97f15e2d35e58e663514962 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 14:43:08 +0200 Subject: [PATCH 007/117] Bump artemis.broker.version from 2.23.0 to 2.23.1 (#408) Bumps `artemis.broker.version` from 2.23.0 to 2.23.1. Updates `artemis-amqp-protocol` from 2.23.0 to 2.23.1 Updates `artemis-server` from 2.23.0 to 2.23.1 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.23.0...2.23.1) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-amqp-protocol dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.activemq:artemis-server dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit ae56e587303e48f57fb6b4b05937ca1059405963) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index da7a105d..e21bccb6 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -45,7 +45,7 @@ 4.6.1 4.2.0 - 2.23.0 + 2.23.1 3.10.1 3.1.0 From 50d9b766ba3253a9d1a64fe20fea586755e60da3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 12:46:51 +0000 Subject: [PATCH 008/117] Bump kotlin.version from 1.7.0 to 1.7.10 (#412) Bumps `kotlin.version` from 1.7.0 to 1.7.10. Updates `kotlin-stdlib` from 1.7.0 to 1.7.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-stdlib-jdk8` from 1.7.0 to 1.7.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-test-junit` from 1.7.0 to 1.7.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-maven-plugin` from 1.7.0 to 1.7.10 Updates `kotlin-reflect` from 1.7.0 to 1.7.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 156261329a5ffd187f9c492d91e27b94bac6ba34) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index e21bccb6..de9360e7 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -38,7 +38,7 @@ 2.42 2.13.3 - 1.7.0 + 1.7.10 5.8.2 1.7.1 1.1.3 From 71675b110bcacdb4df022b099dca65d75a88bfb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 12:50:20 +0000 Subject: [PATCH 009/117] Bump jaeger-client from 1.8.0 to 1.8.1 (#410) Bumps [jaeger-client](https://github.com/jaegertracing/jaeger-client-java) from 1.8.0 to 1.8.1. - [Release notes](https://github.com/jaegertracing/jaeger-client-java/releases) - [Changelog](https://github.com/jaegertracing/jaeger-client-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/jaegertracing/jaeger-client-java/compare/v1.8.0...v1.8.1) --- updated-dependencies: - dependency-name: io.jaegertracing:jaeger-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 5cf8603f732ad299558899e57e577f52befe0378) --- cli-qpid-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-qpid-jms/pom.xml b/cli-qpid-jms/pom.xml index 51cc9a32..2298c22a 100644 --- a/cli-qpid-jms/pom.xml +++ b/cli-qpid-jms/pom.xml @@ -39,7 +39,7 @@ ${qpid.jms.client.version} 2.0.53.Final linux-x86_64-fedora - 1.8.0 + 1.8.1 From 90f97b2df937c80e113c4882366caedc552b6664 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 12:55:22 +0000 Subject: [PATCH 010/117] Bump artemis.jms.client.version from 2.23.0 to 2.26.0 (#419) Bumps `artemis.jms.client.version` from 2.23.0 to 2.26.0. Updates `artemis-jms-client` from 2.23.0 to 2.26.0 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.23.0...2.26.0) Updates `artemis-commons` from 2.23.0 to 2.26.0 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.23.0...2.26.0) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-jms-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.activemq:artemis-commons dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 232615da5de560309aec7b6c386f180c963e3965) --- cli-artemis-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-artemis-jms/pom.xml b/cli-artemis-jms/pom.xml index 590cc121..f81eece1 100644 --- a/cli-artemis-jms/pom.xml +++ b/cli-artemis-jms/pom.xml @@ -36,7 +36,7 @@ acc com.redhat.mqe.acc.Main false - 2.23.0 + 2.26.0 ${artemis.jms.client.version} From 19beda5d27b2fca86528812a71955251924a697b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 12:58:43 +0000 Subject: [PATCH 011/117] Bump artemis-server from 2.23.0 to 2.24.0 in /bom (#415) Bumps [artemis-server](https://github.com/apache/activemq-artemis) from 2.23.0 to 2.24.0. - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.23.0...2.24.0) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-server dependency-type: direct:development ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 7ac174ce00039f6cf34215efb58c9efe82a1a348) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index de9360e7..b8efc884 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -45,7 +45,7 @@ 4.6.1 4.2.0 - 2.23.1 + 2.24.0 3.10.1 3.1.0 From 8fdd125ce95b2eb07755dcc4201c428b15a1787a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:02:38 +0000 Subject: [PATCH 012/117] Bump maven-jar-plugin from 3.2.2 to 3.3.0 (#420) Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.2 to 3.3.0. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.2.2...maven-jar-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit cde90821ba4e8dc4ef013f48c9fae86148bb262f) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index b8efc884..ea09b8f7 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -50,7 +50,7 @@ 3.10.1 3.1.0 3.1.0 - 3.2.2 + 3.3.0 0.8.8 3.3.0 3.0.0-M7 From c2d3b232772ed7cadd6855f4078440e7876179e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 15:06:05 +0200 Subject: [PATCH 013/117] Bump junit-bom from 5.8.2 to 5.9.1 (#423) Bumps [junit-bom](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.1) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 59e936899939dfbc24b36dcdbfb2e86e1256d8c9) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index ea09b8f7..e91d4459 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -39,7 +39,7 @@ 2.13.3 1.7.10 - 5.8.2 + 5.9.1 1.7.1 1.1.3 4.6.1 From da0c815d957751303ed13c1352d7ee8a04b26c05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:14:21 +0000 Subject: [PATCH 014/117] Bump artemis.broker.version from 2.23.1 to 2.26.0 (#418) Bumps `artemis.broker.version` from 2.23.1 to 2.26.0. Updates `artemis-amqp-protocol` from 2.23.1 to 2.26.0 Updates `artemis-server` from 2.23.1 to 2.26.0 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.23.1...2.26.0) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-amqp-protocol dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.activemq:artemis-server dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit eb49455bd9812266da2811e4ddf9dfd392b76c74) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index e91d4459..8e90a0e1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -45,7 +45,7 @@ 4.6.1 4.2.0 - 2.24.0 + 2.26.0 3.10.1 3.1.0 From 601752ca918a94c32ab027c7eba958a99e3b739c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:17:44 +0000 Subject: [PATCH 015/117] Bump dagger.version from 2.42 to 2.44 (#425) Bumps `dagger.version` from 2.42 to 2.44. Updates `dagger` from 2.42 to 2.44 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.42...dagger-2.44) Updates `dagger-compiler` from 2.42 to 2.44 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.42...dagger-2.44) --- updated-dependencies: - dependency-name: com.google.dagger:dagger dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:dagger-compiler dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 7eb790572e0b6225d8743a18403f9877143a34cb) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 8e90a0e1..db1824af 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -35,7 +35,7 @@ 1.7.33 5.0.4 - 2.42 + 2.44 2.13.3 1.7.10 From 35c84bf6d0f8ee1e8fd92ca5b141579c181374c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:21:25 +0000 Subject: [PATCH 016/117] Bump mockito-core from 4.6.1 to 4.8.0 (#427) Bumps [mockito-core](https://github.com/mockito/mockito) from 4.6.1 to 4.8.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.8.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 356668b5fe3daf9d29a2e69802349b10e1158281) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index db1824af..24e3a3ce 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -42,7 +42,7 @@ 5.9.1 1.7.1 1.1.3 - 4.6.1 + 4.8.0 4.2.0 2.26.0 From 8b9dc4c8517ce5f223437a6b3d3e4ff09ca95328 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:25:25 +0000 Subject: [PATCH 017/117] Bump checker-qual from 3.22.2 to 3.25.0 (#424) Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.22.2 to 3.25.0. - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.22.2...checker-framework-3.25.0) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 4027efca9c5a52634b60e0a06899a4415b93e6e6) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 24e3a3ce..28f4f2b9 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -57,7 +57,7 @@ 2.7 23.0.0 - 3.22.2 + 3.25.0 From ed89f8e82b312d3af42cfebdcdcdb7d6ffcd1a12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:28:57 +0000 Subject: [PATCH 018/117] Bump tcnative.version from 2.0.53.Final to 2.0.54.Final (#426) Bumps `tcnative.version` from 2.0.53.Final to 2.0.54.Final. Updates `netty-tcnative-boringssl-static` from 2.0.53.Final to 2.0.54.Final - [Release notes](https://github.com/netty/netty-tcnative/releases) - [Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.53.Final...netty-tcnative-parent-2.0.54.Final) Updates `netty-tcnative` from 2.0.53.Final to 2.0.54.Final - [Release notes](https://github.com/netty/netty-tcnative/releases) - [Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.53.Final...netty-tcnative-parent-2.0.54.Final) --- updated-dependencies: - dependency-name: io.netty:netty-tcnative-boringssl-static dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-tcnative:linux-x86_64-fedora dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 491eb7bccbb37497e91f4d5cc1bd76d95197a61d) --- cli-qpid-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-qpid-jms/pom.xml b/cli-qpid-jms/pom.xml index 2298c22a..b5dbe1e2 100644 --- a/cli-qpid-jms/pom.xml +++ b/cli-qpid-jms/pom.xml @@ -37,7 +37,7 @@ com.redhat.mqe.jms.Main 1.10.0 ${qpid.jms.client.version} - 2.0.53.Final + 2.0.54.Final linux-x86_64-fedora 1.8.1 From 9501a06aba4def12a1864d166d065ed93625d6c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:33:15 +0000 Subject: [PATCH 019/117] Bump maven-shade-plugin from 3.3.0 to 3.4.0 (#428) Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.3.0...maven-shade-plugin-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-shade-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 7673e3a70f2e35553b359af00b19a972ac370cd5) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 28f4f2b9..c6e288c1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -52,7 +52,7 @@ 3.1.0 3.3.0 0.8.8 - 3.3.0 + 3.4.0 3.0.0-M7 2.7 From ed7ccd0fbb285ec40e4b06b9655d6eecf75cc127 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 15:50:29 +0200 Subject: [PATCH 020/117] Bump jackson-databind from 2.13.3 to 2.13.4 (#429) Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.3 to 2.13.4. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit b40be7f6f52d096339181fd5fc631a14e2d2bac1) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index c6e288c1..7985f209 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -36,7 +36,7 @@ 1.7.33 5.0.4 2.44 - 2.13.3 + 2.13.4 1.7.10 5.9.1 From 74321fdc23169a1b2e494b99a5d46a0693d345ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:53:58 +0000 Subject: [PATCH 021/117] Bump activemq-client from 5.17.1 to 5.17.2 (#421) Bumps [activemq-client](https://github.com/apache/activemq) from 5.17.1 to 5.17.2. - [Release notes](https://github.com/apache/activemq/releases) - [Commits](https://github.com/apache/activemq/compare/activemq-5.17.1...activemq-5.17.2) --- updated-dependencies: - dependency-name: org.apache.activemq:activemq-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit b2c1d4488c75b94c6101ca768c094f6107a2e9e0) --- cli-activemq/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-activemq/pom.xml b/cli-activemq/pom.xml index 2c6c5e00..64a669a0 100644 --- a/cli-activemq/pom.xml +++ b/cli-activemq/pom.xml @@ -35,7 +35,7 @@ aoc com.redhat.mqe.aoc.Main - 5.17.1 + 5.17.2 ${activemq.client.version} From d2b5a83739fb76b902f733f05aa4f120a36524e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Sep 2022 12:29:03 +0200 Subject: [PATCH 022/117] Bump kotlin.version from 1.7.10 to 1.7.20 (#433) Bumps `kotlin.version` from 1.7.10 to 1.7.20. Updates `kotlin-stdlib` from 1.7.10 to 1.7.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20) Updates `kotlin-stdlib-jdk8` from 1.7.10 to 1.7.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20) Updates `kotlin-test-junit` from 1.7.10 to 1.7.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20) Updates `kotlin-maven-plugin` from 1.7.10 to 1.7.20 Updates `kotlin-reflect` from 1.7.10 to 1.7.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 329b77d2f7a7b99828d29ea0427da8af58c90144) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 7985f209..d8a9649b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -38,7 +38,7 @@ 2.44 2.13.4 - 1.7.10 + 1.7.20 5.9.1 1.7.1 1.1.3 From ce7b73d2c07055a88aa8a19f10a145c15d144390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Tue, 4 Oct 2022 17:15:20 +0200 Subject: [PATCH 023/117] Add Dockerfile for multiarch build (#416) (cherry picked from commit 799e560ee8e88d1609ed99357713d7a21a426ff7) --- Dockerfile | 27 +++++++++++++++++++++++++++ build_docker.sh | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ build_java.sh | 5 +++++ create_links.sh | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+) create mode 100644 Dockerfile create mode 100755 build_docker.sh create mode 100755 build_java.sh create mode 100755 create_links.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..6b3ebdf7 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,27 @@ +FROM fedora:latest + +WORKDIR /var/lib/cli-java + +ENV LANG=C.UTF-8 +RUN yum install \ + -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs \ + java-11-openjdk-headless \ + bzip2 unzip xz \ + bzr git mercurial openssh-clients subversion procps \ + gnupg dirmngr \ + ca-certificates curl wget \ + && dnf clean all -y + +RUN mkdir /main + +COPY cli-qpid-jms/target/cli-qpid-jms-1.2.2-SNAPSHOT-*.jar /main/cli-qpid.jar +COPY cli-activemq/target/cli-activemq-1.2.2-SNAPSHOT-*.jar /main/cli-activemq.jar +COPY cli-artemis-jms/target/cli-artemis-jms-1.2.2-SNAPSHOT-*.jar /main/cli-artemis.jar +COPY cli-paho-java/target/cli-paho-java-1.2.2-SNAPSHOT-*.jar /main/cli-paho.jar + +COPY create_links.sh /main +RUN bash /main/create_links.sh + + +RUN groupadd cli-java && useradd -d /var/lib/cli-java -ms /bin/bash -g cli-java -G cli-java cli-java +USER cli-java:cli-java diff --git a/build_docker.sh b/build_docker.sh new file mode 100755 index 00000000..3d6428f7 --- /dev/null +++ b/build_docker.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# +# Copyright (c) 2022 Red Hat, Inc. +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +set -Eeuo pipefail +set -x + +ARCH="amd64 arm64 ppc64le s390x" +VERSION="${1:-latest}" +REGISTRY="${2:-quay.io}" +NAMESPACE="${3:-messaging}" + +IMAGE_NAME="${REGISTRY}/${NAMESPACE}/cli-java:${VERSION}" + +# https://docs.docker.com/build/buildx/multiplatform-images/ +sudo podman run --privileged --rm docker.io/tonistiigi/binfmt --install all +podman manifest rm ${IMAGE_NAME} || true + +# https://gitlab.cee.redhat.com/keycloak/rhsso-openshift-intermediate-docker-image/-/blob/main/build.sh +echo "Creating a new manifest: ${IMAGE_NAME}" +podman manifest create ${IMAGE_NAME} + +echo "Building a new docker image: ${IMAGE_NAME}, arch: ${ARCH}" +for i in $ARCH +do + podman build --arch=$i -t ${IMAGE_NAME}.${i} --build-arg ARCH=${i} --build-arg VERSION=${VERSION} . + podman push ${IMAGE_NAME}.${i} + podman manifest add ${IMAGE_NAME} ${IMAGE_NAME}.${i} +done + +echo "Pushing a new manifest: ${IMAGE_NAME}" +podman manifest push ${IMAGE_NAME} docker://${IMAGE_NAME} diff --git a/build_java.sh b/build_java.sh new file mode 100755 index 00000000..55cc8001 --- /dev/null +++ b/build_java.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -Eeuo pipefail +set -x + +mvn -B package --file pom.xml -DskipTests diff --git a/create_links.sh b/create_links.sh new file mode 100755 index 00000000..ebe943ec --- /dev/null +++ b/create_links.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash +set -Eeuo pipefail +set -x + +# +# Copyright (c) 2022 Red Hat, Inc. +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +cd /main; for i in *.jar; do +for j in sender receiver connector; do + filename="/usr/local/bin/${i%.jar}-${j}" + cat > "${filename}" << EOF +#!/bin/sh + +java \${JAVA_OPTS} \${CLI_QPID_JMS_OPTS} -jar /main/${i} ${j} \$@ +EOF + chmod +x "$filename" + done +done From 8d6dd769891e5d759b4afe7e5f601acee246ba0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Tue, 4 Oct 2022 17:20:13 +0200 Subject: [PATCH 024/117] Add Docker image build instructions (#442) (cherry picked from commit 58de4dd1b61ca357782795a3d24027f459f8894c) --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 8df7f86c..f78b20a2 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,22 @@ When using IntelliJ IDEA Ultimate Edition, select "Open" (not "Import Project") mvn versions:set -DgenerateBackupPoms=false -DnewVersion=2017.07 +## Build docker + +Uses `podman`. Needs `sudo` to hook qemu. + +```shell +mvn clean +bash build_java.sh +bash build_docker.sh +``` + +Date-based versioning of image tags, use + +```shell +bash build_docker.sh $(date '+%Y-%m-%d') +``` + ## List of Java clis * qpid-jms (AMQP 1.0) From 3f5b712ccdc874ab945ec49f1df63769da29f236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Tue, 4 Oct 2022 17:38:42 +0200 Subject: [PATCH 025/117] Fix typo (#443) (cherry picked from commit 2b71bcc63805e788cd4d9744ac97784dba0ad421) --- jmslib/src/main/java/com/redhat/mqe/lib/ReceiverClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jmslib/src/main/java/com/redhat/mqe/lib/ReceiverClient.java b/jmslib/src/main/java/com/redhat/mqe/lib/ReceiverClient.java index f9a19cf4..3dcaf9eb 100644 --- a/jmslib/src/main/java/com/redhat/mqe/lib/ReceiverClient.java +++ b/jmslib/src/main/java/com/redhat/mqe/lib/ReceiverClient.java @@ -155,7 +155,7 @@ private void unsubscribe() { try { session.unsubscribe(durableSubscriberName); } catch (JMSException e) { - LOG.error("Error while unsubscribing durable subscriptor " + durableSubscriberName); + LOG.error("Error while unsubscribing durable subscriber " + durableSubscriberName); e.printStackTrace(); } finally { close(session); From 6350662e8f3289e4ca3a3b27d47dbe703ec02fee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 23:35:57 +0200 Subject: [PATCH 026/117] Bump checker-qual from 3.25.0 to 3.26.0 (#444) Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.25.0 to 3.26.0. - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.25.0...checker-framework-3.26.0) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 71e4e414b12cbbb4aeb9c71ed7434b79af6ab713) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index d8a9649b..04328468 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -57,7 +57,7 @@ 2.7 23.0.0 - 3.25.0 + 3.26.0 From 4523e5e041da45c80b927826eabbe5ec5bbab1b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 5 Oct 2022 11:41:40 +0200 Subject: [PATCH 027/117] Replace direct security manager usage with assertSystemExit in tests (#441) (cherry picked from commit 72e394ff3d23b9119146cbd03e8079741e29c056) --- tests/src/test/kotlin/AbstractMainTest.kt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/tests/src/test/kotlin/AbstractMainTest.kt b/tests/src/test/kotlin/AbstractMainTest.kt index 7e313848..7b311ddb 100644 --- a/tests/src/test/kotlin/AbstractMainTest.kt +++ b/tests/src/test/kotlin/AbstractMainTest.kt @@ -84,17 +84,9 @@ abstract class AbstractMainTest : AbstractTest() { fun printHelp(client: String) { val parameters = "$client --help".split(" ").toTypedArray() - val previousManager = System.getSecurityManager() - try { - val manager = NoExitSecurityManager(previousManager) - System.setSecurityManager(manager) + assertSystemExit(0, Executable { main(parameters) - fail("expected exception") - } catch (e: SystemExitingWithStatus) { - assertThat(e.status).isEqualTo(0) - } finally { - System.setSecurityManager(previousManager) - } + }) } @Tag("external") @@ -136,7 +128,9 @@ abstract class AbstractMainTest : AbstractTest() { "connector --broker $brokerUrl --address $address --count 1".split(" ").toTypedArray() assertTimeoutPreemptively(Duration.ofSeconds(10)) { print("Connecting: ") - main(connectorParameters) + assertNoSystemExit { + main(connectorParameters) + } } } From 649acb2371992316aad7c9fa0091c7d677eeb0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 5 Oct 2022 15:04:28 +0200 Subject: [PATCH 028/117] Add test for transactions and reformat file (awful, but standardized) (cherry picked from commit 2fa985f5765672893b9486084d32bd672b5a416e) --- tests/src/test/kotlin/AbstractMainTest.kt | 112 ++++++++++++++++++---- 1 file changed, 91 insertions(+), 21 deletions(-) diff --git a/tests/src/test/kotlin/AbstractMainTest.kt b/tests/src/test/kotlin/AbstractMainTest.kt index 7b311ddb..55fef93d 100644 --- a/tests/src/test/kotlin/AbstractMainTest.kt +++ b/tests/src/test/kotlin/AbstractMainTest.kt @@ -138,9 +138,13 @@ abstract class AbstractMainTest : AbstractTest() { @Test fun sendAndReceiveSingleMessageUsingCredentials() { val senderParameters = - "sender --log-msgs dict --broker $brokerUrl --address $address --conn-username admin --conn-password admin --count 1".split(" ").toTypedArray() + "sender --log-msgs dict --broker $brokerUrl --address $address --conn-username admin --conn-password admin --count 1".split( + " " + ).toTypedArray() val receiverParameters = - "receiver --log-msgs dict --broker $brokerUrl --address $address --conn-username admin --conn-password admin --count 1".split(" ").toTypedArray() + "receiver --log-msgs dict --broker $brokerUrl --address $address --conn-username admin --conn-password admin --count 1".split( + " " + ).toTypedArray() assertTimeoutPreemptively(Duration.ofSeconds(10)) { print("Sending: ") main(senderParameters) @@ -149,13 +153,29 @@ abstract class AbstractMainTest : AbstractTest() { } } + @Tag("external") + @Test + fun test_simple_transaction_sender_batch_size_leftovers() { + print("Sending:\n ") + val sent = main( + "sender --log-msgs interop --broker $brokerUrl --conn-auth-mechanisms PLAIN --conn-username admin --conn-password admin --address $address --count 11 --tx-size 3 --tx-action commit".split(" ").toTypedArray() + ) + print("Receiving:\n ") + val received = main( + "receiver --timeout 10 --log-msgs interop --broker $brokerUrl --conn-auth-mechanisms PLAIN --conn-username admin --conn-password admin --address $address --count 0".split(" ").toTypedArray() + ) + assertThat(sent).hasSize(11) + assertThat(received).hasSize(9) + } + @Tag("external") @Test fun sendBrowseAndReceiveSingleMessageWithEmptySelector() { val senderParameters = "sender --log-msgs dict --broker $brokerUrl --address $address --count 1".split(" ").toTypedArray() val receiverParameters = - "receiver --log-msgs dict --broker $brokerUrl --address $address --msg-selector '' --count 1".split(" ").toTypedArray() + "receiver --log-msgs dict --broker $brokerUrl --address $address --msg-selector '' --count 1".split(" ") + .toTypedArray() assertTimeoutPreemptively(Duration.ofSeconds(10)) { print("Sending: ") main(senderParameters) @@ -197,9 +217,11 @@ abstract class AbstractMainTest : AbstractTest() { @Test fun sendAndReceiveSingleMessageLogJson() { val senderParameters = - "sender --log-msgs dict --out json --broker $brokerUrl --address $address --count 1".split(" ").toTypedArray() + "sender --log-msgs dict --out json --broker $brokerUrl --address $address --count 1".split(" ") + .toTypedArray() val receiverParameters = - "receiver --log-msgs dict --out json --broker $brokerUrl --address $address --count 1".split(" ").toTypedArray() + "receiver --log-msgs dict --out json --broker $brokerUrl --address $address --count 1".split(" ") + .toTypedArray() assertTimeoutPreemptively(Duration.ofSeconds(10)) { print("Sending: ") main(senderParameters) @@ -212,9 +234,12 @@ abstract class AbstractMainTest : AbstractTest() { @Test fun sendAndReceiveSingleMessageLogJsonFloatType() { val senderParameters = - "sender --log-msgs dict --out json --broker $brokerUrl --address $address --msg-property baf~42.2 --count 1".split(" ").toTypedArray() + "sender --log-msgs dict --out json --broker $brokerUrl --address $address --msg-property baf~42.2 --count 1".split( + " " + ).toTypedArray() val receiverParameters = - "receiver --log-msgs dict --out json --broker $brokerUrl --address $address --count 1".split(" ").toTypedArray() + "receiver --log-msgs dict --out json --broker $brokerUrl --address $address --count 1".split(" ") + .toTypedArray() assertTimeoutPreemptively(Duration.ofSeconds(10)) { print("Sending: ") main(senderParameters) @@ -277,7 +302,9 @@ abstract class AbstractMainTest : AbstractTest() { @Test fun sendAndReceiveListMessage() { val senderParameters = - """sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-list-item --msg-content-list-item "String" --msg-content-list-item "~1" --msg-content-list-item "~1.0" --msg-content-list-item "1" --msg-content-list-item "1.0" --msg-content-list-item "~-1" --msg-content-list-item "~-1.3" --msg-content-list-item "-1" --msg-content-list-item "~~1"""".split(" ").toTypedArray() + """sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-list-item --msg-content-list-item "String" --msg-content-list-item "~1" --msg-content-list-item "~1.0" --msg-content-list-item "1" --msg-content-list-item "1.0" --msg-content-list-item "~-1" --msg-content-list-item "~-1.3" --msg-content-list-item "-1" --msg-content-list-item "~~1"""".split( + " " + ).toTypedArray() val receiverParameters = "receiver --log-msgs dict --broker $brokerUrl --address $address --count 1".split(" ").toTypedArray() @@ -292,7 +319,9 @@ abstract class AbstractMainTest : AbstractTest() { fun sendAndReceiveAnInt() { assertNoSystemExit { val senderParameters = - """sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --content-type int --msg-content 1234""".split(" ").toTypedArray() + """sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --content-type int --msg-content 1234""".split( + " " + ).toTypedArray() val receiverParameters = "receiver --log-msgs dict --broker $brokerUrl --address $address --count 1".split(" ").toTypedArray() @@ -310,7 +339,9 @@ abstract class AbstractMainTest : AbstractTest() { try { file.writeText("aContent") val senderParameters = - "sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-from-file $file".split(" ").toTypedArray() + "sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-from-file $file".split( + " " + ).toTypedArray() val receiverParameters = "receiver --log-msgs dict --broker $brokerUrl --address $address --count 1".split(" ").toTypedArray() @@ -330,7 +361,9 @@ abstract class AbstractMainTest : AbstractTest() { try { file.writeText("aContent") val senderParameters = - "sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-from-file $file --msg-content-binary true".split(" ").toTypedArray() + "sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-from-file $file --msg-content-binary true".split( + " " + ).toTypedArray() val receiverParameters = "receiver --log-msgs dict --broker $brokerUrl --address $address --count 1".split(" ").toTypedArray() @@ -349,7 +382,9 @@ abstract class AbstractMainTest : AbstractTest() { assertSystemExit(2, Executable { val file = "noSuchFile" val senderParameters = - "sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-from-file $file".split(" ").toTypedArray() + "sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-from-file $file".split( + " " + ).toTypedArray() main(senderParameters) }) } @@ -360,7 +395,9 @@ abstract class AbstractMainTest : AbstractTest() { assertSystemExit(2, Executable { val file = "noSuchFile" val senderParameters = - "sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-from-file $file --msg-content-binary true".split(" ").toTypedArray() + "sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-from-file $file --msg-content-binary true".split( + " " + ).toTypedArray() main(senderParameters) }) } @@ -375,9 +412,13 @@ abstract class AbstractMainTest : AbstractTest() { try { file.writeText("aContent") val senderParameters = - "sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-from-file $file".split(" ").toTypedArray() + "sender --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-from-file $file".split( + " " + ).toTypedArray() val receiverParameters = - "receiver --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-to-file $output".split(" ").toTypedArray() + "receiver --log-msgs dict --broker $brokerUrl --address $address --count 1 --msg-content-to-file $output".split( + " " + ).toTypedArray() print("Sending: ") main(senderParameters) @@ -397,7 +438,8 @@ abstract class AbstractMainTest : AbstractTest() { val senderParameters = "sender --log-msgs dict --broker $brokerUrl --address topic://$address --count 1".split(" ").toTypedArray() val receiverParameters = - "receiver --log-msgs dict --broker $brokerUrl --address topic://$address --count 1".split(" ").toTypedArray() + "receiver --log-msgs dict --broker $brokerUrl --address topic://$address --count 1".split(" ") + .toTypedArray() val t = Thread { print("Receiving: ") @@ -416,7 +458,9 @@ abstract class AbstractMainTest : AbstractTest() { assertNoSystemExit { // "sender --log-msgs dict --broker tcp://127.0.0.1:61617 --address lalaLand --count 1 --conn-ssl-truststore-location --conn-ssl-truststore-password secureexample --conn-ssl-keystore-location /home/jdanek/Downloads/AMQ7/amq7cr1i0/ikeysiold/client-side-keystore.jks --conn-ssl-keystore-password secureexample".split(" ").toTypedArray() val senderParameters = - "sender --log-msgs dict --broker $sslBrokerUrl --address $address --conn-ssl-verify-host false --conn-ssl-trust-all true --count 1".split(" ").toTypedArray() + "sender --log-msgs dict --broker $sslBrokerUrl --address $address --conn-ssl-verify-host false --conn-ssl-trust-all true --count 1".split( + " " + ).toTypedArray() print("Sending: ") main(senderParameters) } @@ -443,10 +487,36 @@ abstract class AbstractMainTest : AbstractTest() { val expected = BigInteger(1, md.digest(content.toByteArray())).toString(16) print(expected) assertNoSystemExit { - val sent = main(arrayOf( - "sender", "--log-msgs", "dict", "--broker", brokerUrl, "--address", address, "--count", "1", "--msg-content", content, "--msg-content-hashed")) - val received = main(arrayOf( - "receiver", "--log-msgs", "dict", "--broker", brokerUrl, "--address", address, "--count", "1", "--msg-content-hashed")) + val sent = main( + arrayOf( + "sender", + "--log-msgs", + "dict", + "--broker", + brokerUrl, + "--address", + address, + "--count", + "1", + "--msg-content", + content, + "--msg-content-hashed" + ) + ) + val received = main( + arrayOf( + "receiver", + "--log-msgs", + "dict", + "--broker", + brokerUrl, + "--address", + address, + "--count", + "1", + "--msg-content-hashed" + ) + ) assertThat(sent.map { it["content"] as String }).containsExactlyElementsIn(listOf(expected)) assertThat(received.map { it["content"] as String }).containsExactlyElementsIn(listOf(expected)) From ba110d6c19a483a1e013dbfcc0222c862f353af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Sat, 8 Oct 2022 11:54:16 +0200 Subject: [PATCH 029/117] Upgrade relevant poms to compile with Java 11 (#445) (cherry picked from commit ff2a8eb3d6e29ef339f605b124c265087c9ac45c) --- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 74a06cb5..c08fc094 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -141,7 +141,7 @@ test-compile - 1.8 + 11 ${project.basedir}/src/test/kotlin ${project.basedir}/src/test/java @@ -239,8 +239,8 @@ maven-compiler-plugin ${plugin.compiler.version} - 1.8 - 1.8 + 11 + 11 -Xlint:all true true diff --git a/pom.xml b/pom.xml index 53a9daec..e0963dca 100644 --- a/pom.xml +++ b/pom.xml @@ -29,8 +29,8 @@ pom - 1.8 - 1.8 + 11 + 11 UTF-8 From 327c3e663520e9aa8cc783223234fc867f8591fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Mon, 10 Oct 2022 21:03:46 +0200 Subject: [PATCH 030/117] Reorganize compile plugin pom sections per Kotlin docs (cherry picked from commit 671c40227ff498be02dafe34c550e8c1053bb6fa) --- parent/pom.xml | 67 ++++++++++++++--------- tests/src/test/kotlin/AbstractMainTest.kt | 2 - 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c08fc094..fd7d0898 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -121,6 +121,7 @@ tests + @@ -128,30 +129,6 @@ tests - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - test-compile - - test-compile - - - 11 - - ${project.basedir}/src/test/kotlin - ${project.basedir}/src/test/java - - - - - - - coverage @@ -234,6 +211,7 @@ ${excludeTests} + org.apache.maven.plugins maven-compiler-plugin @@ -252,22 +230,61 @@ + + + + default-compile + none + + + + default-testCompile + none + + + java-compile + compile + + compile + + + + java-test-compile + test-compile + + testCompile + + + kotlin-maven-plugin org.jetbrains.kotlin ${kotlin.version} + + compile + + compile + + + 11 + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/main/java + + + test-compile test-compile + 11 ${project.basedir}/src/test/kotlin ${project.basedir}/src/test/java - ${project.build.directory}/generated-sources/annotations diff --git a/tests/src/test/kotlin/AbstractMainTest.kt b/tests/src/test/kotlin/AbstractMainTest.kt index 55fef93d..48c872ce 100644 --- a/tests/src/test/kotlin/AbstractMainTest.kt +++ b/tests/src/test/kotlin/AbstractMainTest.kt @@ -32,11 +32,9 @@ import java.io.File import java.math.BigInteger import java.nio.file.Files import java.security.MessageDigest -import java.security.Permission import java.time.Duration import java.time.LocalTime import kotlin.collections.ArrayList -import kotlin.test.fail @Tag("external") abstract class AbstractMainTest : AbstractTest() { From b8850b81c1b7bcca4589d2ef9ff3c677a167f911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Mon, 10 Oct 2022 22:13:00 +0200 Subject: [PATCH 031/117] Workaround stuck builds when compiling with `-T1C` Maven option Caused by bug in the Shade plugin, https://issues.apache.org/jira/browse/MSHADE-329 (cherry picked from commit a0ebdcaded852fbc88c544e753781820664ce116) --- parent/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/parent/pom.xml b/parent/pom.xml index fd7d0898..176d4414 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -174,6 +174,7 @@ ${jar.finalName}-${library.version} + false From 60db2e086b6130289e3925cdcc5a01ea9c94774b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Mon, 10 Oct 2022 22:17:46 +0200 Subject: [PATCH 032/117] Mark tests in interop-tests with external tag (cherry picked from commit c514ae46ea0aaed66c4e7ff1bacdd4dfaf841f77) --- interop-tests/src/test/java/InteropTest.java | 2 ++ interop-tests/src/test/kotlin/InteropTest.kt | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/interop-tests/src/test/java/InteropTest.java b/interop-tests/src/test/java/InteropTest.java index f1880632..10192e96 100644 --- a/interop-tests/src/test/java/InteropTest.java +++ b/interop-tests/src/test/java/InteropTest.java @@ -2,6 +2,7 @@ import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.qpid.jms.JmsConnectionFactory; import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import javax.jms.Connection; @@ -38,6 +39,7 @@ void testComparingMapWithNullValues() { * * @throws Exception */ + @Tag("external") @Test void testSendRhealikeMessage() throws Exception { sendRhealikeMessageToQueue(); diff --git a/interop-tests/src/test/kotlin/InteropTest.kt b/interop-tests/src/test/kotlin/InteropTest.kt index cdc5cd39..5bd750d4 100644 --- a/interop-tests/src/test/kotlin/InteropTest.kt +++ b/interop-tests/src/test/kotlin/InteropTest.kt @@ -20,6 +20,7 @@ import com.google.common.truth.Truth import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -44,6 +45,7 @@ class InteropTest : AbstractTest() { randomSuffix = generateRandomSuffix() } + @Tag("external") @ParameterizedTest(name = "{0} -> {1}") @MethodSource("clientCombinationsProvider") fun `send browse receive empty message`(senderName: String, receiverName: String) { @@ -57,6 +59,7 @@ class InteropTest : AbstractTest() { assertMessagesAreIdentical(address, s, b, r) } + @Tag("external") @ParameterizedTest(name = "{0} -> {1}") @MethodSource("clientCombinationsProvider") fun `send browse receive empty transient message`(senderName: String, receiverName: String) { @@ -70,6 +73,7 @@ class InteropTest : AbstractTest() { assertMessagesAreIdentical(address, s, b, r) } + @Tag("external") @ParameterizedTest(name = "{0} -> {1}") @MethodSource("clientCombinationsProvider") fun `send receive empty message on topic`(senderName: String, receiverName: String) { @@ -91,6 +95,7 @@ class InteropTest : AbstractTest() { Truth.assertThat(mapOf("key" to "null")).containsExactlyEntriesIn(mapOf("key" to null)) } + @Tag("external") @ParameterizedTest(name = "{0} -> {1}") @MethodSource("clientCombinationsProvider") fun `send browse receive expired durable message`(senderName: String, receiverName: String) { @@ -117,6 +122,7 @@ class InteropTest : AbstractTest() { //acc-aac -> send two woth content, autocreate, use 616161... 3:26 Dec 11 2016 /// You'd have to configure lvq for this to work + @Tag("external") @ParameterizedTest(name = "{0} -> {1}") @MethodSource("clientCombinationsProvider") fun `send receive with LVQ`(senderName: String, receiverName: String) { From d5b4bca118688c8df15b6755fc5f90b27b825221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Mon, 10 Oct 2022 22:41:00 +0200 Subject: [PATCH 033/117] Disable failing interop-tests (that is all of them) and compile them by default (cherry picked from commit 70d429dc0b0b33506c7ccb4d57e0c8002afd5954) --- interop-tests/src/test/java/InteropTest.java | 3 +++ interop-tests/src/test/kotlin/InteropTest.kt | 2 ++ pom.xml | 23 +++++--------------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/interop-tests/src/test/java/InteropTest.java b/interop-tests/src/test/java/InteropTest.java index 10192e96..5f1b622b 100644 --- a/interop-tests/src/test/java/InteropTest.java +++ b/interop-tests/src/test/java/InteropTest.java @@ -2,6 +2,7 @@ import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.qpid.jms.JmsConnectionFactory; import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -25,6 +26,7 @@ class InteropTestJava { // Truth.assertThat(Map.of("key", "value")).containsExactlyEntriesIn(n); // } + @Disabled("Fails, not sure what was ment by this") @Test void testComparingMapWithNullValues() { Map m = new HashMap<>(); @@ -39,6 +41,7 @@ void testComparingMapWithNullValues() { * * @throws Exception */ + @Disabled("Fails with broker, java.lang.RuntimeException: class java.util.ArrayList is not a valid property type") @Tag("external") @Test void testSendRhealikeMessage() throws Exception { diff --git a/interop-tests/src/test/kotlin/InteropTest.kt b/interop-tests/src/test/kotlin/InteropTest.kt index 5bd750d4..052c5ccf 100644 --- a/interop-tests/src/test/kotlin/InteropTest.kt +++ b/interop-tests/src/test/kotlin/InteropTest.kt @@ -20,6 +20,7 @@ import com.google.common.truth.Truth import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test import org.junit.jupiter.params.ParameterizedTest @@ -29,6 +30,7 @@ import java.util.stream.Stream import kotlin.reflect.full.companionObject +@Disabled("This no longer works, esp due to jmslib/jakartalib clashes") class InteropTest : AbstractTest() { override val prefix: String = "interopTestAddress" diff --git a/pom.xml b/pom.xml index e0963dca..8a3b51e0 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,12 @@ cli-activemq cli-artemis-jms cli-paho-java + cli-protonj2 + cli-qpid-jms + broker + + interop-tests @@ -68,22 +73,4 @@ - - - interop-tests - - interop-tests - - - - java11plus - - [11,) - - - cli-protonj2 - cli-qpid-jms - - - From 2c2696ce37a721fcce0fb38539d12ab43079b8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Mon, 10 Oct 2022 23:18:16 +0200 Subject: [PATCH 034/117] Delete some remnant of interop/pom.xml file (#462) (cherry picked from commit 90d670df78cb63dd45e413fd00696b5606e4e236) --- interop/pom.xml | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 interop/pom.xml diff --git a/interop/pom.xml b/interop/pom.xml deleted file mode 100644 index 4fcfd648..00000000 --- a/interop/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - parent - com.redhat.cli-java - 1.2.2-SNAPSHOT - ../parent/pom.xml - - 4.0.0 - - interop - - - From 7079a742420cce4e354f597aaf19e4a2cb512a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Tue, 11 Oct 2022 00:11:30 +0200 Subject: [PATCH 035/117] Compile cli-activemq-jmx by default (was dead code previously) (#463) (cherry picked from commit 5ec25a80ba13ad434c7ada8d4d5a5012d277385b) --- cli-activemq-jmx/pom.xml | 4 ++++ .../amqx/management/activemq/QueueActiveMQManager.java | 6 ++---- .../amqx/management/activemq/TopicActiveMQManager.java | 6 ++---- .../amqx/management/artemis/DivertArtemisManager.java | 8 -------- cli-activemq-jmx/src/test/kotlin/MainTest.kt | 2 ++ pom.xml | 2 ++ 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/cli-activemq-jmx/pom.xml b/cli-activemq-jmx/pom.xml index afa8c8c0..8926bb67 100644 --- a/cli-activemq-jmx/pom.xml +++ b/cli-activemq-jmx/pom.xml @@ -103,6 +103,10 @@ JAMQ7 + + true + + ${jamq7.version} diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/QueueActiveMQManager.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/QueueActiveMQManager.java index 81c94623..68829cbe 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/QueueActiveMQManager.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/QueueActiveMQManager.java @@ -1,6 +1,5 @@ package com.redhat.amqx.management.activemq; -import com.redhat.amqx.formatters.PythonFormatter; import com.redhat.amqx.management.Credentials; import com.redhat.amqx.management.DestinationManager; import com.redhat.amqx.management.exception.DestinationException; @@ -9,7 +8,6 @@ import org.apache.activemq.broker.jmx.BrokerViewMBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; import javax.management.ObjectName; import java.io.IOException; @@ -64,7 +62,7 @@ public void removeDestination(final String destinationName, String addressName) @Override public void removeMessages(String destinationName, String addressName) throws Exception { - throw new NotImplementedException(); + throw new UnsupportedOperationException("Not implemented yet"); } @Override @@ -80,7 +78,7 @@ public void addDestination(final String destinationName, boolean durable, String @Override public void addDestination(String destinationName, boolean durable, String addressName, String selector, int maxConsumers, boolean deleteOnNoConsumers) throws Exception { - throw new NotImplementedException(); + throw new UnsupportedOperationException("Not implemented yet"); } protected String getFormattedDestinationProperties(String destinationName) throws Exception { diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/TopicActiveMQManager.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/TopicActiveMQManager.java index 1a499e77..149747a3 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/TopicActiveMQManager.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/TopicActiveMQManager.java @@ -1,6 +1,5 @@ package com.redhat.amqx.management.activemq; -import com.redhat.amqx.formatters.PythonFormatter; import com.redhat.amqx.main.NodeType; import com.redhat.amqx.management.Credentials; import com.redhat.amqx.management.DestinationManager; @@ -11,7 +10,6 @@ import org.apache.activemq.broker.jmx.BrokerViewMBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; import javax.management.ObjectName; import java.io.IOException; @@ -72,7 +70,7 @@ public void removeDestination(final String destinationName, String addressName) @Override public void removeMessages(String destinationName, String addressName) throws Exception { - throw new NotImplementedException(); + throw new UnsupportedOperationException("Not implemented yet"); } @Override @@ -88,7 +86,7 @@ public void addDestination(final String destinationName, boolean durable, String @Override public void addDestination(String destinationName, boolean durable, String addressName, String selector, int maxConsumers, boolean deleteOnNoConsumers) throws Exception { - throw new NotImplementedException(); + throw new UnsupportedOperationException("Not implemented yet"); } @Override diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/DivertArtemisManager.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/DivertArtemisManager.java index 5513c2a7..f36db172 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/DivertArtemisManager.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/DivertArtemisManager.java @@ -2,22 +2,14 @@ import com.redhat.amqx.main.NodeType; import com.redhat.amqx.management.Credentials; -import com.redhat.amqx.management.DestinationManager; import com.redhat.amqx.management.exception.DestinationException; -import org.apache.activemq.artemis.api.core.ActiveMQAddressDoesNotExistException; -import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException; -import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.api.core.management.AddressControl; -import org.apache.activemq.artemis.api.core.management.DivertControl; import org.json.JSONArray; import org.json.JSONObject; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; import java.io.IOException; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * Destination object management for Apache Artemis/AMQ7 broker. diff --git a/cli-activemq-jmx/src/test/kotlin/MainTest.kt b/cli-activemq-jmx/src/test/kotlin/MainTest.kt index b6df0fcd..07d9b9c6 100644 --- a/cli-activemq-jmx/src/test/kotlin/MainTest.kt +++ b/cli-activemq-jmx/src/test/kotlin/MainTest.kt @@ -1,6 +1,8 @@ +import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class AmqxMain { + @Tag("external") @Test fun `queue properties`() { com.redhat.amqx.main.Main.main( diff --git a/pom.xml b/pom.xml index 8a3b51e0..0d50973a 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,8 @@ cli-protonj2 cli-qpid-jms + cli-activemq-jmx + broker interop-tests From bdd1edbc992e2df782d49351315f154196b88582 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 22:16:40 +0000 Subject: [PATCH 036/117] Bump slfj.version from 1.7.33 to 2.0.3 (#465) Bumps `slfj.version` from 1.7.33 to 2.0.3. Updates `slf4j-log4j12` from 1.7.33 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.33...v_2.0.3) Updates `slf4j-api` from 1.6.6 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.6.6...v_2.0.3) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-log4j12 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 882a40c1850ec89ce9ce4dca35d3b188ff4a0d04) --- cli-activemq-jmx/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-activemq-jmx/pom.xml b/cli-activemq-jmx/pom.xml index 8926bb67..8030e6ea 100644 --- a/cli-activemq-jmx/pom.xml +++ b/cli-activemq-jmx/pom.xml @@ -32,7 +32,7 @@ amqx - 1.6.6 + 2.0.3 20160810 1.4 From 491b7d61610230ac70e522f56d1e07442717a371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Thu, 13 Oct 2022 15:06:53 +0200 Subject: [PATCH 037/117] Use log4j2 implementation to get rid of log4j1-related warnings (#471) (cherry picked from commit df642fb33267365a538b374f3ff95fd52380264f) --- bom/pom.xml | 18 +++- broker/src/test/java/util/Broker.java | 9 +- cli-activemq-jmx/pom.xml | 5 +- .../com/redhat/amqx/main/LogConfigurator.java | 65 ++++--------- .../{log4j.properties => log4j2.properties} | 23 ++--- .../src/main/resources/log4j2.properties | 14 ++- .../main/java/com/redhat/mqe/amc/Client.java | 8 +- .../java/com/redhat/mqe/amc/Receiver.java | 2 +- .../main/java/com/redhat/mqe/amc/Sender.java | 2 +- .../{log4j.properties => log4j2.properties} | 32 ++++--- .../src/main/resources/log4j.properties | 42 -------- .../src/main/resources/log4j2.properties | 28 +++--- cli-qpid-jms/pom.xml | 4 + .../{log4j.properties => log4j2.properties} | 34 +++---- .../src/test/java/ConnectWithoutPassword.java | 11 --- .../src/test/java/QPIDJMS412Test.java | 9 -- .../src/test/java/QPIDJMS451Test.java | 10 -- .../src/test/java/QPIDJMS484Test.java | 10 -- .../src/test/kotlin/QPIDJMS391Test.kt | 96 +++++++++++++------ .../src/test/kotlin/QPIDJMS502Test.kt | 20 +--- .../src/test/resources/log4j2-test.properties | 35 ++++--- lib/pom.xml | 4 + .../main/java/com/redhat/mqe/lib/Utils.java | 11 +-- parent/pom.xml | 10 +- 24 files changed, 220 insertions(+), 282 deletions(-) rename cli-activemq/src/main/resources/{log4j.properties => log4j2.properties} (55%) rename cli-qpid-jms/src/test/resources/log4j.properties => cli-artemis-jms/src/main/resources/log4j2.properties (73%) rename cli-paho-java/src/main/resources/{log4j.properties => log4j2.properties} (53%) delete mode 100644 cli-protonj2/src/main/resources/log4j.properties rename cli-artemis-jms/src/main/resources/log4j.properties => cli-protonj2/src/main/resources/log4j2.properties (53%) rename cli-qpid-jms/src/main/resources/{log4j.properties => log4j2.properties} (52%) rename cli-protonj2/src/test/java/resources/log4j.properties => cli-qpid-jms/src/test/resources/log4j2-test.properties (52%) diff --git a/bom/pom.xml b/bom/pom.xml index 04328468..12d9acf1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -33,7 +33,8 @@ pom - 1.7.33 + 2.0.3 + 2.19.0 5.0.4 2.44 2.13.4 @@ -63,9 +64,20 @@ org.slf4j - slf4j-log4j12 - ${slfj.version} + slf4j-api + ${slf4j-api.version} + + org.apache.logging.log4j + log4j-slf4j2-impl + ${log4j-slf4j2-impl.version} + + + org.apache.logging.log4j + log4j-core + ${log4j-slf4j2-impl.version} + + net.sf.jopt-simple jopt-simple diff --git a/broker/src/test/java/util/Broker.java b/broker/src/test/java/util/Broker.java index f0fbbb33..785a91ff 100644 --- a/broker/src/test/java/util/Broker.java +++ b/broker/src/test/java/util/Broker.java @@ -25,9 +25,6 @@ import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; import org.apache.activemq.artemis.spi.core.remoting.Acceptor; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.LogManager; -import org.apache.log4j.SimpleLayout; import org.junit.jupiter.api.extension.ExtensionContext; import java.io.IOException; @@ -89,11 +86,7 @@ public void close() { * Configures a log4j appender if there isn't any, so that log messages flood the stdout */ public static void configureLogging() { - if (LogManager.getRootLogger().getAllAppenders().hasMoreElements()) { - return; - } - ConsoleAppender consoleAppender = new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT); - LogManager.getRootLogger().addAppender(consoleAppender); + throw new UnsupportedOperationException("Not implemented yet."); } /** diff --git a/cli-activemq-jmx/pom.xml b/cli-activemq-jmx/pom.xml index 8030e6ea..dc0e2415 100644 --- a/cli-activemq-jmx/pom.xml +++ b/cli-activemq-jmx/pom.xml @@ -53,9 +53,8 @@ - org.slf4j - slf4j-log4j12 - ${slf4j.version} + org.apache.logging.log4j + log4j-core diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/main/LogConfigurator.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/main/LogConfigurator.java index 377c0acb..442c150d 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/main/LogConfigurator.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/main/LogConfigurator.java @@ -1,11 +1,17 @@ package com.redhat.amqx.main; -import org.apache.log4j.PropertyConfigurator; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.config.Configuration; +import org.apache.logging.log4j.core.config.LoggerConfig; -import java.util.Properties; +import java.util.function.Consumer; /** * Utility class to configure log messages + *

+ * https://logging.apache.org/log4j/2.x/manual/api.html + * https://logging.apache.org/log4j/2.x/manual/customconfig.html */ public class LogConfigurator { /** @@ -15,73 +21,38 @@ private LogConfigurator() { } - private static void configureCommon(Properties properties) { - properties.setProperty("log4j.appender.stdout", "org.apache.log4j.ConsoleAppender"); - properties.setProperty("log4j.appender.stdout.Target", "System.out"); - properties.setProperty("log4j.appender.stdout.layout", "org.apache.log4j.PatternLayout"); - properties.setProperty("log4j.appender.stdout.layout.ConversionPattern", "%m%n"); - } - - private static void configureTrace(Properties properties) { - properties.setProperty("log4j.rootLogger", "TRACE, stdout"); - } - - private static void configureDebug(Properties properties) { - properties.setProperty("log4j.rootLogger", "DEBUG, stdout"); - } + private static void configureCommon(Consumer customizeConfig) { + final LoggerContext context = LoggerContext.getContext(false); + final Configuration config = context.getConfiguration(); + LoggerConfig rootLogger = config.getRootLogger(); - private static void configureInfo(Properties properties) { - properties.setProperty("log4j.rootLogger", "INFO, stdout"); - } + customizeConfig.accept(rootLogger); - private static void configureError(Properties properties) { - properties.setProperty("log4j.rootLogger", "ERROR, stdout"); + context.updateLoggers(); } - - /** - * Configure the output to be at trace level - */ public static void trace() { - Properties properties = new Properties(); - - configureCommon(properties); - configureTrace(properties); - - PropertyConfigurator.configure(properties); + configureCommon((LoggerConfig config) -> config.setLevel(Level.TRACE)); } /** * Configure the output to be at debug level */ public static void debug() { - Properties properties = new Properties(); - - configureCommon(properties); - configureDebug(properties); - PropertyConfigurator.configure(properties); + configureCommon((LoggerConfig config) -> config.setLevel(Level.DEBUG)); } /** * Configure the output to be at info (info) level */ public static void info() { - Properties properties = new Properties(); - - configureCommon(properties); - configureInfo(properties); - PropertyConfigurator.configure(properties); + configureCommon((LoggerConfig config) -> config.setLevel(Level.INFO)); } /** * Configure the output to be as error as possible */ public static void error() { - Properties properties = new Properties(); - - configureCommon(properties); - configureError(properties); - - PropertyConfigurator.configure(properties); + configureCommon((LoggerConfig config) -> config.setLevel(Level.ERROR)); } } diff --git a/cli-activemq/src/main/resources/log4j.properties b/cli-activemq/src/main/resources/log4j2.properties similarity index 55% rename from cli-activemq/src/main/resources/log4j.properties rename to cli-activemq/src/main/resources/log4j2.properties index 968f060d..a91e958c 100644 --- a/cli-activemq/src/main/resources/log4j.properties +++ b/cli-activemq/src/main/resources/log4j2.properties @@ -17,20 +17,15 @@ # limitations under the License. # -# Set root logger level to DEBUG and its only appender to console -# This sets ALL the logs to given level. -log4j.rootLogger=WARN, console +rootLogger=WARN, console -log4j.logger.com.redhat.mqe.lib=INFO, console -log4j.additivity.com.redhat.mqe.lib=false +logger.lib.name=com.redhat.mqe.lib +logger.lib.level=INFO -log4j.logger.io.netty=WARN, console -log4j.logger.netty=WARN, console +logger.netty.name=io.netty +logger.netty.level=WARN -# Appender "console" settings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.err -log4j.appender.console.Threshold=all -log4j.appender.console.layout=org.apache.log4j.PatternLayout -#log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %m%n +# Console appender +appender.console.type=Console +appender.console.name=console +appender.console.target=SYSTEM_ERR diff --git a/cli-qpid-jms/src/test/resources/log4j.properties b/cli-artemis-jms/src/main/resources/log4j2.properties similarity index 73% rename from cli-qpid-jms/src/test/resources/log4j.properties rename to cli-artemis-jms/src/main/resources/log4j2.properties index 128ef5e8..be82b864 100644 --- a/cli-qpid-jms/src/test/resources/log4j.properties +++ b/cli-artemis-jms/src/main/resources/log4j2.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018 Red Hat, Inc. +# Copyright (c) 2017 Red Hat, Inc. # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -16,3 +16,15 @@ # See the License for the specific language governing permissions and # limitations under the License. # +rootLogger=WARN, console + +logger.lib.name=com.redhat.mqe.lib +logger.lib.level=INFO + +logger.netty.name=io.netty +logger.netty.level=WARN + +# Console appender +appender.console.type=Console +appender.console.name=console +appender.console.target=SYSTEM_ERR diff --git a/cli-paho-java/src/main/java/com/redhat/mqe/amc/Client.java b/cli-paho-java/src/main/java/com/redhat/mqe/amc/Client.java index 830d7305..7be09401 100644 --- a/cli-paho-java/src/main/java/com/redhat/mqe/amc/Client.java +++ b/cli-paho-java/src/main/java/com/redhat/mqe/amc/Client.java @@ -23,12 +23,14 @@ import joptsimple.OptionParser; import joptsimple.OptionSet; import joptsimple.OptionSpec; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.Map; @@ -238,7 +240,7 @@ static void closeClient(MqttClient client) throws MqttException { } protected Logger setUpLogger(String name) { - Logger log = Logger.getLogger(name); + org.apache.logging.log4j.core.Logger log = (org.apache.logging.log4j.core.Logger) LogManager.getLogger(name); log.setLevel(Level.WARN); return log; } diff --git a/cli-paho-java/src/main/java/com/redhat/mqe/amc/Receiver.java b/cli-paho-java/src/main/java/com/redhat/mqe/amc/Receiver.java index e66f16fe..803846e6 100644 --- a/cli-paho-java/src/main/java/com/redhat/mqe/amc/Receiver.java +++ b/cli-paho-java/src/main/java/com/redhat/mqe/amc/Receiver.java @@ -20,7 +20,7 @@ package com.redhat.mqe.amc; import joptsimple.OptionParser; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.eclipse.paho.client.mqttv3.*; diff --git a/cli-paho-java/src/main/java/com/redhat/mqe/amc/Sender.java b/cli-paho-java/src/main/java/com/redhat/mqe/amc/Sender.java index 00c88e0c..9e229987 100644 --- a/cli-paho-java/src/main/java/com/redhat/mqe/amc/Sender.java +++ b/cli-paho-java/src/main/java/com/redhat/mqe/amc/Sender.java @@ -28,7 +28,7 @@ import org.eclipse.paho.client.mqttv3.MqttMessage; import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; /** diff --git a/cli-paho-java/src/main/resources/log4j.properties b/cli-paho-java/src/main/resources/log4j2.properties similarity index 53% rename from cli-paho-java/src/main/resources/log4j.properties rename to cli-paho-java/src/main/resources/log4j2.properties index 532b055b..55ea0f46 100644 --- a/cli-paho-java/src/main/resources/log4j.properties +++ b/cli-paho-java/src/main/resources/log4j2.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018 Red Hat, Inc. +# Copyright (c) 2022 Red Hat, Inc. # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -16,17 +16,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Set root logger level to DEBUG and its only appender to console -# This sets ALL the logs to given level. -log4j.rootLogger=ALL, console -log4j.logger.com.redhat.mqe.lib=ALL, console -log4j.additivity.com.redhat.mqe.lib=false -log4j.logger.io.netty=ALL, console -log4j.logger.netty=ALL, console -# Appender "console" settings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.err -log4j.appender.console.Threshold=all -log4j.appender.console.layout=org.apache.log4j.PatternLayout -#log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %m%n +rootLogger=ALL, console + +logger.lib.name=com.redhat.mqe.lib +logger.lib.level=INFO + +logger.netty.name=io.netty +logger.netty.level=WARN + +# Log transport.traceBytes=true messages +logger.NettyTcpTransport.name=org.apache.qpid.jms.transports.netty.NettyTcpTransport +logger.NettyTcpTransport.level=DEBUG + +# Console appender +appender.console.type=Console +appender.console.name=console +appender.console.target=SYSTEM_ERR diff --git a/cli-protonj2/src/main/resources/log4j.properties b/cli-protonj2/src/main/resources/log4j.properties deleted file mode 100644 index 37b7713d..00000000 --- a/cli-protonj2/src/main/resources/log4j.properties +++ /dev/null @@ -1,42 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Set root logger level to DEBUG and its only appender to console -# This sets ALL the logs to given level. -log4j.rootLogger=ERROR, console - -# Uncomment this to get debug logs from qpid-jms -#log4j.logger.org.apache.qpid=DEBUG, console - -log4j.logger.com.redhat.mqe.jms=INFO, console -log4j.additivity.com.redhat.mqe.jms=false - -log4j.logger.io.netty=WARN, console -log4j.logger.netty=WARN, console - -# Log transport.traceBytes=true messages -log4j.logger.org.apache.qpid.jms.transports.netty.NettyTcpTransport=DEBUG, console - -# Appender "console" settings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.err -log4j.appender.console.Threshold=all -log4j.appender.console.layout=org.apache.log4j.PatternLayout -#log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %m%n diff --git a/cli-artemis-jms/src/main/resources/log4j.properties b/cli-protonj2/src/main/resources/log4j2.properties similarity index 53% rename from cli-artemis-jms/src/main/resources/log4j.properties rename to cli-protonj2/src/main/resources/log4j2.properties index 968f060d..e6c0e82b 100644 --- a/cli-artemis-jms/src/main/resources/log4j.properties +++ b/cli-protonj2/src/main/resources/log4j2.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2017 Red Hat, Inc. +# Copyright (c) 2022 Red Hat, Inc. # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -16,21 +16,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # +rootLogger=WARN, console -# Set root logger level to DEBUG and its only appender to console -# This sets ALL the logs to given level. -log4j.rootLogger=WARN, console +logger.lib.name=com.redhat.mqe.lib +logger.lib.level=INFO -log4j.logger.com.redhat.mqe.lib=INFO, console -log4j.additivity.com.redhat.mqe.lib=false +logger.netty.name=io.netty +logger.netty.level=WARN -log4j.logger.io.netty=WARN, console -log4j.logger.netty=WARN, console +# Log transport.traceBytes=true messages +logger.NettyTcpTransport.name=org.apache.qpid.jms.transports.netty.NettyTcpTransport +logger.NettyTcpTransport.level=DEBUG -# Appender "console" settings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.err -log4j.appender.console.Threshold=all -log4j.appender.console.layout=org.apache.log4j.PatternLayout -#log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %m%n +# Console appender +appender.console.type=Console +appender.console.name=console +appender.console.target=SYSTEM_ERR diff --git a/cli-qpid-jms/pom.xml b/cli-qpid-jms/pom.xml index b5dbe1e2..d5c8333b 100644 --- a/cli-qpid-jms/pom.xml +++ b/cli-qpid-jms/pom.xml @@ -124,6 +124,10 @@ test-jar test + + org.apache.logging.log4j + log4j-core + diff --git a/cli-qpid-jms/src/main/resources/log4j.properties b/cli-qpid-jms/src/main/resources/log4j2.properties similarity index 52% rename from cli-qpid-jms/src/main/resources/log4j.properties rename to cli-qpid-jms/src/main/resources/log4j2.properties index 37b7713d..5469b57e 100644 --- a/cli-qpid-jms/src/main/resources/log4j.properties +++ b/cli-qpid-jms/src/main/resources/log4j2.properties @@ -16,27 +16,23 @@ # specific language governing permissions and limitations # under the License. # +rootLogger=WARN, console -# Set root logger level to DEBUG and its only appender to console -# This sets ALL the logs to given level. -log4j.rootLogger=ERROR, console +logger.lib.name=com.redhat.mqe.lib +logger.lib.level=INFO -# Uncomment this to get debug logs from qpid-jms -#log4j.logger.org.apache.qpid=DEBUG, console - -log4j.logger.com.redhat.mqe.jms=INFO, console -log4j.additivity.com.redhat.mqe.jms=false - -log4j.logger.io.netty=WARN, console -log4j.logger.netty=WARN, console +logger.netty.name=io.netty +logger.netty.level=WARN # Log transport.traceBytes=true messages -log4j.logger.org.apache.qpid.jms.transports.netty.NettyTcpTransport=DEBUG, console +logger.NettyTcpTransport.name=org.apache.qpid.jms.transports.netty.NettyTcpTransport +logger.NettyTcpTransport.level=DEBUG + +# Uncomment this to get debug logs from qpid-jms +#logger.qpid.name=org.slf4j.simpleLogger.log.org.apache.qpid +#logger.qpid.level=DEBUG -# Appender "console" settings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.err -log4j.appender.console.Threshold=all -log4j.appender.console.layout=org.apache.log4j.PatternLayout -#log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %m%n +# Console appender +appender.console.type=Console +appender.console.name=console +appender.console.target=SYSTEM_ERR diff --git a/cli-qpid-jms/src/test/java/ConnectWithoutPassword.java b/cli-qpid-jms/src/test/java/ConnectWithoutPassword.java index 565889e2..e5b85767 100644 --- a/cli-qpid-jms/src/test/java/ConnectWithoutPassword.java +++ b/cli-qpid-jms/src/test/java/ConnectWithoutPassword.java @@ -17,11 +17,7 @@ * limitations under the License. */ -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.LogManager; -import org.apache.log4j.SimpleLayout; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import util.Broker; @@ -32,13 +28,6 @@ @SuppressWarnings("Duplicates") class ConnectWithoutPassword { - - @BeforeAll - static void configureLogging() { - ConsoleAppender consoleAppender = new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT); - LogManager.getRootLogger().addAppender(consoleAppender); - } - @Test void reconnectOneServerNoAuthGuestNotConfigured() { try (Broker broker = new Broker()) { diff --git a/cli-qpid-jms/src/test/java/QPIDJMS412Test.java b/cli-qpid-jms/src/test/java/QPIDJMS412Test.java index bef46b6c..b9a2239a 100644 --- a/cli-qpid-jms/src/test/java/QPIDJMS412Test.java +++ b/cli-qpid-jms/src/test/java/QPIDJMS412Test.java @@ -1,8 +1,5 @@ import org.apache.activemq.artemis.core.config.impl.SecurityConfiguration; import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.LogManager; -import org.apache.log4j.SimpleLayout; import org.apache.qpid.jms.exceptions.JMSSecuritySaslException; import org.apache.qpid.jms.exceptions.JmsConnectionFailedException; import org.junit.jupiter.api.Assertions; @@ -26,12 +23,6 @@ class QPIDJMS412Test { private static final String USER_NAME = "someUser"; private static final String PASSWORD = "somePassword"; - @BeforeAll - static void configureLogging() { - ConsoleAppender consoleAppender = new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT); - LogManager.getRootLogger().addAppender(consoleAppender); - } - @Test @Tag("issue") @DisplayName("client should stop reconnect if sasl auth fails on first server (auth is set up)") diff --git a/cli-qpid-jms/src/test/java/QPIDJMS451Test.java b/cli-qpid-jms/src/test/java/QPIDJMS451Test.java index 96e0ef33..ca448760 100644 --- a/cli-qpid-jms/src/test/java/QPIDJMS451Test.java +++ b/cli-qpid-jms/src/test/java/QPIDJMS451Test.java @@ -17,11 +17,7 @@ * limitations under the License. */ -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.LogManager; -import org.apache.log4j.SimpleLayout; import org.apache.qpid.jms.JmsConnectionFactory; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; @@ -39,12 +35,6 @@ import java.nio.file.Path; class QPIDJMS451Test { - @BeforeAll - static void configureLogging() { - ConsoleAppender consoleAppender = new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT); - LogManager.getRootLogger().addAppender(consoleAppender); - } - @Test @ExtendWith(BrokerFixture.class) void testSessionRecoverWithDurableSub(@BrokerFixture.TempBroker Broker broker, @TempDir Path tempDir) throws Exception { diff --git a/cli-qpid-jms/src/test/java/QPIDJMS484Test.java b/cli-qpid-jms/src/test/java/QPIDJMS484Test.java index 6a7ac9f2..47171181 100644 --- a/cli-qpid-jms/src/test/java/QPIDJMS484Test.java +++ b/cli-qpid-jms/src/test/java/QPIDJMS484Test.java @@ -22,12 +22,8 @@ import org.apache.activemq.artemis.core.config.CoreQueueConfiguration; import org.apache.activemq.artemis.core.server.MessageReference; import org.apache.activemq.artemis.core.server.Queue; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.LogManager; -import org.apache.log4j.SimpleLayout; import org.apache.qpid.jms.JmsConnectionFactory; import org.apache.qpid.jms.JmsQueue; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -51,12 +47,6 @@ @Tag("issue") public class QPIDJMS484Test { - @BeforeAll - static void configureLogging() { - ConsoleAppender consoleAppender = new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT); - LogManager.getRootLogger().addAppender(consoleAppender); - } - @Test @ExtendWith(BrokerFixture.class) void testSendDispositionsAfterRecoverForUnacknowledgedMessages(@BrokerFixture.TempBroker Broker broker, @TempDir Path tempDir) throws Exception { diff --git a/cli-qpid-jms/src/test/kotlin/QPIDJMS391Test.kt b/cli-qpid-jms/src/test/kotlin/QPIDJMS391Test.kt index 6f865a54..5b4a7efc 100644 --- a/cli-qpid-jms/src/test/kotlin/QPIDJMS391Test.kt +++ b/cli-qpid-jms/src/test/kotlin/QPIDJMS391Test.kt @@ -19,13 +19,17 @@ import com.google.common.truth.Correspondence import com.google.common.truth.Truth.assertThat +import jakarta.jms.Connection +import jakarta.jms.ConnectionFactory +import jakarta.jms.Session import org.apache.activemq.artemis.core.config.impl.SecurityConfiguration import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager -import org.apache.log4j.* -import org.apache.log4j.spi.LoggingEvent +import org.apache.logging.log4j.* +import org.apache.logging.log4j.core.* +import org.apache.logging.log4j.core.appender.AbstractAppender +import org.apache.logging.log4j.core.config.* import org.apache.qpid.jms.transports.TransportSupport import org.junit.jupiter.api.* -import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.io.TempDir import util.Broker import java.io.File @@ -64,23 +68,19 @@ class QPIDJMS391Test { val amqpPort = broker.startBroker() val amqpsPort = broker.addAMQPSAcceptor(keystore) - val ala = ArrayListAppender() - LogManager.getLogger(TransportSupport::class.java).let { - it.level = Level.DEBUG - it.addAppender(ala) - } + val listAppender = ArrayListAppender.installLogger(TransportSupport::class.java.name, Level.DEBUG) // the config option is only used when we create actual ssl connection val f: ConnectionFactory = org.apache.qpid.jms.JmsConnectionFactory( - "amqps://127.0.0.1:$amqpsPort?transport.useOpenSSL=true&transport.trustAll=true&transport.verifyHost=false") + "amqps://127.0.0.1:$amqpsPort?transport.useOpenSSL=true&transport.trustAll=true&transport.verifyHost=false" + ) val c: Connection = f.createConnection(USER_NAME, PASSWORD) c.start() val s: Session = c.createSession(Session.AUTO_ACKNOWLEDGE) s.close() c.close() - val messages = ala.loggingEvents.map { it.renderedMessage } - assertThat(messages) + assertThat(listAppender.messages) .comparingElementsUsing(Correspondence.from(::regexpCorrespondence, "RegexpCorrespondence())")) .contains("OpenSSL Enabled: Version .* of OpenSSL will be used") @@ -94,7 +94,8 @@ class QPIDJMS391Test { val securityConfiguration = SecurityConfiguration() securityConfiguration.addUser(USER_NAME, PASSWORD) val activeMQJAASSecurityManager = ActiveMQJAASSecurityManager( - "org.apache.activemq.artemis.spi.core.security.jaas.InVMLoginModule", securityConfiguration) + "org.apache.activemq.artemis.spi.core.security.jaas.InVMLoginModule", securityConfiguration + ) broker.embeddedBroker.setSecurityManager(activeMQJAASSecurityManager) broker.configuration.isPersistenceEnabled = false @@ -102,14 +103,7 @@ class QPIDJMS391Test { } companion object { - private val overrideDefaultTLS = "com.ibm.jsse2.overrideDefaultTLS" - - @JvmStatic - @BeforeAll - internal fun configureLogging() { - val consoleAppender = ConsoleAppender(SimpleLayout(), ConsoleAppender.SYSTEM_OUT) - LogManager.getRootLogger().addAppender(consoleAppender) - } + private const val overrideDefaultTLS = "com.ibm.jsse2.overrideDefaultTLS" @JvmStatic fun regexpCorrespondence(actual: String?, expected: String?): Boolean { @@ -133,14 +127,62 @@ class QPIDJMS391Test { } } -class ArrayListAppender : AppenderSkeleton() { - val loggingEvents = ArrayList() +// https://stackoverflow.com/questions/59713891/appenderskeleton-log4j2 +class ArrayListAppender : AbstractAppender("ArrayListAppender", null, null, true, Property.EMPTY_ARRAY) { + val messages = ArrayList() - override fun requiresLayout(): Boolean = false - - override fun append(loggingEvent: LoggingEvent) { - loggingEvents.add(loggingEvent) + override fun append(event: LogEvent) { + messages.add(event.message.formattedMessage) } - override fun close() = Unit + companion object { + + /** + * + * Creates an instance and attaches it to log4j2 as logger for the given name. + * + * Blind alleys + * + * val listAppender = ArrayListAppender() + * listAppender.start() + * (LogManager.getContext(true).getLogger(TransportSupport::class.java) as Logger).let { + * it.level = Level.DEBUG + * it.addAppender(listAppender) + * } + * + * That will reconfigure existing logger, and since we don't have config for this yet, it will reconfigure + * the root logger (named ""). It looks up the closest parent, which in this test is going to be root. + * + */ + fun installLogger(loggerName: String, loggerLevel: Level?): ArrayListAppender { + // note this code is specific for log4j2-core, does not use slf4j abstraction nor log4j2 abstraction + val loggerContext = LogManager.getContext(false) as LoggerContext + val configuration = loggerContext.configuration + + val listAppender = ArrayListAppender() + listAppender.start() + + // https://logging.apache.org/log4j/2.x/manual/customconfig.html#AddingToCurrent + configuration.addAppender(listAppender) + val loggerConfig = LoggerConfig.newBuilder() + .withLoggerName(loggerName) + .withLevel(loggerLevel) + .withAdditivity(true) + .withRefs( + arrayOf(AppenderRef.createAppenderRef(listAppender.name, loggerLevel, null)) + ) + .withProperties(null) + .withConfig(loggerContext.configuration) + .withtFilter(null) + .build() + + loggerConfig.addAppender(listAppender, loggerLevel, null) + + configuration.addLogger(loggerName, loggerConfig) + + loggerContext.updateLoggers() + + return listAppender + } + } } diff --git a/cli-qpid-jms/src/test/kotlin/QPIDJMS502Test.kt b/cli-qpid-jms/src/test/kotlin/QPIDJMS502Test.kt index 6afa49e3..9b530daa 100644 --- a/cli-qpid-jms/src/test/kotlin/QPIDJMS502Test.kt +++ b/cli-qpid-jms/src/test/kotlin/QPIDJMS502Test.kt @@ -19,11 +19,8 @@ import com.google.common.truth.Correspondence import com.google.common.truth.Truth.assertThat -import org.apache.log4j.Level -import org.apache.log4j.LogManager import org.apache.qpid.jms.JmsConnection import org.awaitility.Awaitility.await -import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test @@ -35,6 +32,7 @@ import java.util.* import javax.jms.Connection import javax.jms.ConnectionFactory import javax.jms.Session +import org.apache.logging.log4j.Level @Tag("issue") class QPIDJMS502Test { @@ -59,11 +57,7 @@ class QPIDJMS502Test { val amqpPort1 = broker.addAMQPAcceptor() val amqpPort2 = broker.addAMQPAcceptor() - val ala = ArrayListAppender() - LogManager.getLogger(JmsConnection::class.java).let { - it.level = Level.INFO - it.addAppender(ala) - } + val ala = ArrayListAppender.installLogger(JmsConnection::class.java.name, Level.INFO) val f: ConnectionFactory = org.apache.qpid.jms.JmsConnectionFactory( "failover:(amqp://127.0.0.1:$amqpPort1,amqp://127.0.0.1:$amqpPort2)") @@ -81,8 +75,7 @@ class QPIDJMS502Test { assertThat(connections.first().id).isNotEqualTo(oldId) } - val messages = ala.loggingEvents.map { it.renderedMessage } - assertThat(messages) + assertThat(ala.messages) .comparingElementsUsing(Correspondence.from(::regexpCorrespondence, "RegexpCorrespondence())")) .contains("Connection .* restored to server: .*") @@ -98,13 +91,6 @@ class QPIDJMS502Test { } companion object { - @JvmStatic - @BeforeAll - internal fun configureLogging() { -// val consoleAppender = ConsoleAppender(SimpleLayout(), ConsoleAppender.SYSTEM_OUT) -// LogManager.getRootLogger().addAppender(consoleAppender) - } - @JvmStatic fun regexpCorrespondence(actual: String?, expected: String?): Boolean { return actual!!.matches(Regex(expected!!)) diff --git a/cli-protonj2/src/test/java/resources/log4j.properties b/cli-qpid-jms/src/test/resources/log4j2-test.properties similarity index 52% rename from cli-protonj2/src/test/java/resources/log4j.properties rename to cli-qpid-jms/src/test/resources/log4j2-test.properties index 37b7713d..bfdba41e 100644 --- a/cli-protonj2/src/test/java/resources/log4j.properties +++ b/cli-qpid-jms/src/test/resources/log4j2-test.properties @@ -16,27 +16,24 @@ # specific language governing permissions and limitations # under the License. # +status=error +rootLogger=debug, console -# Set root logger level to DEBUG and its only appender to console -# This sets ALL the logs to given level. -log4j.rootLogger=ERROR, console +logger.lib.name=com.redhat.mqe.lib +logger.lib.level=INFO -# Uncomment this to get debug logs from qpid-jms -#log4j.logger.org.apache.qpid=DEBUG, console - -log4j.logger.com.redhat.mqe.jms=INFO, console -log4j.additivity.com.redhat.mqe.jms=false - -log4j.logger.io.netty=WARN, console -log4j.logger.netty=WARN, console +logger.netty.name=io.netty +logger.netty.level=WARN # Log transport.traceBytes=true messages -log4j.logger.org.apache.qpid.jms.transports.netty.NettyTcpTransport=DEBUG, console +logger.NettyTcpTransport.name=org.apache.qpid.jms.transports.netty.NettyTcpTransport +logger.NettyTcpTransport.level=DEBUG + +# Uncomment this to get debug logs from qpid-jms +#logger.qpid.name=org.apache.qpid +#logger.qpid.level=DEBUG -# Appender "console" settings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.err -log4j.appender.console.Threshold=all -log4j.appender.console.layout=org.apache.log4j.PatternLayout -#log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %m%n +# Console appender +appender.console.type=Console +appender.console.name=console +appender.console.target=SYSTEM_ERR diff --git a/lib/pom.xml b/lib/pom.xml index 256c2e59..fead7fc8 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -33,6 +33,10 @@ lib + + org.apache.logging.log4j + log4j-core + com.fasterxml.jackson.core jackson-databind diff --git a/lib/src/main/java/com/redhat/mqe/lib/Utils.java b/lib/src/main/java/com/redhat/mqe/lib/Utils.java index 47b6cde2..ddd669f0 100644 --- a/lib/src/main/java/com/redhat/mqe/lib/Utils.java +++ b/lib/src/main/java/com/redhat/mqe/lib/Utils.java @@ -19,8 +19,8 @@ package com.redhat.mqe.lib; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -114,13 +114,12 @@ public static void sleepUntilNextIteration(double initialTimestamp, int msgCount * specified, default level is used from *logger* properties file. * (As of the time writing - simplelogger.properties is used as default.) *

- * NOTE: SLF4J is not capable of changing log levels programatically! + * NOTE: SLF4J is not capable of changing log levels programmatically! * We have to change the System/File property of given underlying logger. * * @param logLevel logging level to be logger set to */ public static void setLogLevel(String logLevel) { - org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger("com.redhat.mqe.jms"); Level level; switch (logLevel.toLowerCase()) { case "all": @@ -150,8 +149,8 @@ public static void setLogLevel(String logLevel) { default: level = Level.INFO; } - LogManager.getRootLogger().setLevel(level); - logger.setLevel(level); + ((org.apache.logging.log4j.core.Logger) LogManager.getRootLogger()).setLevel(level); + ((org.apache.logging.log4j.core.Logger) LogManager.getLogger("com.redhat.mqe.lib")).setLevel(level); } /** diff --git a/parent/pom.xml b/parent/pom.xml index 176d4414..764924ff 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -44,7 +44,15 @@ org.slf4j - slf4j-log4j12 + slf4j-api + + + org.apache.logging.log4j + log4j-slf4j2-impl + + + org.apache.logging.log4j + log4j-core net.sf.jopt-simple From 0251c17840ae5d46f136fbadc07f0be66e01c7b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 16:35:35 +0200 Subject: [PATCH 038/117] Bump artemis-core-client in /cli-activemq-jmx (#472) Bumps [artemis-core-client](https://github.com/apache/activemq-artemis) from 2.9.0.redhat-00005 to 2.20.0.redhat-00008. - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/commits) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-core-client dependency-type: direct:production ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit a596fdfe5c4232f2cabfdd7ccaba1159946bc551) --- cli-activemq-jmx/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-activemq-jmx/pom.xml b/cli-activemq-jmx/pom.xml index dc0e2415..66bbd17f 100644 --- a/cli-activemq-jmx/pom.xml +++ b/cli-activemq-jmx/pom.xml @@ -25,7 +25,7 @@ 5.11.0.redhat-630187 - 2.9.0.redhat-00005 + 2.20.0.redhat-00008 /opt/jboss-amq-7 From 27afa9782e2d87ca3a2d8f22f98bcf34b34b379e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Oct 2022 12:44:43 +0200 Subject: [PATCH 039/117] Bump jackson-databind from 2.13.4 to 2.13.4.1 (#474) Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.4 to 2.13.4.1. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit b83147130b2306add48aa5906f0ecfb0e79f03de) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 12d9acf1..0e891b49 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -37,7 +37,7 @@ 2.19.0 5.0.4 2.44 - 2.13.4 + 2.13.4.1 1.7.20 5.9.1 From 251881e8c864359b2d27002089dc68c91755a5d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Fri, 7 Oct 2022 12:08:32 +0200 Subject: [PATCH 040/117] Add makeAddressControl function to embedded broker (cherry picked from commit 50c97981956aa19038163702e2c63391e5d68e19) --- broker/src/test/java/util/Broker.java | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/broker/src/test/java/util/Broker.java b/broker/src/test/java/util/Broker.java index 785a91ff..ad20e8d0 100644 --- a/broker/src/test/java/util/Broker.java +++ b/broker/src/test/java/util/Broker.java @@ -20,6 +20,8 @@ package util; import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.AddressControl; +import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.ConfigurationUtils; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; @@ -27,8 +29,12 @@ import org.apache.activemq.artemis.spi.core.remoting.Acceptor; import org.junit.jupiter.api.extension.ExtensionContext; +import javax.management.MBeanServer; +import javax.management.MBeanServerInvocationHandler; +import javax.management.ObjectName; import java.io.IOException; import java.io.InputStream; +import java.lang.management.ManagementFactory; import java.net.InetSocketAddress; import java.net.ServerSocket; import java.nio.file.Files; @@ -38,6 +44,8 @@ // https://activemq.apache.org/artemis/docs/latest/embedding-activemq.html public class Broker implements AutoCloseable, ExtensionContext.Store.CloseableResource { + // Use same MBeanServer instance that broker is using (don't create new) + private final MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer(); public Path tempDir; public EmbeddedActiveMQ embeddedBroker = new EmbeddedActiveMQ(); public Configuration configuration = new ConfigurationImpl(); @@ -169,4 +177,20 @@ private int findRandomAvailablePortOnAllLocalInterfaces() throws IOException { return socket.getLocalPort(); } } + + protected Object createProxy(final ObjectName objectName, + final Class mbeanInterface, + final MBeanServer mbeanServer) { + return MBeanServerInvocationHandler.newProxyInstance(mbeanServer, objectName, mbeanInterface, false); + } + + public AddressControl makeAddressControl(String queueName) { + SimpleString address = SimpleString.toSimpleString(queueName); + try { + AddressControl addressControl = (AddressControl) createProxy(ObjectNameBuilder.DEFAULT.getAddressObjectName(address), AddressControl.class, mBeanServer); + return addressControl; + } catch (Exception e) { + throw new RuntimeException(e); + } + } } From 2ddf19f14ba0b4ffef6de33692205896dbd67fd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 13:55:18 +0200 Subject: [PATCH 041/117] Bump jackson-databind from 2.13.4.1 to 2.13.4.2 (#477) Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.4.1 to 2.13.4.2. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 20b9e82452d5366536652f07e60340dfaa128e3d) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 0e891b49..c074ed3e 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -37,7 +37,7 @@ 2.19.0 5.0.4 2.44 - 2.13.4.1 + 2.13.4.2 1.7.20 5.9.1 From 3cfbdf06cc785ba6d53c9ad414a4d7abd8ac9707 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 23:46:02 +0200 Subject: [PATCH 042/117] Bump mockito-core from 4.8.0 to 4.8.1 (#478) Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.0 to 4.8.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.8.0...v4.8.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 7d839b3fdb04491262cffab4cc9e3d63df60633b) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index c074ed3e..f93308d1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -43,7 +43,7 @@ 5.9.1 1.7.1 1.1.3 - 4.8.0 + 4.8.1 4.2.0 2.26.0 From b365ebbcab42e2108f9b8772d5541ebfbbe40018 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Oct 2022 23:15:38 +0200 Subject: [PATCH 043/117] Bump maven-shade-plugin from 3.4.0 to 3.4.1 (#479) Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.4.0...maven-shade-plugin-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-shade-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 16b97eb64dbf00e242856a422d9a7f0ed9e4da47) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index f93308d1..d2f35193 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -53,7 +53,7 @@ 3.1.0 3.3.0 0.8.8 - 3.4.0 + 3.4.1 3.0.0-M7 2.7 From 23b3336f04f995360a78f49e92327b1f7fe5e7ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Fri, 28 Oct 2022 10:32:52 +0000 Subject: [PATCH 044/117] Update broker entrypoint.sh for Artemis 2.27.0-SNAPSHOT (#483) (cherry picked from commit decb18dd61c17408da3bed7b1f0546a65079d234) --- scripts/broker.xml.patch | 2 +- scripts/entrypoint.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/broker.xml.patch b/scripts/broker.xml.patch index 94f384e4..e641bb80 100644 --- a/scripts/broker.xml.patch +++ b/scripts/broker.xml.patch @@ -14,7 +14,7 @@ index 2ef08a9..4e61d0b 100644 @@ -158,9 +158,11 @@ under the License. - tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;amqpMinLargeMessageSize=102400;protocols=CORE,AMQP,STOMP,HORNETQ,MQTT,OPENWIRE;useEpoll=true;amqpCredits=1000;amqpLowCredits=300;amqpDuplicateDetection=true + tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;amqpMinLargeMessageSize=102400;protocols=CORE,AMQP,STOMP,HORNETQ,MQTT,OPENWIRE;useEpoll=true;amqpCredits=1000;amqpLowCredits=300;amqpDuplicateDetection=true;supportAdvisory=false;suppressInternalManagementObjects=false + tcp://0.0.0.0:61617?sslEnabled=true;keyStorePath=server-side-keystore.jks;keyStorePassword=secureexample;tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;amqpMinLargeMessageSize=102400;protocols=CORE,AMQP,STOMP,HORNETQ,MQTT,OPENWIRE;useEpoll=true;amqpCredits=1000;amqpLowCredits=300;amqpDuplicateDetection=true diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh index d6ff8ce3..157cdc01 100755 --- a/scripts/entrypoint.sh +++ b/scripts/entrypoint.sh @@ -32,7 +32,8 @@ if [ ! "$(ls -A /var/lib/amq7/etc)" ]; then fi # Log to tty to enable docker logs container-name -sed -ie "s/logger.handlers=.*/logger.handlers=CONSOLE/g" ../etc/logging.properties +# TODO: this no longer works with log4j2 logging +#sed -ie "s/logger.handlers=.*/logger.handlers=CONSOLE/g" ../etc/logging.properties # Update min memory if the argument is passed if [[ "$ARTEMIS_MIN_MEMORY" ]]; then From 21103ee7ec1691c6aecb5cd1313b90f2d4742a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Fri, 28 Oct 2022 11:11:38 +0000 Subject: [PATCH 045/117] Fixes #481: WARNING: sun.reflect.Reflection.getCallerClass is not supported. This will impact performance (#486) (cherry picked from commit 277e8d4bc91c533e7f08b3fe8fd9d0557d59a99a) --- parent/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/parent/pom.xml b/parent/pom.xml index 764924ff..aa9d69b7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -188,6 +188,7 @@ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> ${jar.main.class} + true From e871601eb37ef9288391e9fa466ebc55eeb50e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Mon, 31 Oct 2022 14:04:36 +0000 Subject: [PATCH 046/117] Fixes #492: AMQX uses logger to print output (#493) (cherry picked from commit 86570e7ffa747c39994800d702ac67842a5b8ccc) --- .../com/redhat/amqx/formatters/Formatter.java | 1 + .../redhat/amqx/formatters/PythonFormatter.java | 4 +++- .../activemq/QueueActiveMQManager.java | 6 +++--- .../activemq/TopicActiveMQManager.java | 6 +++--- .../artemis/AddressArtemisManager.java | 5 ++--- .../management/artemis/BrokerArtemisManager.java | 16 ++++++++-------- .../artemis/DestinationArtemisManager.java | 4 ++-- .../management/artemis/DivertArtemisManager.java | 4 ++-- .../management/artemis/TopicArtemisManager.java | 4 ++-- 9 files changed, 26 insertions(+), 24 deletions(-) diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/formatters/Formatter.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/formatters/Formatter.java index 7a246775..dbc84d64 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/formatters/Formatter.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/formatters/Formatter.java @@ -11,4 +11,5 @@ public interface Formatter { * @return string format of given type */ String convertJSON(String string); + void printConvertedJson(String json); } diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/formatters/PythonFormatter.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/formatters/PythonFormatter.java index 7a42479e..37b01ab2 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/formatters/PythonFormatter.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/formatters/PythonFormatter.java @@ -22,7 +22,9 @@ public String convertJSON(String json) { json = json.replaceAll("'?[Ff]alse'?", "False"); return json; } - + public void printConvertedJson(String json) { + System.out.println(convertJSON(json)); + } } diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/QueueActiveMQManager.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/QueueActiveMQManager.java index 68829cbe..8176886f 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/QueueActiveMQManager.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/QueueActiveMQManager.java @@ -36,9 +36,9 @@ public boolean destinationExists(String name) throws Exception { @Override public void listDestinations(boolean isVerbose) throws Exception { if (isVerbose) { - logger.info(formatter.convertJSON(new JSONObject(listDestinationsWithProperties()).toString())); + formatter.printConvertedJson(new JSONObject(listDestinationsWithProperties()).toString()); } else { - logger.info(formatter.convertJSON(new JSONArray(listDestinationsWithoutProperties()).toString())); + formatter.printConvertedJson(new JSONArray(listDestinationsWithoutProperties()).toString()); } } @@ -91,7 +91,7 @@ protected String getFormattedDestinationProperties(String destinationName) throw @Override public void getDestinationProperties(final String addressName, final String queueName) throws Exception { if (destinationExists(queueName)) { - logger.info(formatter.convertJSON(getFormattedDestinationProperties(queueName))); + formatter.printConvertedJson(getFormattedDestinationProperties(queueName)); } else { throw new DestinationException("Queue '" + queueName + "' does not exist"); } diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/TopicActiveMQManager.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/TopicActiveMQManager.java index 149747a3..fbc27c1e 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/TopicActiveMQManager.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/TopicActiveMQManager.java @@ -50,9 +50,9 @@ protected ObjectName[] getObjectNames() throws Exception { @Override public void listDestinations(boolean isVerbose) throws Exception { if (isVerbose) { - logger.info(formatter.convertJSON(new JSONObject(listDestinationsWithProperties()).toString())); + formatter.printConvertedJson(new JSONObject(listDestinationsWithProperties()).toString()); } else { - logger.info(formatter.convertJSON(new JSONArray(listDestinationsWithoutProperties()).toString())); + formatter.printConvertedJson(new JSONArray(listDestinationsWithoutProperties()).toString()); } } @@ -92,7 +92,7 @@ public void addDestination(String destinationName, boolean durable, String addre @Override public void getDestinationProperties(final String addressName, final String topicName) throws Exception { if (destinationExists(topicName)) { - logger.info(formatter.convertJSON(getFormattedDestinationProperties(topicName))); + formatter.printConvertedJson(getFormattedDestinationProperties(topicName)); } else { throw new DestinationException("Topic '" + topicName + "' does not exist"); } diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/AddressArtemisManager.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/AddressArtemisManager.java index 468e19fa..475c6f12 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/AddressArtemisManager.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/AddressArtemisManager.java @@ -5,7 +5,6 @@ import com.redhat.amqx.management.DestinationManager; import com.redhat.amqx.management.exception.DestinationException; import org.apache.activemq.artemis.api.core.ActiveMQAddressDoesNotExistException; -import org.apache.activemq.artemis.api.core.RoutingType; import org.json.JSONArray; import org.json.JSONObject; @@ -43,7 +42,7 @@ public void listDestinations(boolean isVerbose) throws Exception { } else { reportJson = new JSONArray(addressNames).toString(); } - logger.info(formatter.convertJSON(reportJson)); + formatter.printConvertedJson(reportJson); } /** @@ -102,7 +101,7 @@ public void addDestination(String destinationName, boolean durable, String addre @Override public void getDestinationProperties(String addressName, String unused) throws Exception { if (destinationExists(addressName)) { - logger.info(formatter.convertJSON(new JSONObject(getDestinationProperties(addressName, null, NodeType.ADDRESS)).toString())); + formatter.printConvertedJson(new JSONObject(getDestinationProperties(addressName, null, NodeType.ADDRESS)).toString()); } else { throw new DestinationException(String.format("Address '%s' does not exist!", addressName)); } diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/BrokerArtemisManager.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/BrokerArtemisManager.java index e79a7ba0..3c222b3f 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/BrokerArtemisManager.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/BrokerArtemisManager.java @@ -43,24 +43,24 @@ public void reload() throws MalformedObjectNameException { @Override public void getTransportConnectors() throws Exception { ActiveMQServerControl serverControl = getResolver(ArtemisResolver.class).getBrokerView(); - logger.info(formatter.convertJSON(serverControl.getConnectorsAsJSON())); - logger.info(formatter.convertJSON(new JSONObject(serverControl.getConnectors()).toString())); - logger.info(formatter.convertJSON(new JSONArray(serverControl.getAddressNames()).toString())); + formatter.printConvertedJson(serverControl.getConnectorsAsJSON()); + formatter.printConvertedJson(new JSONObject(serverControl.getConnectors()).toString()); + formatter.printConvertedJson(new JSONArray(serverControl.getAddressNames()).toString()); } @Override public void getNetworkTopology() throws Exception { ActiveMQServerControl serverControl = getResolver(ArtemisResolver.class).getBrokerView(); - logger.info(formatter.convertJSON(serverControl.listNetworkTopology())); + formatter.printConvertedJson(serverControl.listNetworkTopology()); } @Override public void getSessions(String connectionId) throws Exception { ActiveMQServerControl serverControl = getResolver(ArtemisResolver.class).getBrokerView(); if (connectionId == null) { - logger.info(formatter.convertJSON(serverControl.listAllSessionsAsJSON())); + formatter.printConvertedJson(serverControl.listAllSessionsAsJSON()); } else { - logger.info(formatter.convertJSON(serverControl.listSessionsAsJSON(connectionId))); + formatter.printConvertedJson(serverControl.listSessionsAsJSON(connectionId)); } } @@ -75,7 +75,7 @@ public void getAllBrokerDestinations() throws Exception { allDestinationsMap.put("address", new JSONArray(getAddresses())); allDestinationsMap.put("queue", new JSONArray(getQueues().keySet())); allDestinationsMap.put("topic", new JSONArray(getTopics().keySet())); - logger.info(formatter.convertJSON(new JSONObject(allDestinationsMap).toString())); + formatter.printConvertedJson(new JSONObject(allDestinationsMap).toString()); } public void getAllBrokerDestinationsProperties() throws Exception { @@ -94,7 +94,7 @@ public void getAllBrokerDestinationsProperties() throws Exception { allDestinationsMap.put(address, getDestinationProperties(address, null, NodeType.ADDRESS)); } - logger.info(formatter.convertJSON(new JSONObject(allDestinationsMap).toString())); + formatter.printConvertedJson(new JSONObject(allDestinationsMap).toString()); } } diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/DestinationArtemisManager.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/DestinationArtemisManager.java index 61ca05b8..77e083f0 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/DestinationArtemisManager.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/DestinationArtemisManager.java @@ -43,7 +43,7 @@ public void listDestinations(boolean isVerbose) throws Exception { } else { reportJson = new JSONArray(queueNames.keySet()).toString(); } - logger.info(formatter.convertJSON(reportJson)); + formatter.printConvertedJson(reportJson); } @Override @@ -135,7 +135,7 @@ public void getDestinationProperties(String addressName, String destinationName) addressName = destinationName; } if (destinationExists(destinationName)) { - logger.info(formatter.convertJSON(new JSONObject(getDestinationProperties(addressName, destinationName, NodeType.QUEUE)).toString())); + formatter.printConvertedJson(new JSONObject(getDestinationProperties(addressName, destinationName, NodeType.QUEUE)).toString()); } else { throw new DestinationException(String.format("Queue '%s' does not exist!", destinationName)); } diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/DivertArtemisManager.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/DivertArtemisManager.java index f36db172..773f2554 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/DivertArtemisManager.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/DivertArtemisManager.java @@ -49,7 +49,7 @@ public void listDiverts(boolean isVerbose) throws Exception { } else { reportJson = new JSONArray(divertNames).toString(); } - logger.info(formatter.convertJSON(reportJson)); + formatter.printConvertedJson(reportJson); } @@ -101,7 +101,7 @@ public void getDestinationProperties(String addressName, String destinationName) addressName = destinationName; } if (divertExists(destinationName)) { - logger.info(formatter.convertJSON(new JSONObject(getDestinationProperties(addressName, destinationName, NodeType.DIVERT)).toString())); + formatter.printConvertedJson(new JSONObject(getDestinationProperties(addressName, destinationName, NodeType.DIVERT)).toString()); } else { throw new DestinationException(String.format("Divert '%s' does not exist!", destinationName)); } diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/TopicArtemisManager.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/TopicArtemisManager.java index 6881a3e5..ae462941 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/TopicArtemisManager.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/TopicArtemisManager.java @@ -42,7 +42,7 @@ public void listDestinations(boolean isVerbose) throws Exception { } else { reportJson = new JSONArray(topicNames.keySet()).toString(); } - logger.info(formatter.convertJSON(reportJson)); + formatter.printConvertedJson(reportJson); } @Override @@ -124,7 +124,7 @@ public void getDestinationProperties(String addressName, String destinationName) addressName = destinationName; } if (destinationExists(destinationName)) { - logger.info(formatter.convertJSON(new JSONObject(getDestinationProperties(addressName, destinationName, NodeType.TOPIC)).toString())); + formatter.printConvertedJson(new JSONObject(getDestinationProperties(addressName, destinationName, NodeType.TOPIC)).toString()); } else { throw new DestinationException(String.format("Topic '%s' does not exist!", destinationName)); } From 3097907d581b10b2cdc0c8001a29696f8ed1d4fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Mon, 31 Oct 2022 15:39:39 +0000 Subject: [PATCH 047/117] Use google maven mirror in github actions (#495) (cherry picked from commit 14228e8d1b90d262cf1073fddc3bfb5d9b649862) --- .github/workflows/bintray-mirror-settings.xml | 31 +++++++++++++++++++ .github/workflows/google-mirror-settings.xml | 29 +++++++++++++++++ .github/workflows/maven.yml | 12 ++++--- pom.xml | 19 ------------ 4 files changed, 68 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/bintray-mirror-settings.xml create mode 100644 .github/workflows/google-mirror-settings.xml diff --git a/.github/workflows/bintray-mirror-settings.xml b/.github/workflows/bintray-mirror-settings.xml new file mode 100644 index 00000000..db3e1262 --- /dev/null +++ b/.github/workflows/bintray-mirror-settings.xml @@ -0,0 +1,31 @@ + + + + + + + bintray-maven-central + Bintray Maven Central mirror + https://jcenter.bintray.com + central + + + diff --git a/.github/workflows/google-mirror-settings.xml b/.github/workflows/google-mirror-settings.xml new file mode 100644 index 00000000..7c996284 --- /dev/null +++ b/.github/workflows/google-mirror-settings.xml @@ -0,0 +1,29 @@ + + + + + + google-maven-central + GCS Maven Central mirror + https://maven-central.storage-download.googleapis.com/maven2/ + central + + + diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0062e2a4..a97b5e01 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -10,6 +10,10 @@ on: branches: [ main, qpid-jms-1.x ] workflow_dispatch: +env: + # https://maven.apache.org/configure.html#maven_args-environment-variable + MAVEN_ARGS: "-Dmaven.artifact.threads=42 --no-transfer-progress --settings=.github/workflows/google-mirror-settings.xml" + jobs: build: @@ -25,13 +29,13 @@ jobs: java-version: '11' - name: Build with Maven - run: mvn -B package --file pom.xml + run: mvn -B package --file pom.xml ${{env.MAVEN_ARGS}} - name: Install the qpid-jms subtree (needed for the next step) - run: mvn clean install -DskipTests -pl :cli-qpid-jms -am + run: mvn clean install -DskipTests -pl :cli-qpid-jms -am ${{env.MAVEN_ARGS}} - name: Run a single test (remember that JUnit5 issue) - run: mvn surefire:test -Dtest=QPIDJMS484Test -pl :cli-qpid-jms + run: mvn surefire:test -Dtest=QPIDJMS484Test -pl :cli-qpid-jms ${{env.MAVEN_ARGS}} test: @@ -56,7 +60,7 @@ jobs: run: sleep 10 - name: mvn package - run: mvn clean package -Ptests,coverage + run: mvn clean package -Ptests,coverage ${{env.MAVEN_ARGS}} - name: bash ./tests.sh run: bash ./tests.sh diff --git a/pom.xml b/pom.xml index 0d50973a..654b3215 100644 --- a/pom.xml +++ b/pom.xml @@ -56,23 +56,4 @@ interop-tests - - - - false - - bintray - https://jcenter.bintray.com - - - - - - false - - bintray-plugins - https://jcenter.bintray.com - - - From 779732f611b2b2e60b54de4aab5a7ffbffa5cc9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Fri, 28 Oct 2022 13:44:20 +0200 Subject: [PATCH 048/117] Fixes #480: Enable maven-shade-plugin to create executable uberjar for cli-activemq-jmx (cherry picked from commit 0a0ef9fc229b57fc5e2cd4ce8c28b95d22d65e69) --- cli-activemq-jmx/pom.xml | 140 +++------------------------------------ 1 file changed, 9 insertions(+), 131 deletions(-) diff --git a/cli-activemq-jmx/pom.xml b/cli-activemq-jmx/pom.xml index 66bbd17f..d53dcb99 100644 --- a/cli-activemq-jmx/pom.xml +++ b/cli-activemq-jmx/pom.xml @@ -189,137 +189,15 @@ - - local - - false - - - 2.0.0-SNAPSHOT - - - - org.apache.activemq - artemis-jms-client - ${library.version} - - - - org.apache.activemq - artemis-core-client - ${library.version} - - - - org.apache.activemq - artemis-commons - ${library.version} - - - - - org.apache.activemq - activemq-broker - ${activemq.version} - - - - org.apache.activemq - activemq-runtime-config - ${activemq.version} - - - - - - org.apache.maven.plugins - maven-install-plugin - ${plugin.install.version} - - - install-external-artemis-jms-client - clean - - ${project.basedir}/libs/artemis-jms-client-2.0.0-SNAPSHOT.jar - default - org.apache.activemq - artemis-jms-client - ${library.version} - jar - true - - - install-file - - - - install-external-artemis-core-client - clean - - ${project.basedir}/libs/artemis-core-client-2.0.0-SNAPSHOT.jar - default - org.apache.activemq - artemis-core-client - ${library.version} - jar - true - - - install-file - - - - install-external-artemis-commons - clean - - ${project.basedir}/libs/artemis-commons-2.0.0-SNAPSHOT.jar - default - org.apache.activemq - artemis-commons - ${library.version} - jar - true - - - install-file - - - - - - - + + + + + org.apache.maven.plugins + maven-shade-plugin + + + - - - Delivery - - false - - - - - maven-assembly-plugin - - - src/main/assembly/dist-assembly.xml - - true - - - - - dist-assembly - package - - single - - - - - - - - From cfa42ee49855195bc68c635a6b8bacd3810fe8ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Mon, 31 Oct 2022 16:09:34 +0000 Subject: [PATCH 049/117] Fixes #497: Define maven mirror as a simple additional repo (#498) (cherry picked from commit 08dc7fcecb91a71d08d4ea5765577f9dc6122461) --- .../workflows/bintray-repository-settings.xml | 50 +++++++++++++++++++ .../workflows/google-repository-settings.xml | 48 ++++++++++++++++++ .github/workflows/maven.yml | 2 +- 3 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/bintray-repository-settings.xml create mode 100644 .github/workflows/google-repository-settings.xml diff --git a/.github/workflows/bintray-repository-settings.xml b/.github/workflows/bintray-repository-settings.xml new file mode 100644 index 00000000..b2b2f8f1 --- /dev/null +++ b/.github/workflows/bintray-repository-settings.xml @@ -0,0 +1,50 @@ + + + + + + + bintray + + + + false + + bintray + https://jcenter.bintray.com + + + + + + false + + bintray-plugins + https://jcenter.bintray.com + + + + + + + bintray + + diff --git a/.github/workflows/google-repository-settings.xml b/.github/workflows/google-repository-settings.xml new file mode 100644 index 00000000..5c4a0323 --- /dev/null +++ b/.github/workflows/google-repository-settings.xml @@ -0,0 +1,48 @@ + + + + + + google-maven-central + + + + false + + google-maven-central + https://maven-central.storage-download.googleapis.com/maven2/ + + + + + + false + + google-maven-central-plugins + https://maven-central.storage-download.googleapis.com/maven2/ + + + + + + + google-maven-central + + diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a97b5e01..9e1e08e8 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -12,7 +12,7 @@ on: env: # https://maven.apache.org/configure.html#maven_args-environment-variable - MAVEN_ARGS: "-Dmaven.artifact.threads=42 --no-transfer-progress --settings=.github/workflows/google-mirror-settings.xml" + MAVEN_ARGS: "-Dmaven.artifact.threads=42 --no-transfer-progress --settings=.github/workflows/google-repository-settings.xml" jobs: build: From 3c59926493dde1f6aa9257a534c46eb49e038f3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 22:12:51 +0100 Subject: [PATCH 050/117] Bump checker-qual from 3.26.0 to 3.27.0 (#502) Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.26.0 to 3.27.0. - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.26.0...checker-framework-3.27.0) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 6331d4ce3987f362cd290a66c8399c44fa19a092) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index d2f35193..b7a21f6a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -58,7 +58,7 @@ 2.7 23.0.0 - 3.26.0 + 3.27.0 From 5cedc9a2a2e5afc9025ea5727f438af4b62fa7ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 21:04:15 +0000 Subject: [PATCH 051/117] Bump junit-pioneer from 1.7.1 to 1.8.0 Bumps [junit-pioneer](https://github.com/junit-pioneer/junit-pioneer) from 1.7.1 to 1.8.0. - [Release notes](https://github.com/junit-pioneer/junit-pioneer/releases) - [Commits](https://github.com/junit-pioneer/junit-pioneer/compare/v1.7.1...v1.8.0) --- updated-dependencies: - dependency-name: org.junit-pioneer:junit-pioneer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit ef02facf100f50e2589e5c38208099cd493c884f) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index b7a21f6a..48aa9402 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -41,7 +41,7 @@ 1.7.20 5.9.1 - 1.7.1 + 1.8.0 1.1.3 4.8.1 4.2.0 From 3632d5792bac96e6b8a8ab2e736c4a1ef560fee0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Nov 2022 10:25:41 +0000 Subject: [PATCH 052/117] Bump kotlin.version from 1.7.20 to 1.7.21 Bumps `kotlin.version` from 1.7.20 to 1.7.21. Updates `kotlin-stdlib` from 1.7.20 to 1.7.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-stdlib-jdk8` from 1.7.20 to 1.7.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-test-junit` from 1.7.20 to 1.7.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-maven-plugin` from 1.7.20 to 1.7.21 Updates `kotlin-reflect` from 1.7.20 to 1.7.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 4cb5e94ae6e92dd5395b17c682160290ba070511) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 48aa9402..8e49f704 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -39,7 +39,7 @@ 2.44 2.13.4.2 - 1.7.20 + 1.7.21 5.9.1 1.8.0 1.1.3 From 8f81e28086e5ae7b5e5f38367c56775230f4cbf4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Nov 2022 10:29:59 +0000 Subject: [PATCH 053/117] Bump jackson-databind from 2.13.4.2 to 2.14.0 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.4.2 to 2.14.0. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit 5a209c9a8ef0d7c9c9b7c917e1b6b0a0d59df89d) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 8e49f704..dbe3d31f 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -37,7 +37,7 @@ 2.19.0 5.0.4 2.44 - 2.13.4.2 + 2.14.0 1.7.21 5.9.1 From 124bfda9c32d65365b9cfd116ffc24fda15aca39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Nov 2022 11:34:21 +0100 Subject: [PATCH 054/117] Bump protonj2-client from 1.0.0-M10 to 1.0.0-M11 Bumps protonj2-client from 1.0.0-M10 to 1.0.0-M11. --- updated-dependencies: - dependency-name: org.apache.qpid:protonj2-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 29ec06716ce06c00f258e93527602b1b8a989384) --- cli-protonj2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-protonj2/pom.xml b/cli-protonj2/pom.xml index 3c42d384..56e2f9e1 100644 --- a/cli-protonj2/pom.xml +++ b/cli-protonj2/pom.xml @@ -34,7 +34,7 @@ jms - 1.0.0-M6 + 1.0.0-M11 com.redhat.mqe.Main ${protonj2.version} 2.0.39.Final From d0409f0a3bfdf1bb0a9b0109f0b65d34ec5da0e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 21:01:27 +0000 Subject: [PATCH 055/117] Bump dagger.version from 2.44 to 2.44.2 Bumps `dagger.version` from 2.44 to 2.44.2. Updates `dagger` from 2.44 to 2.44.2 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.44...dagger-2.44.2) Updates `dagger-compiler` from 2.44 to 2.44.2 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.44...dagger-2.44.2) --- updated-dependencies: - dependency-name: com.google.dagger:dagger dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.google.dagger:dagger-compiler dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 9dca9b23688789e17a28ad604d5527eadb58d7e7) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index dbe3d31f..ab356d79 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -36,7 +36,7 @@ 2.0.3 2.19.0 5.0.4 - 2.44 + 2.44.2 2.14.0 1.7.21 From 0ca399e43d4cb888df06978746753f557171374c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 10:21:47 +0000 Subject: [PATCH 056/117] Bump artemis.jms.client.version from 2.26.0 to 2.27.0 Bumps `artemis.jms.client.version` from 2.26.0 to 2.27.0. Updates `artemis-jms-client` from 2.26.0 to 2.27.0 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.26.0...2.27.0) Updates `artemis-commons` from 2.26.0 to 2.27.0 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.26.0...2.27.0) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-jms-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.activemq:artemis-commons dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit c93af92a738ce06c22da7ed8a5532e089a88481c) --- cli-artemis-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-artemis-jms/pom.xml b/cli-artemis-jms/pom.xml index f81eece1..f16fac2d 100644 --- a/cli-artemis-jms/pom.xml +++ b/cli-artemis-jms/pom.xml @@ -36,7 +36,7 @@ acc com.redhat.mqe.acc.Main false - 2.26.0 + 2.27.0 ${artemis.jms.client.version} From 24dd0200818d1c969b8df4ccd037670fbd135b72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 10:26:17 +0000 Subject: [PATCH 057/117] Bump artemis.broker.version from 2.26.0 to 2.27.0 Bumps `artemis.broker.version` from 2.26.0 to 2.27.0. Updates `artemis-amqp-protocol` from 2.26.0 to 2.27.0 Updates `artemis-server` from 2.26.0 to 2.27.0 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.26.0...2.27.0) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-amqp-protocol dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.activemq:artemis-server dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit a7240272385f9a19bc06c450c434b71ea7dd72b4) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index ab356d79..2a008c72 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -46,7 +46,7 @@ 4.8.1 4.2.0 - 2.26.0 + 2.27.0 3.10.1 3.1.0 From 8acbdce6f3c35bd95d6b8c9185f012f09e62b218 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 21:06:54 +0000 Subject: [PATCH 058/117] Bump junit-pioneer from 1.8.0 to 1.9.1 Bumps [junit-pioneer](https://github.com/junit-pioneer/junit-pioneer) from 1.8.0 to 1.9.1. - [Release notes](https://github.com/junit-pioneer/junit-pioneer/releases) - [Commits](https://github.com/junit-pioneer/junit-pioneer/compare/v1.8.0...v1.9.1) --- updated-dependencies: - dependency-name: org.junit-pioneer:junit-pioneer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit 78453785ce9b720b12fc3eeaff886c979a2c0445) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 2a008c72..fb945cf8 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -41,7 +41,7 @@ 1.7.21 5.9.1 - 1.8.0 + 1.9.1 1.1.3 4.8.1 4.2.0 From 1221dc0bb0962d625349fbaea0387d33a5387d98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 15:05:48 +0000 Subject: [PATCH 059/117] Bump jackson-databind from 2.14.0 to 2.14.1 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.14.0 to 2.14.1. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 0c26efb7327b87a5e5d0c453f085b4d050aec88e) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index fb945cf8..d846a78b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -37,7 +37,7 @@ 2.19.0 5.0.4 2.44.2 - 2.14.0 + 2.14.1 1.7.21 5.9.1 From b18545e7efddc1801174e76f6071ca42f4beb6b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 15:11:24 +0000 Subject: [PATCH 060/117] Bump commons-cli from 1.4 to 1.5.0.redhat-00001 Bumps commons-cli from 1.4 to 1.5.0.redhat-00001. --- updated-dependencies: - dependency-name: commons-cli:commons-cli dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit 42cf228c124a6b30367b3a20fa9a37058deaa984) --- cli-activemq-jmx/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-activemq-jmx/pom.xml b/cli-activemq-jmx/pom.xml index d53dcb99..5ad16615 100644 --- a/cli-activemq-jmx/pom.xml +++ b/cli-activemq-jmx/pom.xml @@ -34,7 +34,7 @@ 2.0.3 20160810 - 1.4 + 1.5.0.redhat-00001 From 9dea42c44a2b62fad22342afd56ef6d1f223e2e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 15:16:36 +0000 Subject: [PATCH 061/117] Bump slf4j-api from 2.0.3 to 2.0.5 Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 2.0.3 to 2.0.5. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.3...v_2.0.5) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit af4aa1c631eadcd56ace55b2ed5904261bc2102b) --- bom/pom.xml | 2 +- cli-activemq-jmx/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index d846a78b..31ccd414 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -33,7 +33,7 @@ pom - 2.0.3 + 2.0.5 2.19.0 5.0.4 2.44.2 diff --git a/cli-activemq-jmx/pom.xml b/cli-activemq-jmx/pom.xml index 5ad16615..b0fa7088 100644 --- a/cli-activemq-jmx/pom.xml +++ b/cli-activemq-jmx/pom.xml @@ -32,7 +32,7 @@ amqx - 2.0.3 + 2.0.5 20160810 1.5.0.redhat-00001 From 8733c3953f2de62112028f97bcd2941ad3ffb7b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 15:20:51 +0000 Subject: [PATCH 062/117] Bump mockito-core from 4.8.1 to 4.9.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.1 to 4.9.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.8.1...v4.9.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit b3e7c7cc3c95fd9b88d3d29070fc26d31b7b1c2e) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 31ccd414..099c3f9c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -43,7 +43,7 @@ 5.9.1 1.9.1 1.1.3 - 4.8.1 + 4.9.0 4.2.0 2.27.0 From b3da7ef6f99c5e33b89eab03dcb7a551a051e4aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 22:05:09 +0100 Subject: [PATCH 063/117] Bump checker-qual from 3.27.0 to 3.28.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.27.0 to 3.28.0. - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.27.0...checker-framework-3.28.0) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit d8ef966c51003969fdd8ac7997f158922ce4c526) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 099c3f9c..8c7e407f 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -58,7 +58,7 @@ 2.7 23.0.0 - 3.27.0 + 3.28.0 From f85555c36d8ae9e7a8483b9383504422afd404f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 16:48:41 +0000 Subject: [PATCH 064/117] Bump artemis.jms.client.version from 2.27.0 to 2.27.1 Bumps `artemis.jms.client.version` from 2.27.0 to 2.27.1. Updates `artemis-jms-client` from 2.27.0 to 2.27.1 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.27.0...2.27.1) Updates `artemis-commons` from 2.27.0 to 2.27.1 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.27.0...2.27.1) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-jms-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.activemq:artemis-commons dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit be4ac3d996e0a75b92dda246195606cb634acfeb) --- cli-artemis-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-artemis-jms/pom.xml b/cli-artemis-jms/pom.xml index f16fac2d..b9a807c7 100644 --- a/cli-artemis-jms/pom.xml +++ b/cli-artemis-jms/pom.xml @@ -36,7 +36,7 @@ acc com.redhat.mqe.acc.Main false - 2.27.0 + 2.27.1 ${artemis.jms.client.version} From 07edd421a26420b6ef180e650b14aaf82f4b671e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 16:52:32 +0000 Subject: [PATCH 065/117] Bump activemq-client from 5.17.2 to 5.17.3 Bumps [activemq-client](https://github.com/apache/activemq) from 5.17.2 to 5.17.3. - [Release notes](https://github.com/apache/activemq/releases) - [Commits](https://github.com/apache/activemq/compare/activemq-5.17.2...activemq-5.17.3) --- updated-dependencies: - dependency-name: org.apache.activemq:activemq-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 6fe78b5b3f69612743ccb37d419878254d40ecfe) --- cli-activemq/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-activemq/pom.xml b/cli-activemq/pom.xml index 64a669a0..294ad9b6 100644 --- a/cli-activemq/pom.xml +++ b/cli-activemq/pom.xml @@ -35,7 +35,7 @@ aoc com.redhat.mqe.aoc.Main - 5.17.2 + 5.17.3 ${activemq.client.version} From 5f0cfdef49d8fc3c1b7809c9c43158ecb943544c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 16:56:52 +0000 Subject: [PATCH 066/117] Bump artemis.broker.version from 2.27.0 to 2.27.1 Bumps `artemis.broker.version` from 2.27.0 to 2.27.1. Updates `artemis-amqp-protocol` from 2.27.0 to 2.27.1 Updates `artemis-server` from 2.27.0 to 2.27.1 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.27.0...2.27.1) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-amqp-protocol dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.activemq:artemis-server dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 6ed8fe06fc20b2f3ea81947cc19133eb1facde27) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 8c7e407f..502ee159 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -46,7 +46,7 @@ 4.9.0 4.2.0 - 2.27.0 + 2.27.1 3.10.1 3.1.0 From 45b7b073936f72c80be3c6491570a8e7170c7f88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 17:01:55 +0000 Subject: [PATCH 067/117] Bump kotlin.version from 1.7.21 to 1.8.0 Bumps `kotlin.version` from 1.7.21 to 1.8.0. Updates `kotlin-stdlib` from 1.7.21 to 1.8.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.8.0) Updates `kotlin-stdlib-jdk8` from 1.7.21 to 1.8.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.8.0) Updates `kotlin-test-junit` from 1.7.21 to 1.8.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.8.0) Updates `kotlin-maven-plugin` from 1.7.21 to 1.8.0 Updates `kotlin-reflect` from 1.7.21 to 1.8.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.8.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit f1030f98b16944972276b265cebd0eb217770a7a) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 502ee159..b2d6b981 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -39,7 +39,7 @@ 2.44.2 2.14.1 - 1.7.21 + 1.8.0 5.9.1 1.9.1 1.1.3 From 8a963f50ec2f1023987909252ff24928efde8cca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 21:01:13 +0000 Subject: [PATCH 068/117] Bump mockito-core from 4.9.0 to 4.11.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 4.9.0 to 4.11.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v4.11.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit 5eb7e331296d6815f643c5e1954fe264621d7a40) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index b2d6b981..7082b436 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -43,7 +43,7 @@ 5.9.1 1.9.1 1.1.3 - 4.9.0 + 4.11.0 4.2.0 2.27.1 From 3f1620a7dc8378b171ab4488203b3abf583b3891 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jan 2023 14:40:57 +0000 Subject: [PATCH 069/117] Bump annotations from 23.0.0 to 23.1.0 Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0) --- updated-dependencies: - dependency-name: org.jetbrains:annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit b0fda1444f68c16225c92aa17b68c8f2eca05412) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 7082b436..92f4193b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -57,7 +57,7 @@ 3.0.0-M7 2.7 - 23.0.0 + 23.1.0 3.28.0 From 2d33423cc2b49a8a0cc3051e7a2a4472ee019b6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jan 2023 14:45:12 +0000 Subject: [PATCH 070/117] Bump slf4j-api from 2.0.5 to 2.0.6 Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 2.0.5 to 2.0.6. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.5...v_2.0.6) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit bdf00a08cc715108f519669c68b4b1c9627b42d8) --- bom/pom.xml | 2 +- cli-activemq-jmx/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 92f4193b..f7a6a7e3 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -33,7 +33,7 @@ pom - 2.0.5 + 2.0.6 2.19.0 5.0.4 2.44.2 diff --git a/cli-activemq-jmx/pom.xml b/cli-activemq-jmx/pom.xml index b0fa7088..1331bbff 100644 --- a/cli-activemq-jmx/pom.xml +++ b/cli-activemq-jmx/pom.xml @@ -32,7 +32,7 @@ amqx - 2.0.5 + 2.0.6 20160810 1.5.0.redhat-00001 From 2ed5c4a65b0f8a5bdd51352ddc743c6f639b0cb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 00:06:58 +0000 Subject: [PATCH 071/117] Bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M7 to 3.0.0-M8. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M7...surefire-3.0.0-M8) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 8ed8e39b4cbb1dbdd93055ccc75c452e717acfba) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index f7a6a7e3..e646f47a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -54,7 +54,7 @@ 3.3.0 0.8.8 3.4.1 - 3.0.0-M7 + 3.0.0-M8 2.7 23.1.0 From 00e9e5d02555677c995d6f60e65c9164b72906e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 13:42:49 +0000 Subject: [PATCH 072/117] Bump annotations from 23.1.0 to 24.0.0 Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0) --- updated-dependencies: - dependency-name: org.jetbrains:annotations dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] (cherry picked from commit 38419ecd7fc62f248c0eb147804e1c30f21db030) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index e646f47a..cd30055b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -57,7 +57,7 @@ 3.0.0-M8 2.7 - 23.1.0 + 24.0.0 3.28.0 From f9e58516f8fc6a320779b49a6733f6f938e7e491 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 13:47:26 +0000 Subject: [PATCH 073/117] Bump junit-bom from 5.9.1 to 5.9.2 Bumps [junit-bom](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 3313ad53565cdf8eec4f72c91275ac90f3b6585d) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index cd30055b..08803b3f 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -40,7 +40,7 @@ 2.14.1 1.8.0 - 5.9.1 + 5.9.2 1.9.1 1.1.3 4.11.0 From 2c51079689fe0c77ec455ff1c72d3f8f72e32782 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 14:51:10 +0100 Subject: [PATCH 074/117] Bump checker-qual from 3.28.0 to 3.29.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.28.0 to 3.29.0. - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.28.0...checker-framework-3.29.0) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit 09e63ecea4fd8ff1c5c2a53aa4c97533f9e8e726) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 08803b3f..80fd0b44 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -58,7 +58,7 @@ 2.7 24.0.0 - 3.28.0 + 3.29.0 From 43f12139f50e4e84bc42f86e5c130beb6f5cd984 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Jan 2023 21:00:55 +0000 Subject: [PATCH 075/117] Bump mockito-core from 4.11.0 to 5.1.1 Bumps [mockito-core](https://github.com/mockito/mockito) from 4.11.0 to 5.1.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.11.0...v5.1.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] (cherry picked from commit 620285e8753fc1829a602b05bc3516fbb46ed911) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 80fd0b44..fdbe007c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -43,7 +43,7 @@ 5.9.2 1.9.1 1.1.3 - 4.11.0 + 5.1.1 4.2.0 2.27.1 From f760251ec4025e86b7f4370f3167f0fb99880ae6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 16:28:32 +0000 Subject: [PATCH 076/117] Bump jackson-databind from 2.14.1 to 2.14.2 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.14.1 to 2.14.2. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 17da46698cb2ec39efc8122e77bb4a5efd45d4fc) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index fdbe007c..f9ad686a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -37,7 +37,7 @@ 2.19.0 5.0.4 2.44.2 - 2.14.1 + 2.14.2 1.8.0 5.9.2 From 423dbb507c794bf675df3cf5023dffc5e467658b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 16:41:16 +0000 Subject: [PATCH 077/117] Bump tcnative.version from 2.0.54.Final to 2.0.56.Final Bumps `tcnative.version` from 2.0.54.Final to 2.0.56.Final. Updates `netty-tcnative-boringssl-static` from 2.0.54.Final to 2.0.56.Final - [Release notes](https://github.com/netty/netty-tcnative/releases) - [Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.54.Final...netty-tcnative-parent-2.0.56.Final) Updates `netty-tcnative` from 2.0.54.Final to 2.0.56.Final - [Release notes](https://github.com/netty/netty-tcnative/releases) - [Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.54.Final...netty-tcnative-parent-2.0.56.Final) --- updated-dependencies: - dependency-name: io.netty:netty-tcnative-boringssl-static dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-tcnative:linux-x86_64-fedora dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit d229e871fac19f1c27b6ab9e601f9432a84da7e1) --- cli-qpid-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-qpid-jms/pom.xml b/cli-qpid-jms/pom.xml index d5c8333b..3fa40a8a 100644 --- a/cli-qpid-jms/pom.xml +++ b/cli-qpid-jms/pom.xml @@ -37,7 +37,7 @@ com.redhat.mqe.jms.Main 1.10.0 ${qpid.jms.client.version} - 2.0.54.Final + 2.0.56.Final linux-x86_64-fedora 1.8.1 From 0e0fa6ed94aad35d4eb51ecb55ab99e5e1f311be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 21:01:20 +0000 Subject: [PATCH 078/117] Bump maven-enforcer-plugin from 3.1.0 to 3.2.1 Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.1.0 to 3.2.1. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.1.0...enforcer-3.2.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit e1d3a76b0a4df6749bc4126ee31522e2de76937d) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index f9ad686a..9d8c6e69 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -50,7 +50,7 @@ 3.10.1 3.1.0 - 3.1.0 + 3.2.1 3.3.0 0.8.8 3.4.1 From 27dfeaf272eaccfb3e720d2478fdcb50d1f7953a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Feb 2023 21:00:43 +0000 Subject: [PATCH 079/117] Bump artemis.broker.version from 2.27.1 to 2.28.0 Bumps `artemis.broker.version` from 2.27.1 to 2.28.0. Updates `artemis-amqp-protocol` from 2.27.1 to 2.28.0 Updates `artemis-server` from 2.27.1 to 2.28.0 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.27.1...2.28.0) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-amqp-protocol dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.activemq:artemis-server dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit 5a6b7d17ce6c81c291383bc7d7571e36f54e7d76) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 9d8c6e69..90cbf9bc 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -46,7 +46,7 @@ 5.1.1 4.2.0 - 2.27.1 + 2.28.0 3.10.1 3.1.0 From 27072edd5d271d5b9e1ffe43e661d1eafd561a52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Feb 2023 16:15:17 +0000 Subject: [PATCH 080/117] Bump junit-pioneer from 1.9.1 to 2.0.0 Bumps [junit-pioneer](https://github.com/junit-pioneer/junit-pioneer) from 1.9.1 to 2.0.0. - [Release notes](https://github.com/junit-pioneer/junit-pioneer/releases) - [Commits](https://github.com/junit-pioneer/junit-pioneer/compare/v1.9.1...v2.0.0) --- updated-dependencies: - dependency-name: org.junit-pioneer:junit-pioneer dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] (cherry picked from commit 9b03b309fcb30ffb1066d12b61c04fb9a34da245) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 90cbf9bc..e153684a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -41,7 +41,7 @@ 1.8.0 5.9.2 - 1.9.1 + 2.0.0 1.1.3 5.1.1 4.2.0 From b89b5b3b9b248355508798eff9b640039bec9017 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Feb 2023 16:23:56 +0000 Subject: [PATCH 081/117] Bump kotlin.version from 1.8.0 to 1.8.10 Bumps `kotlin.version` from 1.8.0 to 1.8.10. Updates `kotlin-stdlib` from 1.8.0 to 1.8.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10) Updates `kotlin-stdlib-jdk8` from 1.8.0 to 1.8.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10) Updates `kotlin-test-junit` from 1.8.0 to 1.8.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10) Updates `kotlin-maven-plugin` from 1.8.0 to 1.8.10 Updates `kotlin-reflect` from 1.8.0 to 1.8.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 50a0b56c745258e8028607f8ea9a6a2b37b0174d) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index e153684a..9042971b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -39,7 +39,7 @@ 2.44.2 2.14.2 - 1.8.0 + 1.8.10 5.9.2 2.0.0 1.1.3 From 8fb7dcb8183f97febdf877187526fcb045db0bdd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Feb 2023 16:29:34 +0000 Subject: [PATCH 082/117] Bump tcnative.version from 2.0.56.Final to 2.0.57.Final Bumps `tcnative.version` from 2.0.56.Final to 2.0.57.Final. Updates `netty-tcnative-boringssl-static` from 2.0.56.Final to 2.0.57.Final - [Release notes](https://github.com/netty/netty-tcnative/releases) - [Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.56.Final...netty-tcnative-parent-2.0.57.Final) Updates `netty-tcnative` from 2.0.56.Final to 2.0.57.Final - [Release notes](https://github.com/netty/netty-tcnative/releases) - [Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.56.Final...netty-tcnative-parent-2.0.57.Final) --- updated-dependencies: - dependency-name: io.netty:netty-tcnative-boringssl-static dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-tcnative:linux-x86_64-fedora dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 49cbd2f368d080f044ad89c275b205d07f9957b6) --- cli-qpid-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-qpid-jms/pom.xml b/cli-qpid-jms/pom.xml index 3fa40a8a..88c9a634 100644 --- a/cli-qpid-jms/pom.xml +++ b/cli-qpid-jms/pom.xml @@ -37,7 +37,7 @@ com.redhat.mqe.jms.Main 1.10.0 ${qpid.jms.client.version} - 2.0.56.Final + 2.0.57.Final linux-x86_64-fedora 1.8.1 From 3af34371b858eaad22be1cd0afb5c6737396ebf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Feb 2023 22:01:12 +0100 Subject: [PATCH 083/117] Bump checker-qual from 3.29.0 to 3.30.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.29.0 to 3.30.0. - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.29.0...checker-framework-3.30.0) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit 39b7c6341e5073b0fde5e10dc33c772bda5aa35c) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 9042971b..11682885 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -58,7 +58,7 @@ 2.7 24.0.0 - 3.29.0 + 3.30.0 From 96e1ddaa8b4b2689b8a37f92ae9662fbd5849732 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 15:52:48 +0000 Subject: [PATCH 084/117] Bump artemis.jms.client.version from 2.27.1 to 2.28.0 Bumps `artemis.jms.client.version` from 2.27.1 to 2.28.0. Updates `artemis-jms-client` from 2.27.1 to 2.28.0 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.27.1...2.28.0) Updates `artemis-commons` from 2.27.1 to 2.28.0 - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.27.1...2.28.0) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-jms-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.activemq:artemis-commons dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit 695fb58afebf021d7cbffcd5a57b872133400ac6) --- cli-artemis-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-artemis-jms/pom.xml b/cli-artemis-jms/pom.xml index b9a807c7..04902eab 100644 --- a/cli-artemis-jms/pom.xml +++ b/cli-artemis-jms/pom.xml @@ -36,7 +36,7 @@ acc com.redhat.mqe.acc.Main false - 2.27.1 + 2.28.0 ${artemis.jms.client.version} From b0dd770f89b6138af2d0bc6636abfc28447a3197 Mon Sep 17 00:00:00 2001 From: Dominik Lenoch Date: Mon, 10 Oct 2022 23:36:11 +0200 Subject: [PATCH 085/117] Multistage container image based on UBI (cherry picked from commit ec4c4b4003730dd127fa2a43d6aba71c737de673) --- Dockerfile | 66 +++++++++++++++++------- create_links.sh | 34 ------------ image/bin/cli-activemq-connector | 3 ++ image/bin/cli-activemq-receiver | 3 ++ image/bin/cli-activemq-sender | 3 ++ image/bin/cli-artemis-connector | 3 ++ image/bin/cli-artemis-receiver | 3 ++ image/bin/cli-artemis-sender | 3 ++ image/bin/cli-paho-connector | 3 ++ image/bin/cli-paho-receiver | 3 ++ image/bin/cli-paho-sender | 3 ++ image/bin/cli-protonj2-connector | 3 ++ image/bin/cli-protonj2-receiver | 3 ++ image/bin/cli-protonj2-sender | 3 ++ image/bin/cli-qpid-connector | 3 ++ image/bin/cli-qpid-receiver | 3 ++ image/bin/cli-qpid-sender | 3 ++ build_docker.sh => image/build_podman.sh | 0 18 files changed, 91 insertions(+), 54 deletions(-) delete mode 100755 create_links.sh create mode 100644 image/bin/cli-activemq-connector create mode 100644 image/bin/cli-activemq-receiver create mode 100644 image/bin/cli-activemq-sender create mode 100644 image/bin/cli-artemis-connector create mode 100644 image/bin/cli-artemis-receiver create mode 100644 image/bin/cli-artemis-sender create mode 100644 image/bin/cli-paho-connector create mode 100644 image/bin/cli-paho-receiver create mode 100644 image/bin/cli-paho-sender create mode 100644 image/bin/cli-protonj2-connector create mode 100644 image/bin/cli-protonj2-receiver create mode 100644 image/bin/cli-protonj2-sender create mode 100644 image/bin/cli-qpid-connector create mode 100644 image/bin/cli-qpid-receiver create mode 100644 image/bin/cli-qpid-sender rename build_docker.sh => image/build_podman.sh (100%) diff --git a/Dockerfile b/Dockerfile index 6b3ebdf7..2af2976b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,53 @@ -FROM fedora:latest +# Arguments for DEV's (comment static FROM and uncomnnet #DEV ones) +ARG UBI_VERSION=9 +ARG OPENJDK_VERSION=17 +ARG UBI_BUILD_TAG=latest +ARG UBI_RUNTIME_TAG=latest +ARG IMAGE_BUILD=registry.access.redhat.com/ubi${UBI_VERSION}/openjdk-${OPENJDK_VERSION}:${UBI_TAG} +ARG IMAGE_BASE=registry.access.redhat.com/ubi${UBI_VERSION}/openjdk-${OPENJDK_VERSION}-runtime:${UBI_RUNTIME_TAG} -WORKDIR /var/lib/cli-java +#DEV FROM $IMAGE_BUILD AS build +FROM registry.access.redhat.com/ubi9/openjdk-17:1.13 AS build + +USER root +COPY . /app +WORKDIR /app + +ENV MAVEN_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Dmaven.repo.local=/app/.m2 -Dmaven.artifact.threads=42" +RUN mvn -T 1C package -DskipTests=true --no-transfer-progress + +RUN mkdir targets && \ + cp cli-qpid-jms/target/cli-qpid-jms-*[0-9].jar targets/cli-qpid.jar && \ + cp cli-artemis-jms/target/cli-artemis-jms-*[0-9].jar targets/cli-artemis.jar && \ + cp cli-paho-java/target/cli-paho-java-*[0-9].jar targets/cli-paho.jar && \ + cp cli-activemq/target/cli-activemq-*[0-9].jar targets/cli-activemq.jar && \ + cp cli-protonj2/target/cli-protonj2-*[0-9].jar targets/cli-protonj2.jar && \ + echo "package info:("$(ls cli-*/target/cli-*.jar)")" >> VERSION.txt -ENV LANG=C.UTF-8 -RUN yum install \ - -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs \ - java-11-openjdk-headless \ - bzip2 unzip xz \ - bzr git mercurial openssh-clients subversion procps \ - gnupg dirmngr \ - ca-certificates curl wget \ - && dnf clean all -y +#DEV FROM $IMAGE_BASE +FROM registry.access.redhat.com/ubi9/openjdk-17-runtime:1.13 -RUN mkdir /main +LABEL name="Red Hat Messagign QE - Java CLI Image" \ + run="podman run --rm -ti /bin/bash cli-*" -COPY cli-qpid-jms/target/cli-qpid-jms-1.2.2-SNAPSHOT-*.jar /main/cli-qpid.jar -COPY cli-activemq/target/cli-activemq-1.2.2-SNAPSHOT-*.jar /main/cli-activemq.jar -COPY cli-artemis-jms/target/cli-artemis-jms-1.2.2-SNAPSHOT-*.jar /main/cli-artemis.jar -COPY cli-paho-java/target/cli-paho-java-1.2.2-SNAPSHOT-*.jar /main/cli-paho.jar +USER root -COPY create_links.sh /main -RUN bash /main/create_links.sh +RUN mkdir /licenses +COPY ./LICENSE /licenses/LICENSE.txt +COPY ./image/bin /usr/local/bin +COPY --from=build /app/targets/ /opt/cli-java +COPY --from=build /app/VERSION.txt /opt/cli-java +RUN chmod 0755 /usr/local/bin/cli-* && \ + chmod +x /usr/local/bin/cli-* + +RUN mkdir /var/lib/cli-java && \ + chown -R 1001:0 /var/lib/cli-java && \ + chmod -R g=u /var/lib/cli-java + +USER 1001 + +VOLUME /var/lib/cli-java +WORKDIR /var/lib/cli-java -RUN groupadd cli-java && useradd -d /var/lib/cli-java -ms /bin/bash -g cli-java -G cli-java cli-java -USER cli-java:cli-java +CMD ["/bin/bash"] \ No newline at end of file diff --git a/create_links.sh b/create_links.sh deleted file mode 100755 index ebe943ec..00000000 --- a/create_links.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash -set -Eeuo pipefail -set -x - -# -# Copyright (c) 2022 Red Hat, Inc. -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -cd /main; for i in *.jar; do -for j in sender receiver connector; do - filename="/usr/local/bin/${i%.jar}-${j}" - cat > "${filename}" << EOF -#!/bin/sh - -java \${JAVA_OPTS} \${CLI_QPID_JMS_OPTS} -jar /main/${i} ${j} \$@ -EOF - chmod +x "$filename" - done -done diff --git a/image/bin/cli-activemq-connector b/image/bin/cli-activemq-connector new file mode 100644 index 00000000..d445c1b2 --- /dev/null +++ b/image/bin/cli-activemq-connector @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_ACTIVEMQ_OPTS} -jar /opt/cli-java/cli-activemq.jar connector $@ diff --git a/image/bin/cli-activemq-receiver b/image/bin/cli-activemq-receiver new file mode 100644 index 00000000..6c135aa7 --- /dev/null +++ b/image/bin/cli-activemq-receiver @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_ACTIVEMQ_OPTS} -jar /opt/cli-java/cli-activemq.jar receiver $@ diff --git a/image/bin/cli-activemq-sender b/image/bin/cli-activemq-sender new file mode 100644 index 00000000..c45f951c --- /dev/null +++ b/image/bin/cli-activemq-sender @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_ACTIVEMQ_OPTS} -jar /opt/cli-java/cli-activemq.jar sender $@ diff --git a/image/bin/cli-artemis-connector b/image/bin/cli-artemis-connector new file mode 100644 index 00000000..900e5a55 --- /dev/null +++ b/image/bin/cli-artemis-connector @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_ARTEMIS_OPTS} -jar /opt/cli-java/cli-artemis.jar connector $@ diff --git a/image/bin/cli-artemis-receiver b/image/bin/cli-artemis-receiver new file mode 100644 index 00000000..4fc16fd5 --- /dev/null +++ b/image/bin/cli-artemis-receiver @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_ARTEMIS_OPTS} -jar /opt/cli-java/cli-artemis.jar receiver $@ diff --git a/image/bin/cli-artemis-sender b/image/bin/cli-artemis-sender new file mode 100644 index 00000000..d4b3d910 --- /dev/null +++ b/image/bin/cli-artemis-sender @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_ARTEMIS_OPTS} -jar /opt/cli-java/cli-artemis.jar sender $@ diff --git a/image/bin/cli-paho-connector b/image/bin/cli-paho-connector new file mode 100644 index 00000000..4ffec016 --- /dev/null +++ b/image/bin/cli-paho-connector @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_PAHO_OPTS} -jar /opt/cli-java/cli-paho.jar connector $@ diff --git a/image/bin/cli-paho-receiver b/image/bin/cli-paho-receiver new file mode 100644 index 00000000..77f04af4 --- /dev/null +++ b/image/bin/cli-paho-receiver @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_PAHO_OPTS} -jar /opt/cli-java/cli-paho.jar receiver $@ diff --git a/image/bin/cli-paho-sender b/image/bin/cli-paho-sender new file mode 100644 index 00000000..346cfd3b --- /dev/null +++ b/image/bin/cli-paho-sender @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_PAHO_OPTS} -jar /opt/cli-java/cli-paho.jar sender $@ diff --git a/image/bin/cli-protonj2-connector b/image/bin/cli-protonj2-connector new file mode 100644 index 00000000..584c688e --- /dev/null +++ b/image/bin/cli-protonj2-connector @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_PROTONJ2_OPTS} -jar /opt/cli-java/cli-protonj2.jar connector $@ diff --git a/image/bin/cli-protonj2-receiver b/image/bin/cli-protonj2-receiver new file mode 100644 index 00000000..feee7caf --- /dev/null +++ b/image/bin/cli-protonj2-receiver @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_PROTONJ2_OPTS} -jar /opt/cli-java/cli-protonj2.jar receiver $@ diff --git a/image/bin/cli-protonj2-sender b/image/bin/cli-protonj2-sender new file mode 100644 index 00000000..51e0ff9c --- /dev/null +++ b/image/bin/cli-protonj2-sender @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_PROTONJ2_OPTS} -jar /opt/cli-java/cli-protonj2.jar sender $@ diff --git a/image/bin/cli-qpid-connector b/image/bin/cli-qpid-connector new file mode 100644 index 00000000..50f9766f --- /dev/null +++ b/image/bin/cli-qpid-connector @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_QPID_OPTS} -jar /opt/cli-java/cli-qpid.jar receiver $@ diff --git a/image/bin/cli-qpid-receiver b/image/bin/cli-qpid-receiver new file mode 100644 index 00000000..50f9766f --- /dev/null +++ b/image/bin/cli-qpid-receiver @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_QPID_OPTS} -jar /opt/cli-java/cli-qpid.jar receiver $@ diff --git a/image/bin/cli-qpid-sender b/image/bin/cli-qpid-sender new file mode 100644 index 00000000..81a92797 --- /dev/null +++ b/image/bin/cli-qpid-sender @@ -0,0 +1,3 @@ +#!/bin/sh + +java ${JAVA_OPTS} ${CLI_QPID_OPTS} -jar /opt/cli-java/cli-qpid.jar sender $@ diff --git a/build_docker.sh b/image/build_podman.sh similarity index 100% rename from build_docker.sh rename to image/build_podman.sh From 8b0507082be60d6fd01febd47471cbc233793155 Mon Sep 17 00:00:00 2001 From: Dominik Lenosi Date: Thu, 16 Feb 2023 16:48:15 +0100 Subject: [PATCH 086/117] ADD GitHub Action for cli-java image build (cherry picked from commit ab0baa5a56b220bb38227334101a662ff6877532) --- .github/workflows/image_build.yml | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/image_build.yml diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml new file mode 100644 index 00000000..ed3dc731 --- /dev/null +++ b/.github/workflows/image_build.yml @@ -0,0 +1,44 @@ +name: Build and Push Image +on: + push: + branches: + - 'main' + +env: + IMAGE_NAME: cli-java + IMAGE_REGISTRY: quay.io + IMAGE_NAMESPACE: rhmessagingqe + +jobs: + build: + name: Build and push image + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v3 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Build Image + id: build-image + uses: redhat-actions/buildah-build@v2 + with: + image: ${{ env.IMAGE_NAME }} + tags: latest ${{ github.sha }} ${{ github.ref_name }} + archs: amd64, arm64, ppc64le, s390x + containerfiles: | + ./Dockerfile + + - name: Push To quay.io + id: push-to-quay + uses: redhat-actions/push-to-registry@v2 + with: + image: ${{ steps.build-image.outputs.image }} + tags: ${{ steps.build-image.outputs.tags }} + registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }} + username: ${{ secrets.QUAY_USER }} + password: ${{ secrets.QUAY_TOKEN }} + + - name: Print images URL + run: echo "Images pushed to ${{ steps.push-to-quay.outputs.registry-paths }}" From 6828e86b21e22bf8e2e69f4499bf3c945b3b115c Mon Sep 17 00:00:00 2001 From: Dominik Lenosi Date: Thu, 16 Feb 2023 16:50:05 +0100 Subject: [PATCH 087/117] ADD github-action, docker for Dependabot (cherry picked from commit cc4e6559cc95494572ae4b3a1a440ef333afb428) --- .github/dependabot.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3fac85fb..520e38ef 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,3 +26,12 @@ updates: directory: "/" schedule: interval: "daily" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + - package-ecosystem: "docker" + labels: "image" + directory: "/" + schedule: + interval: "daily" From 11ff74923670b002543649b6e730d8a5ca6bb8f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 22:57:14 +0100 Subject: [PATCH 088/117] Bump checker-qual from 3.30.0 to 3.31.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.30.0 to 3.31.0. - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.30.0...checker-framework-3.31.0) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit 985ecea15b4d3bfc46bc51030e453a5cfa6e699c) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 11682885..37018d6e 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -58,7 +58,7 @@ 2.7 24.0.0 - 3.30.0 + 3.31.0 From f870a5bae179198cd885a0662801b64ffad1f1de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Feb 2023 09:05:39 +0000 Subject: [PATCH 089/117] Bump maven-surefire-plugin from 3.0.0-M8 to 3.0.0-M9 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M8 to 3.0.0-M9. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M8...surefire-3.0.0-M9) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 3ca8306e39a805e92858646d9ba69bd636ffd955) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 37018d6e..dc4c9193 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -54,7 +54,7 @@ 3.3.0 0.8.8 3.4.1 - 3.0.0-M8 + 3.0.0-M9 2.7 24.0.0 From 9b48b2abcfe0dd0cf99749947d381b9104e83681 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Feb 2023 09:09:17 +0000 Subject: [PATCH 090/117] Bump dagger.version from 2.44.2 to 2.45 Bumps `dagger.version` from 2.44.2 to 2.45. Updates `dagger` from 2.44.2 to 2.45 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.44.2...dagger-2.45) Updates `dagger-compiler` from 2.44.2 to 2.45 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.44.2...dagger-2.45) --- updated-dependencies: - dependency-name: com.google.dagger:dagger dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:dagger-compiler dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit 06d9b758de86f3579990278d60c8d0ff06039353) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index dc4c9193..99d99010 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -36,7 +36,7 @@ 2.0.6 2.19.0 5.0.4 - 2.44.2 + 2.45 2.14.2 1.8.10 From e71a45797d9497a49d625870107981f739959db0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Feb 2023 09:12:50 +0000 Subject: [PATCH 091/117] Bump tcnative.version from 2.0.57.Final to 2.0.59.Final Bumps `tcnative.version` from 2.0.57.Final to 2.0.59.Final. Updates `netty-tcnative-boringssl-static` from 2.0.57.Final to 2.0.59.Final - [Release notes](https://github.com/netty/netty-tcnative/releases) - [Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.57.Final...netty-tcnative-parent-2.0.59.Final) Updates `netty-tcnative` from 2.0.57.Final to 2.0.59.Final - [Release notes](https://github.com/netty/netty-tcnative/releases) - [Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.57.Final...netty-tcnative-parent-2.0.59.Final) --- updated-dependencies: - dependency-name: io.netty:netty-tcnative-boringssl-static dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-tcnative:linux-x86_64-fedora dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 52ed86e8027efb9242931d996d26486600ffdf64) --- cli-qpid-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-qpid-jms/pom.xml b/cli-qpid-jms/pom.xml index 88c9a634..10fac89c 100644 --- a/cli-qpid-jms/pom.xml +++ b/cli-qpid-jms/pom.xml @@ -37,7 +37,7 @@ com.redhat.mqe.jms.Main 1.10.0 ${qpid.jms.client.version} - 2.0.57.Final + 2.0.59.Final linux-x86_64-fedora 1.8.1 From 1a82a8f0822ca583804fe04aedb3a42d05b3ccdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Thu, 23 Feb 2023 10:36:55 +0100 Subject: [PATCH 092/117] Fixes #558: NullPointerException in cli-activemq-jmx when NumberOfPages address property changed type (#559) (cherry picked from commit 5eae51083a53d95e394b04db79d1d69b823226d3) --- .../redhat/amqx/management/ObjectReader.java | 44 ++++++++++++++++++- .../com/redhat/amqx/management/Resolver.java | 4 ++ .../management/activemq/ActiveMQResolver.java | 6 +++ .../artemis/AbstractArtemisManager.java | 6 +-- .../management/artemis/ArtemisResolver.java | 21 ++++++--- 5 files changed, 70 insertions(+), 11 deletions(-) diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/ObjectReader.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/ObjectReader.java index b97cfc8b..4e8a4953 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/ObjectReader.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/ObjectReader.java @@ -6,6 +6,14 @@ import org.slf4j.LoggerFactory; import javax.management.AttributeNotFoundException; +import javax.management.InstanceNotFoundException; +import javax.management.MBeanAttributeInfo; +import javax.management.MBeanException; +import javax.management.MBeanInfo; +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.management.ReflectionException; +import java.io.IOException; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -100,7 +108,10 @@ private Map extractMethodProperty(Method method, Object object, throw new DestinationException( String.format("Unable to access '%s' of '%s' object!", object.getClass(), method.getName())); } catch (Throwable e) { - logger.debug(e.getCause().toString()); + logger.debug(e.toString()); + if (e.getCause() != null) { + logger.debug(e.getCause().toString()); + } } return methodPropertyMap; } @@ -169,6 +180,37 @@ public Map getObjectProperties(Object object, List exclu } return propertiesMap; } + + public Map getRawObjectProperties(MBeanServerConnection mBeanServerConnection, ObjectName objectName, List excludeMethodList) throws DestinationException { + Map propertiesMap = new HashMap<>(); + + MBeanInfo info; + try { + info = mBeanServerConnection.getMBeanInfo(objectName); + } catch (Throwable e) { + throw new RuntimeException(e); + } + for (MBeanAttributeInfo attributeInfo : info.getAttributes()) { + String attributeName = attributeInfo.getName(); + + // get rid of get/is+lowercase first letter + String propertyName = getPropertyNameByMethod(attributeName, 0); + + Object value = null; + try { + value = mBeanServerConnection.getAttribute(objectName, attributeName); + propertiesMap.put(propertyName, value); + } catch (MBeanException | AttributeNotFoundException | InstanceNotFoundException | ReflectionException | + IOException e) { + + e.printStackTrace(); + } catch (Throwable e) { + logger.debug(e.toString()); + } + } + + return propertiesMap; + } } class ProxyHandler implements InvocationHandler { diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/Resolver.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/Resolver.java index 07b60c21..25433d30 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/Resolver.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/Resolver.java @@ -1,5 +1,7 @@ package com.redhat.amqx.management; +import javax.management.ObjectName; + /** * Interface for resolving view management * objects like queues, topics, broker information. @@ -18,6 +20,8 @@ public interface Resolver { U getAddressView(String addressName) throws Exception; + public ObjectName getAddressObjectName(String addressName) throws Exception; + V getDivertView(String addressName, String divertName) throws Exception; } diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/ActiveMQResolver.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/ActiveMQResolver.java index 900870f8..f5a3db7f 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/ActiveMQResolver.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/activemq/ActiveMQResolver.java @@ -57,6 +57,12 @@ public QueueViewMBean getAddressView(String queueName) throws Exception { return null; } + @Override + public ObjectName getAddressObjectName(String addressName) throws Exception { + System.err.println("Does not exist for AMQ!"); + return null; + } + @Override public QueueViewMBean getDivertView(String addressName, String divertName) throws Exception { System.err.println("Does not exist for AMQ!"); diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/AbstractArtemisManager.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/AbstractArtemisManager.java index 12dfe71a..b9050d7a 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/AbstractArtemisManager.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/AbstractArtemisManager.java @@ -8,7 +8,6 @@ import com.redhat.amqx.management.AbstractConnectionManager; import com.redhat.amqx.management.Credentials; import com.redhat.amqx.management.Resolver; -import org.apache.activemq.artemis.api.core.ActiveMQAddressDoesNotExistException; import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl; import org.apache.activemq.artemis.api.core.management.AddressControl; import org.apache.activemq.artemis.api.core.management.DivertControl; @@ -20,6 +19,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.management.ObjectName; import java.io.IOException; import java.util.*; @@ -176,8 +176,8 @@ public Map getDestinationProperties(String addressName, String d } } - AddressControl addressControl = (AddressControl) getResolver().getAddressView(addressName); - propertiesMap.putAll(objectReader.getObjectProperties(addressControl, excludeMethods)); + ObjectName addressObjectName = getResolver().getAddressObjectName(addressName); + propertiesMap.putAll(objectReader.getRawObjectProperties(mBeanServerConnection, addressObjectName, excludeMethods)); propertiesMap.put("address-settings", new JSONObject(getServerControlMBean().getAddressSettingsAsJSON(addressName))); return propertiesMap; } diff --git a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/ArtemisResolver.java b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/ArtemisResolver.java index c359c091..ce385b7d 100644 --- a/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/ArtemisResolver.java +++ b/cli-activemq-jmx/src/main/java/com/redhat/amqx/management/artemis/ArtemisResolver.java @@ -4,6 +4,7 @@ import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.management.*; import org.apache.activemq.artemis.api.core.RoutingType; +import org.jetbrains.annotations.NotNull; import javax.management.MBeanServerConnection; import javax.management.MBeanServerInvocationHandler; @@ -16,10 +17,12 @@ public class ArtemisResolver implements Resolver",module=Core,ServerType=Server"; // 1.5.1 org.apache.activemq.artemis:type=Broker,brokerName="amq",serviceType=Address,name="queue-anycast2" // 2.0 org.apache.activemq.artemis:broker="",component=addresses,address="",subcomponent=queues,routing-type="",queue="" - objectName = ObjectNameBuilder.create(DEFAULT_DOMAIN, brokerName, true).getActiveMQServerObjectName(); + ObjectName objectName = objectNameBuilder.getActiveMQServerObjectName(); return MBeanServerInvocationHandler.newProxyInstance(mBeanServerConnection, objectName, ActiveMQServerControl.class, false); } @Override public QueueControl getQueueView(String addressName, String queueName) throws Exception { - ObjectName objectName = ObjectNameBuilder.create(DEFAULT_DOMAIN, brokerName, true).getQueueObjectName(new SimpleString(addressName), new SimpleString(queueName), RoutingType.ANYCAST); + ObjectName objectName = objectNameBuilder.getQueueObjectName(new SimpleString(addressName), new SimpleString(queueName), RoutingType.ANYCAST); return MBeanServerInvocationHandler.newProxyInstance(mBeanServerConnection, objectName, QueueControl.class, false); } @Override public QueueControl getTopicView(String addressName, String topicName) throws Exception { // if address doesn't add RoutingType.MULTICAST, it does not have any type - ObjectName objectName = ObjectNameBuilder.create(DEFAULT_DOMAIN, brokerName, true).getQueueObjectName(new SimpleString(addressName), new SimpleString(topicName), RoutingType.MULTICAST); + ObjectName objectName = objectNameBuilder.getQueueObjectName(new SimpleString(addressName), new SimpleString(topicName), RoutingType.MULTICAST); return MBeanServerInvocationHandler.newProxyInstance(mBeanServerConnection, objectName, QueueControl.class, false); } public AcceptorControl getAcceptorView(String acceptorName) throws Exception { - ObjectName objectname = ObjectNameBuilder.create(DEFAULT_DOMAIN, brokerName, true).getAcceptorObjectName(acceptorName); + ObjectName objectname = objectNameBuilder.getAcceptorObjectName(acceptorName); return MBeanServerInvocationHandler.newProxyInstance(mBeanServerConnection, objectname, AcceptorControl.class, false); } public AddressControl getAddressView(String addressName) throws Exception { - ObjectName objectname = ObjectNameBuilder.create(DEFAULT_DOMAIN, brokerName, true).getAddressObjectName(new SimpleString(addressName)); + ObjectName objectname = getAddressObjectName(addressName); return MBeanServerInvocationHandler.newProxyInstance(mBeanServerConnection, objectname, AddressControl.class, false); } + @NotNull + public ObjectName getAddressObjectName(String addressName) throws Exception { + return objectNameBuilder.getAddressObjectName(new SimpleString(addressName)); + } + public DivertControl getDivertView(String addressName, String divertName) throws Exception { - ObjectName objectname = ObjectNameBuilder.create(DEFAULT_DOMAIN, brokerName, true).getDivertObjectName(divertName, addressName); + ObjectName objectname = objectNameBuilder.getDivertObjectName(divertName, addressName); return MBeanServerInvocationHandler.newProxyInstance(mBeanServerConnection, objectname, DivertControl.class, false); } From 74d7f84f8b5d50799ceed7e06a642841f2a4c29a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 13:58:22 +0000 Subject: [PATCH 093/117] Bump log4j-slf4j2-impl.version from 2.19.0 to 2.20.0 (#557) Bumps `log4j-slf4j2-impl.version` from 2.19.0 to 2.20.0. Updates `log4j-slf4j2-impl` from 2.19.0 to 2.20.0 - [Release notes](https://github.com/apache/logging-log4j2/releases) - [Changelog](https://github.com/apache/logging-log4j2/blob/release-2.x/CHANGELOG.adoc) - [Commits](https://github.com/apache/logging-log4j2/compare/rel/2.19.0...rel/2.20.0) Updates `log4j-core` from 2.19.0 to 2.20.0 - [Release notes](https://github.com/apache/logging-log4j2/releases) - [Changelog](https://github.com/apache/logging-log4j2/blob/release-2.x/CHANGELOG.adoc) - [Commits](https://github.com/apache/logging-log4j2/compare/rel/2.19.0...rel/2.20.0) --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-slf4j2-impl dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 0211137d34681aef14018d1735ad697d2d1ab45a) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 99d99010..5c9deb9b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -34,7 +34,7 @@ 2.0.6 - 2.19.0 + 2.20.0 5.0.4 2.45 2.14.2 From 61ebe4a2a69c2ef7a98dcef09af12d661b9e4930 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 14:22:57 +0100 Subject: [PATCH 094/117] Bump annotations from 24.0.0 to 24.0.1 (#562) Bumps [annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/commits) --- updated-dependencies: - dependency-name: org.jetbrains:annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 21638153632fae9bbc749b4543f3eadaf30b4db2) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 5c9deb9b..dc245990 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -57,7 +57,7 @@ 3.0.0-M9 2.7 - 24.0.0 + 24.0.1 3.31.0 From 3669ce9ce110a0a882ff23a6e3263bfc4e8bd462 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 13:26:50 +0000 Subject: [PATCH 095/117] Bump maven-compiler-plugin from 3.10.1 to 3.11.0 (#560) Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 39a209da5bda8ba1cf3c676296f1b27afc8b0fe0) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index dc245990..cec1bfba 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -48,7 +48,7 @@ 2.28.0 - 3.10.1 + 3.11.0 3.1.0 3.2.1 3.3.0 From bf9b3f0bdc2d6756807bec4ad789243fa01740d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 13:32:23 +0000 Subject: [PATCH 096/117] Bump activemq-client from 5.17.3 to 5.17.4 (#561) Bumps [activemq-client](https://github.com/apache/activemq) from 5.17.3 to 5.17.4. - [Release notes](https://github.com/apache/activemq/releases) - [Commits](https://github.com/apache/activemq/compare/activemq-5.17.3...activemq-5.17.4) --- updated-dependencies: - dependency-name: org.apache.activemq:activemq-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 9535ba99bcfe2334e73b72f376b14c710173d7f7) --- cli-activemq/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-activemq/pom.xml b/cli-activemq/pom.xml index 294ad9b6..cac549ce 100644 --- a/cli-activemq/pom.xml +++ b/cli-activemq/pom.xml @@ -35,7 +35,7 @@ aoc com.redhat.mqe.aoc.Main - 5.17.3 + 5.17.4 ${activemq.client.version} From 24a1e476825511827d8ba2d6ab0295c70e10ee53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 16:00:42 +0100 Subject: [PATCH 097/117] Bump checker-qual from 3.31.0 to 3.32.0 (#563) Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.31.0 to 3.32.0. - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.31.0...checker-framework-3.32.0) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 49a84d93c1c59b788847f52739ae228b6416f5db) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index cec1bfba..a954eb33 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -58,7 +58,7 @@ 2.7 24.0.1 - 3.31.0 + 3.32.0 From efe6d00a69d829a30e96069b5968bcd255c911a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 23:11:02 +0100 Subject: [PATCH 098/117] Bump mockito-core from 5.1.1 to 5.2.0 (#564) Bumps [mockito-core](https://github.com/mockito/mockito) from 5.1.1 to 5.2.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.1.1...v5.2.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 82931accc649c2fc69b80205992c516f3f6d9b08) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index a954eb33..84a26f81 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -43,7 +43,7 @@ 5.9.2 2.0.0 1.1.3 - 5.1.1 + 5.2.0 4.2.0 2.28.0 From 3a26218cd36cf26bade8279dcce1b7ab48d069af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Mar 2023 21:54:12 +0100 Subject: [PATCH 099/117] Bump slf4j-api from 2.0.6 to 2.0.7 (#566) Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 2.0.6 to 2.0.7. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 82e695c2f894a520ecf253b12145bc6b6db47989) --- bom/pom.xml | 2 +- cli-activemq-jmx/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 84a26f81..ccf17165 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -33,7 +33,7 @@ pom - 2.0.6 + 2.0.7 2.20.0 5.0.4 2.45 diff --git a/cli-activemq-jmx/pom.xml b/cli-activemq-jmx/pom.xml index 1331bbff..daad85ef 100644 --- a/cli-activemq-jmx/pom.xml +++ b/cli-activemq-jmx/pom.xml @@ -32,7 +32,7 @@ amqx - 2.0.6 + 2.0.7 20160810 1.5.0.redhat-00001 From 8d7e921587317cb6ab0af2b36196f4faba70bee5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Mar 2023 21:25:05 +0000 Subject: [PATCH 100/117] Bump activemq-client from 5.17.4 to 5.18.0 (#569) Bumps [activemq-client](https://github.com/apache/activemq) from 5.17.4 to 5.18.0. - [Release notes](https://github.com/apache/activemq/releases) - [Commits](https://github.com/apache/activemq/compare/activemq-5.17.4...activemq-5.18.0) --- updated-dependencies: - dependency-name: org.apache.activemq:activemq-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 703122a6f53e774fa1ae765f66c22c24a6404e9c) --- cli-activemq/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-activemq/pom.xml b/cli-activemq/pom.xml index cac549ce..39da66fe 100644 --- a/cli-activemq/pom.xml +++ b/cli-activemq/pom.xml @@ -35,7 +35,7 @@ aoc com.redhat.mqe.aoc.Main - 5.17.4 + 5.18.0 ${activemq.client.version} From 1912885e49c20305c12c61c92ed3bab89239b514 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Mar 2023 21:30:17 +0000 Subject: [PATCH 101/117] Bump maven-surefire-plugin from 3.0.0-M9 to 3.0.0 (#565) Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M9 to 3.0.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M9...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 793ef00e8a5a8064ddb6e88556e245c9c8152052) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index ccf17165..d93e013b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -54,7 +54,7 @@ 3.3.0 0.8.8 3.4.1 - 3.0.0-M9 + 3.0.0 2.7 24.0.1 From f45efe47aa10d5f3b2c7642b1ecc752bc07f5967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Fri, 24 Mar 2023 21:58:56 +0100 Subject: [PATCH 102/117] Fix dependabot.yml syntax error (cherry picked from commit 5da67acb53917ca70cba4967fb25e57314c56367) --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 520e38ef..11ce1529 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -31,7 +31,7 @@ updates: schedule: interval: "daily" - package-ecosystem: "docker" - labels: "image" + labels: ["image"] directory: "/" schedule: interval: "daily" From d2c7337bc69e00c177dd944d28fc9e9d49b2c3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Fri, 24 Mar 2023 22:01:47 +0100 Subject: [PATCH 103/117] Upgrade checkout and setup-java actions (cherry picked from commit 9f4da5bfe2c7faf6cce959e7fd6b4a751cc94c8d) --- .github/workflows/maven.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9e1e08e8..86659f61 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,10 +20,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'adopt-openj9' java-version: '11' @@ -42,10 +42,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'adopt-openj9' java-version: '11' From 0f78955545bf94e2eb2962f8039f4020543613fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Mar 2023 08:12:00 +0100 Subject: [PATCH 104/117] Bump ubi9/openjdk-17 from 1.13 to 1.14-2.1679391793 (#572) Bumps ubi9/openjdk-17 from 1.13 to 1.14-2.1679391793. --- updated-dependencies: - dependency-name: ubi9/openjdk-17 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 6e12351fac0130bbefa69db6c202f1c776e735d8) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2af2976b..27c4f918 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG IMAGE_BUILD=registry.access.redhat.com/ubi${UBI_VERSION}/openjdk-${OPENJDK_V ARG IMAGE_BASE=registry.access.redhat.com/ubi${UBI_VERSION}/openjdk-${OPENJDK_VERSION}-runtime:${UBI_RUNTIME_TAG} #DEV FROM $IMAGE_BUILD AS build -FROM registry.access.redhat.com/ubi9/openjdk-17:1.13 AS build +FROM registry.access.redhat.com/ubi9/openjdk-17:1.14-2.1679391793 AS build USER root COPY . /app From b63c7938930399f754b9f359fa1e6570db04bad0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Mar 2023 07:17:46 +0000 Subject: [PATCH 105/117] Bump ubi9/openjdk-17-runtime from 1.13 to 1.14-2.1679391794 (#571) Bumps ubi9/openjdk-17-runtime from 1.13 to 1.14-2.1679391794. --- updated-dependencies: - dependency-name: ubi9/openjdk-17-runtime dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit c33ad2924072162438747dbc23a856947533f863) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 27c4f918..43397ef5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ RUN mkdir targets && \ echo "package info:("$(ls cli-*/target/cli-*.jar)")" >> VERSION.txt #DEV FROM $IMAGE_BASE -FROM registry.access.redhat.com/ubi9/openjdk-17-runtime:1.13 +FROM registry.access.redhat.com/ubi9/openjdk-17-runtime:1.14-2.1679391794 LABEL name="Red Hat Messagign QE - Java CLI Image" \ run="podman run --rm -ti /bin/bash cli-*" From 42bfaa19b30b4fb9a72b6dee6d9f025b5285a2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Sat, 25 Mar 2023 13:15:36 +0100 Subject: [PATCH 106/117] Document cli-*'s currently provided by the project and explain helper maven modules (#573) (cherry picked from commit e6fc58cd570d517cd278b9b068a94e4fc1717712) --- README.md | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f78b20a2..abb6c249 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,36 @@ bash build_docker.sh $(date '+%Y-%m-%d') ## List of Java clis -* qpid-jms (AMQP 1.0) -* activemq-client (OpenWire) -* artemis-jms-client (Artemis Core) +| maven module | messaging library | protocol (JMS version) | notes | +|------------------|--------------------------------------------------------------------------------------------------------|------------------------|------------------| +| cli-activemq | [activemq-client](https://deps.dev/maven/org.apache.activemq%3Aactivemq-client) | OpenWire (JMS v1.1) | javax.jms API | +| cli-activemq-jmx | [artemis-core-client](https://deps.dev/maven/org.apache.activemq%3Aartemis-core-client) | JMX management | | +| cli-artemis-jms | [artemis-jms-client](https://deps.dev/maven/org.apache.activemq%3Aartemis-jms-client) | Artemis Core | javax.jms API | +| cli-paho-java | [eclipse.paho.client.mqttv3](https://deps.dev/maven/org.eclipse.paho%3Aorg.eclipse.paho.client.mqttv3) | MQTT v3 | | +| cli-protonj2 | [protonj2-client](https://deps.dev/maven/org.apache.qpid%3Aprotonj2-client) | AMQP 1.0 | "imperative API" | +| cli-qpid-jms | [qpid-jms-client](https://deps.dev/maven/org.apache.qpid%3Aqpid-jms-client) | AMQP 1.0 (JMS v2.0) | jakarta.jms API | + +## Additional maven modules + +| maven module | | +|--------------|-----------------------------------------------------------------------------| +| parent | common maven configuration for child modules, parent of all other modules | +| bom | contains dependencyManagement pom section with dependency versions | +| broker | embedded artemis-server broker for use in selftests | +| tests | test dependency of cli-* projects, contains shared test code | +| lib | shared code that does not depend on JMS | +| jmslib | shared code that depends on javax.jms API | +| jakartalib | shared code that depends on jakarta.jmx API | +| cli | the ClientListener interface for use in client selftests (messages as Maps) | + +## Directories + +| directory | | +|-----------|------------------------------------------------------------| +| .github | GitHub Actions CI configurations, dependabot.yml file | +| image | helper scripts for Dockerfile/Containerfile to build image | +| scripts | helper scripts for CI jobs | + ## Related projects From c71ceae8ba8fe329db705bb1f4f3c1da2721011a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Sun, 26 Mar 2023 13:38:44 +0200 Subject: [PATCH 107/117] Document IntelliJ known project setup issues (#574) (cherry picked from commit a200bbaaf360a91db7348f86627c870594300ae4) --- README.md | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index abb6c249..c318c26b 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,32 @@ cli-java is a collection of commandline messaging clients suitable for interacti ## Getting started -When using IntelliJ IDEA Ultimate Edition, select "Open" (not "Import Project") option to open project and delete OSGi facets in File >> Project Structure >> Project Settings >> Facets. - mvn clean package # compile without executing external tests (tests that require broker) java -jar cli-qpid-jms/target/cli-qpid-jms-*.jar sender -b amqp://127.0.0.1:5672 -a myQ --log-msgs dict +### IntelliJ notes + +[Open an existing Maven project](https://www.jetbrains.com/help/idea/maven-support.html#maven_import_project_start). + +#### Common issues + +* OSGi problems (don't remember what those actually were) + +When using IntelliJ IDEA Ultimate Edition, select "Open" (not "Import Project") option to open project and delete OSGi facets in File >> Project Structure >> Project Settings >> Facets. + +* `Unresolved reference: DaggerFakeClient`, or anything else with `Dagger` in it + +The class is generated by the [Dagger](https://github.com/google/dagger) annotation processor. +Run `mvn compile` on the command line so that Maven generates what is needed. + +The IDE action on the Maven tab to generate sources does not actually generate what is needed for Kotlin tests, because of a [missing feature](https://youtrack.jetbrains.com/issue/KT-15040). + +* `Error: Unable to access jarfile [...]/target/cli-qpid-jms-1.2.2-SNAPSHOT-2.2.0.jar` + +IntelliJ is happy to run [failsafe](https://maven.apache.org/surefire/maven-failsafe-plugin/) tests without doing the (equivalent of) `mvn package` first. +This means that the jars used in the `*ITCase` tests may be nonexistent (or out of date). +Run `mvn package -DskipTests` yourself to fix this. + ### Run tests mvn test -Ptests From 0263f464bc76d56057b3744b270629fc53a71902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Sun, 26 Mar 2023 14:36:28 +0200 Subject: [PATCH 108/117] Document project requirements, esp. tcnative openssl integration (#576) (cherry picked from commit 5c3ac4497633669ef43a960c59e99124056c5383) --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index c318c26b..0117a62b 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,14 @@ cli-java is a collection of commandline messaging clients suitable for interacting with Message Oriented Middleware. +## Requirements + +* Java 11+ +* Maven 3 +* for [tcnative](https://netty.io/wiki/forked-tomcat-native.html) dynamic library, [outdated openssl 1.0 is required](https://github.com/netty/netty-tcnative/issues/551) + * on Fedora 37, execute `sudo dnf install -y apr https://kojipkgs.fedoraproject.org//packages/compat-openssl10/1.0.2o/11.fc33/x86_64/compat-openssl10-1.0.2o-11.fc33.x86_64.rpm` + * or, enable use of [BoringSSL](https://github.com/google/boringssl) static library instead of the dynamic one, with `-P tcnative-boringssl-static` profile to maven + ## Getting started mvn clean package # compile without executing external tests (tests that require broker) From 5992b90847ac07847e87abfe7005168313daa7fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Sun, 26 Mar 2023 15:30:18 +0200 Subject: [PATCH 109/117] Revert "Bump activemq-client from 5.17.4 to 5.18.0 (#569)" (#578) This reverts commit 703122a6f53e774fa1ae765f66c22c24a6404e9c. (cherry picked from commit c488674e7417e890abd8b97f32c7c9ded0ff5fa5) --- cli-activemq/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-activemq/pom.xml b/cli-activemq/pom.xml index 39da66fe..cac549ce 100644 --- a/cli-activemq/pom.xml +++ b/cli-activemq/pom.xml @@ -35,7 +35,7 @@ aoc com.redhat.mqe.aoc.Main - 5.18.0 + 5.17.4 ${activemq.client.version} From 95fdec413fb5aea4a5fd22fe40d1a960aa15da04 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 12:41:40 +0200 Subject: [PATCH 110/117] Bump kotlin.version from 1.8.10 to 1.8.20 (#580) Bumps `kotlin.version` from 1.8.10 to 1.8.20. Updates `kotlin-stdlib` from 1.8.10 to 1.8.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-stdlib-jdk8` from 1.8.10 to 1.8.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-test-junit` from 1.8.10 to 1.8.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-maven-plugin` from 1.8.10 to 1.8.20 Updates `kotlin-reflect` from 1.8.10 to 1.8.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 143ae34aa506a689274fae15e99ffbfe5e908b23) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index d93e013b..9daf9148 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -39,7 +39,7 @@ 2.45 2.14.2 - 1.8.10 + 1.8.20 5.9.2 2.0.0 1.1.3 From b0f9bbb7658bc8cc12136d31961676e539adce26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 12:45:58 +0200 Subject: [PATCH 111/117] Bump protonj2-client from 1.0.0-M12 to 1.0.0-M13 (#581) Bumps protonj2-client from 1.0.0-M12 to 1.0.0-M13. --- updated-dependencies: - dependency-name: org.apache.qpid:protonj2-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 6fb568a72f76222f392050efcb2e47b5dfa29367) --- cli-protonj2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-protonj2/pom.xml b/cli-protonj2/pom.xml index 56e2f9e1..4cd75726 100644 --- a/cli-protonj2/pom.xml +++ b/cli-protonj2/pom.xml @@ -34,7 +34,7 @@ jms - 1.0.0-M11 + 1.0.0-M13 com.redhat.mqe.Main ${protonj2.version} 2.0.39.Final From a867481d00df5ca2aadbdaeabd74ee93ce44c907 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 16:08:49 +0200 Subject: [PATCH 112/117] Bump jacoco-maven-plugin from 0.8.8 to 0.8.9 (#584) Bumps [jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.8 to 0.8.9. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.8...v0.8.9) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 38d49a656fb78711f1a4f0f77fdff132966a154d) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 9daf9148..9e40ef94 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -52,7 +52,7 @@ 3.1.0 3.2.1 3.3.0 - 0.8.8 + 0.8.9 3.4.1 3.0.0 2.7 From 17461c7bd9a3e91a807d7fe9c57e9931fb195ed4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 16:13:43 +0200 Subject: [PATCH 113/117] Bump checker-qual from 3.32.0 to 3.33.0 (#583) Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.32.0 to 3.33.0. - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.32.0...checker-framework-3.33.0) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit b790b7862884a823945f98a9c17961c3c2fa29b9) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 9e40ef94..a9725aa2 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -58,7 +58,7 @@ 2.7 24.0.1 - 3.32.0 + 3.33.0 From b7cee76c3d0379e25e9d88c9e2bbd0da3885835d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 20:01:27 +0200 Subject: [PATCH 114/117] Bump maven-enforcer-plugin from 3.2.1 to 3.3.0 (#585) Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.2.1 to 3.3.0. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.2.1...enforcer-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit f73a7074f2aa7294b8652d551f1a49a2c8e1d945) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index a9725aa2..87708777 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -50,7 +50,7 @@ 3.11.0 3.1.0 - 3.2.1 + 3.3.0 3.3.0 0.8.9 3.4.1 From b58e028c202b797e0f505bde49c0e187ee3c8395 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 06:38:10 +0200 Subject: [PATCH 115/117] Bump mockito-core from 5.2.0 to 5.3.0 (#588) Bumps [mockito-core](https://github.com/mockito/mockito) from 5.2.0 to 5.3.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.2.0...v5.3.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 21e095b034dea7f3050822f6d1d3fac4c342c173) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 87708777..efdd5d36 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -43,7 +43,7 @@ 5.9.2 2.0.0 1.1.3 - 5.2.0 + 5.3.0 4.2.0 2.28.0 From 6af9a2f0316065aacb72b38763e3b107491f102b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 16 Apr 2023 17:47:08 +0000 Subject: [PATCH 116/117] Bump junit-pioneer from 2.0.0 to 2.0.1 (#590) Bumps [junit-pioneer](https://github.com/junit-pioneer/junit-pioneer) from 2.0.0 to 2.0.1. - [Release notes](https://github.com/junit-pioneer/junit-pioneer/releases) - [Commits](https://github.com/junit-pioneer/junit-pioneer/compare/v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: org.junit-pioneer:junit-pioneer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit e18f84ab8bb206c539ca00e47efb0b81ae36eef1) --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index efdd5d36..c3ffb722 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -41,7 +41,7 @@ 1.8.20 5.9.2 - 2.0.0 + 2.0.1 1.1.3 5.3.0 4.2.0 From 519d4fd9bbded6cb21b4fccec406e74b7520f79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 28 Jun 2023 12:14:29 +0200 Subject: [PATCH 117/117] fixup! Use log4j2 implementation to get rid of log4j1-related warnings (#471) --- cli-qpid-jms/src/test/kotlin/QPIDJMS391Test.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/cli-qpid-jms/src/test/kotlin/QPIDJMS391Test.kt b/cli-qpid-jms/src/test/kotlin/QPIDJMS391Test.kt index 5b4a7efc..a221786b 100644 --- a/cli-qpid-jms/src/test/kotlin/QPIDJMS391Test.kt +++ b/cli-qpid-jms/src/test/kotlin/QPIDJMS391Test.kt @@ -19,9 +19,6 @@ import com.google.common.truth.Correspondence import com.google.common.truth.Truth.assertThat -import jakarta.jms.Connection -import jakarta.jms.ConnectionFactory -import jakarta.jms.Session import org.apache.activemq.artemis.core.config.impl.SecurityConfiguration import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager import org.apache.logging.log4j.*