Skip to content

Commit ac4cf4e

Browse files
authored
Merge branch 'main' into dependabot/maven/com.amazonaws-aws-lambda-java-events-3.11.2
2 parents bda12e1 + 24767cf commit ac4cf4e

File tree

9 files changed

+21
-11
lines changed

9 files changed

+21
-11
lines changed

.github/workflows/build-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ name: Build Docs
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- main
77
paths:
88
- 'docs/**'
99
- 'mkdocs.yml'
1010
- 'Makefile'
1111

1212
push:
1313
branches:
14-
- master
14+
- main
1515
paths:
1616
- 'docs/**'
1717
- 'mkdocs.yml'

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- main
77
paths:
88
- 'powertools-cloudformation/**'
99
- 'powertools-core/**'
@@ -23,7 +23,7 @@ on:
2323
- '.github/workflows/**'
2424
push:
2525
branches:
26-
- master
26+
- main
2727
paths:
2828
- 'powertools-cloudformation/**'
2929
- 'powertools-core/**'

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
# branches to consider in the event; optional, defaults to all
66
branches:
7-
- master
7+
- main
88

99
jobs:
1010
update_release_draft:

.github/workflows/spotbugs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: SpotBugs
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- main
77
paths:
88
- 'powertools-cloudformation/**'
99
- 'powertools-core/**'

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ Users no longer need to depend on [com.nickwongdev](https://mvnrepository.com/ar
208208
## [1.4.0] - 2021-03-11
209209
* **Metrics**: Ability to set default dimension for metrics via `MetricsUtils.defaultDimensionSet()`.
210210

211-
**Note**: If your monitoring depends on [default dimensions](https://github.com/awslabs/aws-embedded-metrics-java/blob/master/src/main/java/software/amazon/cloudwatchlogs/emf/logger/MetricsLogger.java#L173) captured before via [aws-embedded-metrics-java](https://github.com/awslabs/aws-embedded-metrics-java),
211+
**Note**: If your monitoring depends on [default dimensions](https://github.com/awslabs/aws-embedded-metrics-java/blob/main/src/main/java/software/amazon/cloudwatchlogs/emf/logger/MetricsLogger.java#L173) captured before via [aws-embedded-metrics-java](https://github.com/awslabs/aws-embedded-metrics-java),
212212
those either need to be updated or has to be explicitly captured via `MetricsUtils.defaultDimensionSet()`.
213213

214214

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail
2323
## Contributing via Pull Requests
2424
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
2525

26-
1. You are working against the latest source on the *master* branch.
26+
1. You are working against the latest source on the *main* branch.
2727
2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
2828
3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
2929

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Powertools for AWS Lambda (Java)
22

3-
![aws provider](https://img.shields.io/badge/provider-AWS-orange?logo=amazon-aws&color=ff9900) ![Build status](https://github.com/aws-powertools/powertools-lambda-java/actions/workflows/build.yml/badge.svg) ![Maven Central](https://img.shields.io/maven-central/v/software.amazon.lambda/powertools-parent) [![codecov.io](https://codecov.io/github/aws-powertools/lambda-java/branch/master/graphs/badge.svg)](https://app.codecov.io/gh/aws-powertools/lambda-java)
3+
![aws provider](https://img.shields.io/badge/provider-AWS-orange?logo=amazon-aws&color=ff9900) ![Build status](https://github.com/aws-powertools/powertools-lambda-java/actions/workflows/build.yml/badge.svg) ![Maven Central](https://img.shields.io/maven-central/v/software.amazon.lambda/powertools-parent) [![codecov.io](https://codecov.io/github/aws-powertools/lambda-java/branch/main/graphs/badge.svg)](https://app.codecov.io/gh/aws-powertools/lambda-java)
44

55

66
Powertools for AWS Lambda (Java) is a developer toolkit to implement Serverless best practices and increase developer velocity.

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ extra:
8686
version: 1.15.0
8787

8888
repo_url: https://github.com/aws-powertools/powertools-lambda-java
89-
edit_uri: edit/master/docs
89+
edit_uri: edit/main/docs

pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<maven.compiler.source>1.8</maven.compiler.source>
5959
<maven.compiler.target>1.8</maven.compiler.target>
6060
<log4j.version>2.20.0</log4j.version>
61-
<jackson.version>2.14.2</jackson.version>
61+
<jackson.version>2.15.2</jackson.version>
6262
<aspectj.version>1.9.7</aspectj.version>
6363
<aws.sdk.version>2.20.86</aws.sdk.version>
6464
<aws.xray.recorder.version>2.14.0</aws.xray.recorder.version>
@@ -166,6 +166,16 @@
166166
<artifactId>jackson-databind</artifactId>
167167
<version>${jackson.version}</version>
168168
</dependency>
169+
<dependency>
170+
<groupId>com.fasterxml.jackson.core</groupId>
171+
<artifactId>jackson-core</artifactId>
172+
<version>${jackson.version}</version>
173+
</dependency>
174+
<dependency>
175+
<groupId>com.fasterxml.jackson.datatype</groupId>
176+
<artifactId>jackson-datatype-jsr310</artifactId>
177+
<version>${jackson.version}</version>
178+
</dependency>
169179
<dependency>
170180
<groupId>org.apache.logging.log4j</groupId>
171181
<artifactId>log4j-core</artifactId>

0 commit comments

Comments
 (0)