Skip to content

Commit b764e81

Browse files
committed
feat: conditional batch payload size
1 parent 864bd33 commit b764e81

10 files changed

Lines changed: 33 additions & 40 deletions

File tree

.github/workflows/cd-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
if: ${{ inputs.environment == 'release' }}
5252
name: Set output variables
5353
run: |
54-
RELEASE_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec | grep -e '^[^\[]' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
54+
RELEASE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | grep -e '^[^\[]' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
5555
RELEASE_TAG=v${RELEASE_VERSION}
5656
5757
echo "release-version=$RELEASE_VERSION" >> $GITHUB_OUTPUT

.github/workflows/cd-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- id: environment
3333
name: Set output environment passed to the reusable workflow
3434
run: |
35-
VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | cut -d '-' -f 1)
35+
VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | grep -e '^[^\[]' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
3636
echo "version=$VERSION" >> $GITHUB_OUTPUT
3737
echo "target-branch=release/$VERSION" >> $GITHUB_OUTPUT
3838
@@ -55,4 +55,4 @@ jobs:
5555
type: Snapshot
5656
labels: automatic,snapshot
5757
source-branch: master
58-
target-branch: ${{ needs.variables.outputs.target-branch }}
58+
target-branch: ${{ needs.variables.outputs.target-branch }}

.github/workflows/ci.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,12 @@ jobs:
2020
outputs:
2121
type: ${{ steps.environment.outputs.type }}
2222
labels: ${{ steps.environment.outputs.labels }}
23-
target-branch: ${{ steps.environment.outputs.target-branch }}
2423
steps:
25-
- name: Checkout repository
26-
uses: actions/checkout@v4
27-
28-
- name: Set up JDK
29-
uses: actions/setup-java@v4
30-
with:
31-
java-version: 17
32-
distribution: "corretto"
33-
cache: "maven"
34-
3524
- id: environment
3625
name: Set output environment passed to the reusable workflow
3726
run: |
38-
VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
39-
echo "version=$VERSION" >> $GITHUB_OUTPUT
4027
echo "type=$TYPE" >> $GITHUB_OUTPUT
4128
echo "labels=$LABELS" >> $GITHUB_OUTPUT
42-
echo "target-branch=release/$VERSION" >> $GITHUB_OUTPUT
4329
4430
ci:
4531
needs: variables

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,4 @@ logs/
9494
pom.xml.releaseBackup
9595
.attach_*
9696
release.properties
97+
**/pom.xml.versionsBackup

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ You can pull it from the central Maven repositories:
3838
<dependency>
3939
<groupId>com.github.mvallim</groupId>
4040
<artifactId>amazon-sns-java-messaging-lib-v1</artifactId>
41-
<version>1.0.7</version>
41+
<version>1.0.8</version>
4242
</dependency>
4343
```
4444

@@ -48,7 +48,7 @@ You can pull it from the central Maven repositories:
4848
<dependency>
4949
<groupId>com.github.mvallim</groupId>
5050
<artifactId>amazon-sns-java-messaging-lib-v2</artifactId>
51-
<version>1.0.7</version>
51+
<version>1.0.8</version>
5252
</dependency>
5353
```
5454

@@ -70,13 +70,13 @@ If you want to try a snapshot version, add the following repository:
7070
### For AWS SDK v1
7171

7272
```groovy
73-
implementation 'com.github.mvallim:amazon-sns-java-messaging-lib-v1:1.0.7'
73+
implementation 'com.github.mvallim:amazon-sns-java-messaging-lib-v1:1.0.8'
7474
```
7575

7676
### For AWS SDK v2
7777

7878
```groovy
79-
implementation 'com.github.mvallim:amazon-sns-java-messaging-lib-v2:1.0.7'
79+
implementation 'com.github.mvallim:amazon-sns-java-messaging-lib-v2:1.0.8'
8080
```
8181

8282
If you want to try a snapshot version, add the following repository:

amazon-sns-java-messaging-lib-template/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
24

35
<modelVersion>4.0.0</modelVersion>
46

57
<parent>
68
<groupId>com.github.mvallim</groupId>
79
<artifactId>amazon-sns-java-messaging-lib</artifactId>
8-
<version>1.0.7-SNAPSHOT</version>
10+
<version>1.0.8-SNAPSHOT</version>
911
<relativePath>../pom.xml</relativePath>
1012
</parent>
1113

amazon-sns-java-messaging-lib-template/src/main/java/com/amazon/sns/messaging/lib/concurrent/RingBufferBlockingQueue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import lombok.Setter;
3333
import lombok.SneakyThrows;
3434

35-
@SuppressWarnings({ "java:S2274", "unchecked" })
35+
@SuppressWarnings({ "java:S2274" })
3636
public class RingBufferBlockingQueue<E> extends AbstractQueue<E> implements BlockingQueue<E> {
3737

3838
private static final int DEFAULT_CAPACITY = 2048;

amazon-sns-java-messaging-lib-v1/pom.xml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
35
<modelVersion>4.0.0</modelVersion>
4-
6+
57
<parent>
68
<groupId>com.github.mvallim</groupId>
79
<artifactId>amazon-sns-java-messaging-lib</artifactId>
8-
<version>1.0.7-SNAPSHOT</version>
10+
<version>1.0.8-SNAPSHOT</version>
911
<relativePath>../pom.xml</relativePath>
1012
</parent>
11-
13+
1214
<artifactId>amazon-sns-java-messaging-lib-v1</artifactId>
1315

1416
<name>${project.artifactId}</name>
15-
17+
1618
<properties>
1719
<aws-java-sdk-bom.version>1.12.661</aws-java-sdk-bom.version>
1820
</properties>
19-
21+
2022
<dependencyManagement>
2123
<dependencies>
2224
<dependency>
@@ -28,7 +30,7 @@
2830
</dependency>
2931
</dependencies>
3032
</dependencyManagement>
31-
33+
3234
<dependencies>
3335
<dependency>
3436
<groupId>com.github.mvallim</groupId>

amazon-sns-java-messaging-lib-v2/pom.xml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
35
<modelVersion>4.0.0</modelVersion>
4-
6+
57
<parent>
68
<groupId>com.github.mvallim</groupId>
79
<artifactId>amazon-sns-java-messaging-lib</artifactId>
8-
<version>1.0.7-SNAPSHOT</version>
10+
<version>1.0.8-SNAPSHOT</version>
911
<relativePath>../pom.xml</relativePath>
1012
</parent>
11-
13+
1214
<artifactId>amazon-sns-java-messaging-lib-v2</artifactId>
1315

1416
<name>${project.artifactId}</name>
1517

1618
<properties>
1719
<aws-java-sdk-bom.version>2.20.162</aws-java-sdk-bom.version>
1820
</properties>
19-
21+
2022
<dependencyManagement>
2123
<dependencies>
2224
<dependency>
@@ -39,5 +41,5 @@
3941
<artifactId>sns</artifactId>
4042
</dependency>
4143
</dependencies>
42-
44+
4345
</project>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.github.mvallim</groupId>
88
<artifactId>amazon-sns-java-messaging-lib</artifactId>
9-
<version>1.0.7-SNAPSHOT</version>
9+
<version>1.0.8-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<name>${project.artifactId}</name>

0 commit comments

Comments
 (0)