import aws module (#481)

gradle/libs.versions.toml

@@ -1,6 +1,5 @@
 [versions]
 micronaut-docs = "2.0.0"
-
 micronaut = "4.2.3"
 micronaut-test = "4.1.1"
 micronaut-testresources = "2.3.1"
@@ -9,7 +8,6 @@ amazon-sqs-messaging = '2.0.3'
 micronaut-platform = "4.2.3"
 artemis-client = '2.31.2'
 awaitility = '4.2.0'
-aws-sqs = '2.23.4'
 commons-pool2 = '2.12.0'
 graal-svm = "23.1.2"
 groovy = "4.0.17"
@@ -21,26 +19,25 @@ kotlin = '1.9.22'
 spock = "2.3-groovy-4.0"
 spotbugs = "4.8.3"
 testcontainers = '1.19.3'
-micronaut-aws-v2 = '4.2.3'
 micronaut-validation = "4.2.0"
+micronaut-aws = "4.2.3"
 micronaut-gradle-plugin = "4.2.1"
-
 micronaut-logging = "1.1.2"
 [libraries]
 micronaut-core = { module = 'io.micronaut:micronaut-core-bom', version.ref = 'micronaut' }
 micronaut-validation = { module = "io.micronaut.validation:micronaut-validation-bom", version.ref = "micronaut-validation" }
+micronaut-aws = { module = "io.micronaut.aws:micronaut-aws-bom", version.ref = "micronaut-aws" }
 activemq-broker = { module = 'org.apache.activemq:activemq-broker', version.ref = 'activemq' }
 activemq-client = { module = 'org.apache.activemq:activemq-client', version.ref = 'activemq' }
 amazon-sqs-messaging = { module = 'com.amazonaws:amazon-sqs-java-messaging-lib', version.ref = 'amazon-sqs-messaging' }
 artemis-client = { module = 'org.apache.activemq:artemis-jms-client', version.ref = 'artemis-client' }
 awaitility = { module = 'org.awaitility:awaitility', version.ref = 'awaitility' }
-aws-sqs = { module = 'software.amazon.awssdk:sqs', version.ref = 'aws-sqs' }
+aws-sqs = { module = 'software.amazon.awssdk:sqs'}
 commons-pool2 = { module = 'org.apache.commons:commons-pool2', version.ref = 'commons-pool2' }
 graal-svm = { module = "org.graalvm.nativeimage:svm", version.ref = "graal-svm" }
 jcl-slf4j = { module = 'org.slf4j:jcl-over-slf4j', version.ref = 'jcl-slf4j' }
 jms-api = { module = 'javax.jms:javax.jms-api', version.ref = 'jms-api' }
 jsr305 = {group = "com.google.code.findbugs", name = "jsr305", version.ref = "jsr305" }
-micronaut-aws-v2 = { module = 'io.micronaut.aws:micronaut-aws-sdk-v2', version.ref = 'micronaut-aws-v2' }
 spotbugs = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotbugs" }
 testcontainers-localstack = { module = 'org.testcontainers:localstack', version.ref = 'testcontainers' }
 testcontainers-spock = { module = 'org.testcontainers:spock', version.ref = 'testcontainers' }

jms-sqs/build.gradle.kts

@@ -10,6 +10,6 @@ dependencies {
     api(projects.micronautJmsCore)
     api(libs.amazon.sqs.messaging)
     api(libs.aws.sqs)
-    api(libs.micronaut.aws.v2)
+    api(mnAws.micronaut.aws.sdk.v2)
     compileOnly(libs.graal.svm)
 }

settings.gradle

@@ -29,4 +29,5 @@ micronautBuild {
     useStandardizedProjectNames = true
     importMicronautCatalog()
     importMicronautCatalog("micronaut-validation")
+    importMicronautCatalog("micronaut-aws")
 }

tests/tasks-sqs/build.gradle.kts

@@ -13,8 +13,3 @@ micronaut {
         additionalModules.add("localstack-sqs")
     }
 }
-configurations.all {
-    resolutionStrategy {
-        force("${libs.aws.sqs.get()}")
-    }
-}