Skip to content

Commit be8d9f9

Browse files
authored
Merge branch 'master' into fix-fifo-batch-failure
2 parents 8d42118 + a72fb3d commit be8d9f9

File tree

6 files changed

+23
-17
lines changed

6 files changed

+23
-17
lines changed

.github/workflows/auto-merge.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ on:
55
workflows: ["Build"]
66
types: [completed]
77

8+
permissions:
9+
pull-requests: write
10+
issues: write
11+
repository-projects: write
12+
contents: write
13+
814
jobs:
915
merge-me:
1016
name: Merge me!
@@ -49,12 +55,12 @@ jobs:
4955
pull_number: issue_number,
5056
event: 'APPROVE'
5157
})
58+
59+
github.pulls.merge({
60+
owner: context.payload.repository.owner.login,
61+
repo: context.payload.repository.name,
62+
pull_number: issue_number,
63+
merge_method: 'squash'
64+
})
5265
5366
github-token: ${{ secrets.AUTOMERGE }}
54-
- name: Merge me!
55-
uses: peter-evans/create-or-update-comment@v2 # use dependabot comments to automatically merge
56-
with:
57-
issue-number: ${{ github.event.pull_request.number }}
58-
body: |
59-
dependabot squash and merge
60-
reactions: rocket

examples/powertools-examples-idempotency/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.amazonaws</groupId>
6565
<artifactId>DynamoDBLocal</artifactId>
66-
<version>1.21.0</version>
66+
<version>1.22.0</version>
6767
<scope>test</scope>
6868
</dependency>
6969
<dependency>

examples/powertools-examples-sqs/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>software.amazon.awssdk</groupId>
2727
<artifactId>url-connection-client</artifactId>
28-
<version>2.20.67</version>
28+
<version>2.20.85</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>com.amazonaws</groupId>
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>com.fasterxml.jackson.datatype</groupId>
5252
<artifactId>jackson-datatype-joda</artifactId>
53-
<version>2.14.2</version>
53+
<version>2.15.2</version>
5454
</dependency>
5555

5656
<dependency>

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<log4j.version>2.20.0</log4j.version>
6161
<jackson.version>2.14.2</jackson.version>
6262
<aspectj.version>1.9.7</aspectj.version>
63-
<aws.sdk.version>2.20.67</aws.sdk.version>
64-
<aws.xray.recorder.version>2.13.0</aws.xray.recorder.version>
63+
<aws.sdk.version>2.20.85</aws.sdk.version>
64+
<aws.xray.recorder.version>2.14.0</aws.xray.recorder.version>
6565
<payloadoffloading-common.version>2.1.2</payloadoffloading-common.version>
6666
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6767
<lambda.core.version>1.2.2</lambda.core.version>
@@ -73,7 +73,7 @@
7373
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
7474
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
7575
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
76-
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
76+
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
7777
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
7878
<junit-jupiter.version>5.9.3</junit-jupiter.version>
7979
<aws-embedded-metrics.version>1.0.6</aws-embedded-metrics.version>
@@ -454,7 +454,7 @@
454454
<plugin>
455455
<groupId>com.github.spotbugs</groupId>
456456
<artifactId>spotbugs-maven-plugin</artifactId>
457-
<version>4.7.3.2</version>
457+
<version>4.7.3.4</version>
458458
<executions>
459459
<execution>
460460
<id>test</id>

powertools-e2e-tests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<!-- we can use Java 11 for integration tests, not forced to stick to Java 8 -->
1818
<maven.compiler.source>8</maven.compiler.source>
1919
<maven.compiler.target>8</maven.compiler.target>
20-
<constructs.version>10.2.30</constructs.version>
21-
<cdk.version>2.79.1</cdk.version>
20+
<constructs.version>10.2.47</constructs.version>
21+
<cdk.version>2.83.1</cdk.version>
2222

2323
<!-- Don't deploy the e2e tests -->
2424
<maven.deploy.skip>true</maven.deploy.skip>

powertools-validation/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<dependency>
7474
<groupId>com.networknt</groupId>
7575
<artifactId>json-schema-validator</artifactId>
76-
<version>1.0.78</version>
76+
<version>1.0.84</version>
7777
</dependency>
7878
<dependency>
7979
<groupId>com.amazonaws</groupId>

0 commit comments

Comments
 (0)