FISH-8292 Upgrade Components

payara · Mar 12, 2024 · e095426 · e095426
1 parent 6504092
commit e095426
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/AmazonSQS/AmazonSQSExample/pom.xml b/AmazonSQS/AmazonSQSExample/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>sqs</artifactId>
-            <version>2.18.17</version>
+            <version>2.25.6</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>

diff --git a/AmazonSQS/AmazonSQSJCAAPI/pom.xml b/AmazonSQS/AmazonSQSJCAAPI/pom.xml
@@ -19,7 +19,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.18.17</version>
+                <version>2.25.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/...SQSJCAAPI/src/main/java/fish/payara/cloud/connectors/amazonsqs/api/inbound/SQSPoller.java b/...SQSJCAAPI/src/main/java/fish/payara/cloud/connectors/amazonsqs/api/inbound/SQSPoller.java
@@ -46,9 +46,6 @@
 import javax.json.JsonObject;
 import javax.json.JsonReader;
 import javax.json.JsonValue;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import jakjavaxarta.resource.spi.work.WorkException;
 import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.Method;
@@ -61,7 +58,6 @@
 import javax.resource.spi.BootstrapContext;
 import javax.resource.spi.endpoint.MessageEndpointFactory;
 import javax.resource.spi.work.WorkException;
-import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
 import software.amazon.awssdk.core.ResponseInputStream;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
@@ -114,8 +110,10 @@ public void run() {
                 Class<?> mdbClass = factory.getEndpointClass();
                 for (Message message : messages) {
                     for (Method m : mdbClass.getMethods()) {
-                        if (isOnSQSMessageMethod(m) && shouldFetchS3Message(message)) {
-                            message = fetchS3MessageContent(message);
+                        if (isOnSQSMessageMethod(m)) {
+                             if (shouldFetchS3Message(message)) {
+                                message = fetchS3MessageContent(message);
+                            }
                             scheduleSQSWork(m, message);
                         }
                     }

diff --git a/AmazonSQS/AmazonSQSRAR/pom.xml b/AmazonSQS/AmazonSQSRAR/pom.xml
@@ -15,7 +15,7 @@
     <description>RAR for the Amazon SQS JCA Adapter</description>
     <url>http://www.payara.fish</url>
     <properties>
-        <awssdk.version>2.23.3</awssdk.version>
+        <awssdk.version>2.25.6</awssdk.version>
     </properties>
     <dependencies>
         <dependency>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>amazon-sqs-java-extended-client-lib</artifactId>
-            <version>2.0.4</version>
+            <version>2.1.0</version>
         </dependency>
     </dependencies>
 </project>