From 344a216feb0900a63cdb794578e1666f7e53ad87 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 7 Jul 2022 10:09:21 +0100 Subject: [PATCH] Upgrade to Artemis 2.23.1 Closes gh-31583 --- .../jms/artemis/ArtemisEmbeddedConfigurationFactory.java | 2 +- .../artemis/ArtemisEmbeddedConfigurationFactoryTests.java | 6 +++--- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java index 4453903e80..812cfc01dc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java @@ -69,7 +69,7 @@ class ArtemisEmbeddedConfigurationFactory { configuration.setClusterPassword(this.properties.getClusterPassword()); configuration.addAddressConfiguration(createAddressConfiguration("DLQ")); configuration.addAddressConfiguration(createAddressConfiguration("ExpiryQueue")); - configuration.addAddressesSetting("#", + configuration.addAddressSetting("#", new AddressSettings().setDeadLetterAddress(SimpleString.toSimpleString("DLQ")) .setExpiryAddress(SimpleString.toSimpleString("ExpiryQueue"))); return configuration; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactoryTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactoryTests.java index 46505883ee..716f410107 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactoryTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactoryTests.java @@ -74,10 +74,10 @@ class ArtemisEmbeddedConfigurationFactoryTests { void hasDlqExpiryQueueAddressSettingsConfigured() { ArtemisProperties properties = new ArtemisProperties(); Configuration configuration = new ArtemisEmbeddedConfigurationFactory(properties).createConfiguration(); - Map addressesSettings = configuration.getAddressesSettings(); - assertThat((Object) addressesSettings.get("#").getDeadLetterAddress()) + Map addressSettings = configuration.getAddressSettings(); + assertThat((Object) addressSettings.get("#").getDeadLetterAddress()) .isEqualTo(SimpleString.toSimpleString("DLQ")); - assertThat((Object) addressesSettings.get("#").getExpiryAddress()) + assertThat((Object) addressSettings.get("#").getExpiryAddress()) .isEqualTo(SimpleString.toSimpleString("ExpiryQueue")); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index da814b84b7..229bf9d923 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -24,7 +24,7 @@ bom { ] } } - library("Artemis", "2.22.0") { + library("Artemis", "2.23.1") { group("org.apache.activemq") { modules = [ "artemis-amqp-protocol",