Merge pull request #37 from mvallim/fix/cve

Fix/CVE
mvallim · Feb 21, 2024 · 66fc8ee · 66fc8ee
2 parents 1d8e5d2 + 6bf2065
commit 66fc8ee
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 27 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -2,14 +2,18 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [master]
+    branches: 
+      - feature**
+      - fix**
+      - master
     paths-ignore:
       - "**/README.md"
       - "**/CONTRIBUTING.md"
       - "**/CONTRIBUTORS.txt"
       - "**/LICENSE"
   pull_request:
-    branches: [master]
+    branches:
+      - master
     paths-ignore:
       - "**/README.md"
       - "**/CONTRIBUTING.md"

diff --git a/README.md b/README.md
@@ -19,9 +19,9 @@ Article [Martin Fowler](https://martinfowler.com) [Request Batch](https://martin
 
 _**Compatible JDK 8, 11, 15, 16 and 17**_
 
-_**Compatible AWS JDK v1 >= 1.12.346**_
+_**Compatible AWS JDK v1 >= 1.12**_
 
-_**Compatible AWS JDK v2 >= 2.18.21**_
+_**Compatible AWS JDK v2 >= 2.18**_
 
 This library supports **`Kotlin`** aswell
 
@@ -38,7 +38,7 @@ You can pull it from the central Maven repositories:
 <dependency>
     <groupId>com.github.mvallim</groupId>
     <artifactId>amazon-sns-java-messaging-lib-v1</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
 </dependency>
 ```
 
@@ -47,7 +47,7 @@ You can pull it from the central Maven repositories:
 <dependency>
     <groupId>com.github.mvallim</groupId>
     <artifactId>amazon-sns-java-messaging-lib-v2</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
 </dependency>
 ```
 
@@ -68,12 +68,12 @@ If you want to try a snapshot version, add the following repository:
 
 ### For AWS SDK v1
 ```groovy
-implementation 'com.github.mvallim:amazon-sns-java-messaging-lib-v1:1.0.4'
+implementation 'com.github.mvallim:amazon-sns-java-messaging-lib-v1:1.0.5'
 ```
 
 ### For AWS SDK v2
 ```groovy
-implementation 'com.github.mvallim:amazon-sns-java-messaging-lib-v2:1.0.4'
+implementation 'com.github.mvallim:amazon-sns-java-messaging-lib-v2:1.0.5'
 ```
 
 If you want to try a snapshot version, add the following repository:

diff --git a/amazon-sns-java-messaging-lib-template/pom.xml b/amazon-sns-java-messaging-lib-template/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.github.mvallim</groupId>
 		<artifactId>amazon-sns-java-messaging-lib</artifactId>
-		<version>1.0.5-SNAPSHOT</version>
+		<version>1.0.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/amazon-sns-java-messaging-lib-v1/pom.xml b/amazon-sns-java-messaging-lib-v1/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>com.github.mvallim</groupId>
 		<artifactId>amazon-sns-java-messaging-lib</artifactId>
-		<version>1.0.5-SNAPSHOT</version>
+		<version>1.0.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>amazon-sns-java-messaging-lib-v1</artifactId>
 
 	<properties>
-		<aws-java-sdk-bom.version>1.12.420</aws-java-sdk-bom.version>
+		<aws-java-sdk-bom.version>1.12.661</aws-java-sdk-bom.version>
 	</properties>
 
 	<dependencyManagement>

diff --git a/...core/core/AmazonSnsProducerAsyncTest.java → .../lib/core/AmazonSnsProducerAsyncTest.java b/...core/core/AmazonSnsProducerAsyncTest.java → .../lib/core/AmazonSnsProducerAsyncTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.amazon.sns.messaging.lib.core.core;
+package com.amazon.sns.messaging.lib.core;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -39,7 +39,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import com.amazon.sns.messaging.lib.core.AmazonSnsTemplate;
 import com.amazon.sns.messaging.lib.core.helper.ConsumerHelper;
 import com.amazon.sns.messaging.lib.model.RequestEntry;
 import com.amazon.sns.messaging.lib.model.ResponseFailEntry;

diff --git a/.../core/core/AmazonSnsProducerSyncTest.java → ...g/lib/core/AmazonSnsProducerSyncTest.java b/.../core/core/AmazonSnsProducerSyncTest.java → ...g/lib/core/AmazonSnsProducerSyncTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.amazon.sns.messaging.lib.core.core;
+package com.amazon.sns.messaging.lib.core;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -37,7 +37,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import com.amazon.sns.messaging.lib.core.AmazonSnsTemplate;
 import com.amazon.sns.messaging.lib.core.helper.ConsumerHelper;
 import com.amazon.sns.messaging.lib.model.RequestEntry;
 import com.amazon.sns.messaging.lib.model.ResponseFailEntry;

diff --git a/.../lib/core/core/MessageAttributesTest.java → ...aging/lib/core/MessageAttributesTest.java b/.../lib/core/core/MessageAttributesTest.java → ...aging/lib/core/MessageAttributesTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.amazon.sns.messaging.lib.core.core;
+package com.amazon.sns.messaging.lib.core;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -26,7 +26,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import com.amazon.sns.messaging.lib.core.MessageAttributes;
 import com.amazonaws.services.sns.model.MessageAttributeValue;
 
 class MessageAttributesTest {

diff --git a/amazon-sns-java-messaging-lib-v2/pom.xml b/amazon-sns-java-messaging-lib-v2/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>com.github.mvallim</groupId>
 		<artifactId>amazon-sns-java-messaging-lib</artifactId>
-		<version>1.0.5-SNAPSHOT</version>
+		<version>1.0.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>amazon-sns-java-messaging-lib-v2</artifactId>
 
 	<properties>
-		<aws-java-sdk-bom.version>2.20.17</aws-java-sdk-bom.version>
+		<aws-java-sdk-bom.version>2.20.162</aws-java-sdk-bom.version>
 	</properties>
 
 	<dependencyManagement>

diff --git a/...core/core/AmazonSnsProducerAsyncTest.java → .../lib/core/AmazonSnsProducerAsyncTest.java b/...core/core/AmazonSnsProducerAsyncTest.java → .../lib/core/AmazonSnsProducerAsyncTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.amazon.sns.messaging.lib.core.core;
+package com.amazon.sns.messaging.lib.core;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -38,7 +38,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import com.amazon.sns.messaging.lib.core.AmazonSnsTemplate;
 import com.amazon.sns.messaging.lib.core.helper.ConsumerHelper;
 import com.amazon.sns.messaging.lib.model.RequestEntry;
 import com.amazon.sns.messaging.lib.model.ResponseFailEntry;

diff --git a/.../core/core/AmazonSnsProducerSyncTest.java → ...g/lib/core/AmazonSnsProducerSyncTest.java b/.../core/core/AmazonSnsProducerSyncTest.java → ...g/lib/core/AmazonSnsProducerSyncTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.amazon.sns.messaging.lib.core.core;
+package com.amazon.sns.messaging.lib.core;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -37,7 +37,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import com.amazon.sns.messaging.lib.core.AmazonSnsTemplate;
 import com.amazon.sns.messaging.lib.core.helper.ConsumerHelper;
 import com.amazon.sns.messaging.lib.model.RequestEntry;
 import com.amazon.sns.messaging.lib.model.ResponseFailEntry;

diff --git a/.../lib/core/core/MessageAttributesTest.java → ...aging/lib/core/MessageAttributesTest.java b/.../lib/core/core/MessageAttributesTest.java → ...aging/lib/core/MessageAttributesTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.amazon.sns.messaging.lib.core.core;
+package com.amazon.sns.messaging.lib.core;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -26,8 +26,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import com.amazon.sns.messaging.lib.core.MessageAttributes;
-
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.services.sns.model.MessageAttributeValue;
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.github.mvallim</groupId>
 	<artifactId>amazon-sns-java-messaging-lib</artifactId>
-	<version>1.0.5-SNAPSHOT</version>
+	<version>1.0.6-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>amazon-sns-java-messaging-lib</name>