Merge pull request #250 from NOAA-OWP/issue69

Fix an issue with routing of messages to queues for artemis 2.35 and …
NOAA-OWP · Aug 21, 2024 · adb7b73 · adb7b73
2 parents 4d9d453 + 65c9f2e
commit adb7b73
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1509,7 +1509,7 @@ project(':wres-eventsbroker') {
         implementation group: 'jakarta.jms', name: 'jakarta.jms-api', version: '3.1.0'
 
         // Apache ActiveMQ Artemis server
-        implementation('org.apache.activemq:artemis-server:2.34.0') {
+        implementation('org.apache.activemq:artemis-server:2.36.0') {
             // TODO: remove when Artemis catches up
 
             // Because we use slf4j, not jcl:
@@ -1538,7 +1538,7 @@ project(':wres-eventsbroker') {
         implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.78.1'
 
         // AMQP 1.0 protocol support for the ActiveMQ Artemis server
-        implementation('org.apache.activemq:artemis-amqp-protocol:2.34.0') {
+        implementation('org.apache.activemq:artemis-amqp-protocol:2.36.0') {
             // Because we use slf4j, not jcl:
             exclude group: 'commons-logging', module: 'commons-logging'
 

diff --git a/dist/lib/conf/eventbroker.properties b/dist/lib/conf/eventbroker.properties
@@ -13,7 +13,7 @@ connectionFactory.statisticsFactory = failover:(amqp://localhost:0?transport.tcp
 # queue.statisticsQueue = queue
 
 # One destination under amq.topic for each type of message/subject
-topic.evaluation = BURL:topic://amq.topic/evaluation?routingkey='evaluation'&exclusive='false'&autodelete='true'
-topic.status = BURL:topic://amq.topic/status?routingkey='status'&exclusive='false'&autodelete='true'
-topic.statistics = BURL:topic://amq.topic/statistics?routingkey='statistics'&exclusive='false'&autodelete='true'
-topic.pairs = BURL:topic://amq.topic/pairs?routingkey='pairs'&exclusive='false'&autodelete='true'
+topic.evaluation = BURL:topic://amq.topic/evaluation
+topic.status = BURL:topic://amq.topic/status
+topic.statistics = BURL:topic://amq.topic/statistics
+topic.pairs = BURL:topic://amq.topic/pairs
diff --git a/wres-events/testNonsrc/eventbroker.properties b/wres-events/testNonsrc/eventbroker.properties
@@ -12,7 +12,7 @@ connectionFactory.statisticsFactory = amqp://localhost:0?transport.tcpKeepAlive=
 # queue.statisticsQueue = queue
 
 # One destination under amq.topic for each type of message/subject
-topic.evaluation = BURL:topic://amq.topic/evaluation?routingkey='evaluation'&exclusive='false'&autodelete='true'
-topic.status = BURL:topic://amq.topic/status?routingkey='status'&exclusive='false'&autodelete='true'
-topic.statistics = BURL:topic://amq.topic/statistics?routingkey='statistics'&exclusive='false'&autodelete='true'
-topic.pairs = BURL:topic://amq.topic/pairs?routingkey='pairs'&exclusive='false'&autodelete='true'
+topic.evaluation = BURL:topic://amq.topic/evaluation
+topic.status = BURL:topic://amq.topic/status
+topic.statistics = BURL:topic://amq.topic/statistics
+topic.pairs = BURL:topic://amq.topic/pairs
diff --git a/wres-eventsbroker/testNonsrc/eventbroker.properties b/wres-eventsbroker/testNonsrc/eventbroker.properties
@@ -12,7 +12,7 @@ connectionFactory.statisticsFactory = amqp://localhost:0?transport.tcpKeepAlive=
 # queue.statisticsQueue = queue
 
 # One destination under amq.topic for each type of message/subject
-topic.evaluation = BURL:topic://amq.topic/evaluation?routingkey='evaluation'&exclusive='false'&autodelete='true'
-topic.status = BURL:topic://amq.topic/status?routingkey='status'&exclusive='false'&autodelete='true'
-topic.statistics = BURL:topic://amq.topic/statistics?routingkey='statistics'&exclusive='false'&autodelete='true'
-topic.pairs = BURL:topic://amq.topic/pairs?routingkey='pairs'&exclusive='false'&autodelete='true'
+topic.evaluation = BURL:topic://amq.topic/evaluation
+topic.status = BURL:topic://amq.topic/status
+topic.statistics = BURL:topic://amq.topic/statistics
+topic.pairs = BURL:topic://amq.topic/pairs
diff --git a/wres-vis/dist/lib/conf/eventbroker.properties b/wres-vis/dist/lib/conf/eventbroker.properties
@@ -12,7 +12,7 @@ connectionFactory.statisticsFactory = failover:(amqp://localhost:0?transport.tcp
 # queue.statisticsQueue = queue
 
 # One destination under amq.topic for each type of message/subject
-topic.evaluation = BURL:topic://amq.topic/evaluation?routingkey='evaluation'&exclusive='false'&autodelete='true'
-topic.status = BURL:topic://amq.topic/status?routingkey='status'&exclusive='false'&autodelete='true'
-topic.statistics = BURL:topic://amq.topic/statistics?routingkey='statistics'&exclusive='false'&autodelete='true'
-topic.pairs = BURL:topic://amq.topic/pairs?routingkey='pairs'&exclusive='false'&autodelete='true'
+topic.evaluation = BURL:topic://amq.topic/evaluation
+topic.status = BURL:topic://amq.topic/status
+topic.statistics = BURL:topic://amq.topic/statistics
+topic.pairs = BURL:topic://amq.topic/pairs
diff --git a/wres-vis/testNonsrc/eventbroker.properties b/wres-vis/testNonsrc/eventbroker.properties
@@ -12,7 +12,7 @@ connectionFactory.statisticsFactory = amqp://localhost:0?tcpSendBufferSize=10485
 # queue.statisticsQueue = queue
 
 # One destination under amq.topic for each type of message/subject
-topic.evaluation = BURL:topic://amq.topic/evaluation?routingkey='evaluation'&exclusive='false'&autodelete='true'
-topic.status = BURL:topic://amq.topic/status?routingkey='status'&exclusive='false'&autodelete='true'
-topic.statistics = BURL:topic://amq.topic/statistics?routingkey='statistics'&exclusive='false'&autodelete='true'
-topic.pairs = BURL:topic://amq.topic/pairs?routingkey='pairs'&exclusive='false'&autodelete='true'
+topic.evaluation = BURL:topic://amq.topic/evaluation
+topic.status = BURL:topic://amq.topic/status
+topic.statistics = BURL:topic://amq.topic/statistics
+topic.pairs = BURL:topic://amq.topic/pairs
diff --git a/wres-writing/dist/lib/conf/eventbroker.properties b/wres-writing/dist/lib/conf/eventbroker.properties
@@ -12,7 +12,7 @@ connectionFactory.statisticsFactory = failover:(amqp://localhost:0?transport.tcp
 # queue.statisticsQueue = queue
 
 # One destination under amq.topic for each type of message/subject
-topic.evaluation = BURL:topic://amq.topic/evaluation?routingkey='evaluation'&exclusive='false'&autodelete='true'
-topic.status = BURL:topic://amq.topic/status?routingkey='status'&exclusive='false'&autodelete='true'
-topic.statistics = BURL:topic://amq.topic/statistics?routingkey='statistics'&exclusive='false'&autodelete='true'
-topic.pairs = BURL:topic://amq.topic/pairs?routingkey='pairs'&exclusive='false'&autodelete='true'
+topic.evaluation = BURL:topic://amq.topic/evaluation
+topic.status = BURL:topic://amq.topic/status
+topic.statistics = BURL:topic://amq.topic/statistics
+topic.pairs = BURL:topic://amq.topic/pairs