Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Fix an issue with routing of messages to queues for artemis 2.35 and … #250

Merged
merged 1 commit into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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'

Expand Down
8 changes: 4 additions & 4 deletions dist/lib/conf/eventbroker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions wres-events/testNonsrc/eventbroker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions wres-eventsbroker/testNonsrc/eventbroker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions wres-vis/dist/lib/conf/eventbroker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions wres-vis/testNonsrc/eventbroker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions wres-writing/dist/lib/conf/eventbroker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading