From 9ed41e408c11342b06f8335bf27509e69b312144 Mon Sep 17 00:00:00 2001 From: Pankaj Agrawal Date: Wed, 5 Jan 2022 14:43:17 +0100 Subject: [PATCH] chore(docs): use free fair gradle aspect plugin --- docs/index.md | 21 ++++++++++---------- docs/utilities/batch.md | 3 +-- docs/utilities/custom_resources.md | 1 - docs/utilities/parameters.md | 15 ++++---------- docs/utilities/sqs_large_message_handling.md | 3 +-- docs/utilities/validation.md | 3 +-- 6 files changed, 17 insertions(+), 29 deletions(-) diff --git a/docs/index.md b/docs/index.md index 019c976d5..7091c5c26 100644 --- a/docs/index.md +++ b/docs/index.md @@ -106,23 +106,22 @@ For more information about the project and available options refer to this [repo ```groovy plugins{ id 'java' - id 'aspectj.AspectjGradlePlugin' version '0.0.7' + id 'io.freefair.aspectj.post-compile-weaving' version '5.0.1' } repositories { - jcenter() + mavenCentral() } + + aspectj { + version = "1.9.7" + } + dependencies { - implementation 'software.amazon.lambda:powertools-tracing:1.10.0' - aspectpath 'software.amazon.lambda:powertools-tracing:1.10.0' - implementation 'software.amazon.lambda:powertools-logging:1.10.0' - aspectpath 'software.amazon.lambda:powertools-logging:1.10.0' - implementation 'software.amazon.lambda:powertools-metrics:1.10.0' - aspectpath 'software.amazon.lambda:powertools-metrics:1.10.0' + aspect 'software.amazon.lambda:powertools-logging:1.10.0' + aspect 'software.amazon.lambda:powertools-tracing:1.10.0' + aspect 'software.amazon.lambda:powertools-metrics:1.10.0' } ``` - **Note:** - - Please add `aspectjVersion = '1.9.6'` to the `gradle.properties` file. ## Environment variables diff --git a/docs/utilities/batch.md b/docs/utilities/batch.md index ea83bcb5a..d26caf4f1 100644 --- a/docs/utilities/batch.md +++ b/docs/utilities/batch.md @@ -73,8 +73,7 @@ To install this utility, add the following dependency to your project. ```groovy dependencies { ... - implementation 'software.amazon.lambda:powertools-sqs:1.10.0' - aspectpath 'software.amazon.lambda:powertools-sqs:1.10.0' + aspect 'software.amazon.lambda:powertools-sqs:1.10.0' } ``` diff --git a/docs/utilities/custom_resources.md b/docs/utilities/custom_resources.md index a17c3da8c..9be46d30a 100644 --- a/docs/utilities/custom_resources.md +++ b/docs/utilities/custom_resources.md @@ -34,7 +34,6 @@ To install this utility, add the following dependency to your project. dependencies { ... implementation 'software.amazon.lambda:powertools-cloudformation:1.10.0' - aspectpath 'software.amazon.lambda:powertools-cloudformation:1.10.0' } ``` diff --git a/docs/utilities/parameters.md b/docs/utilities/parameters.md index cc2753482..6329a76d5 100644 --- a/docs/utilities/parameters.md +++ b/docs/utilities/parameters.md @@ -32,8 +32,7 @@ To install this utility, add the following dependency to your project. ```groovy dependencies { ... - implementation 'software.amazon.lambda:powertools-parameters:1.10.0' - aspectpath 'software.amazon.lambda:powertools-parameters:1.10.0' + aspect 'software.amazon.lambda:powertools-parameters:1.10.0' } ``` @@ -425,19 +424,13 @@ If you want to use the ```@Param``` annotation in your project add configuration ```groovy plugins{ id 'java' - id 'aspectj.AspectjGradlePlugin' version '0.0.6' + id 'io.freefair.aspectj.post-compile-weaving' version '5.0.1' } repositories { jcenter() } dependencies { ... - implementation 'software.amazon.lambda:powertools-parameters:1.10.0' - aspectpath 'software.amazon.lambda:powertools-parameters:1.10.0' + aspect 'software.amazon.lambda:powertools-parameters:1.10.0' } - ``` - - **Note:** - - Please add `aspectjVersion = '1.9.6'` to the `gradle.properties` file. The aspectj plugin works at the moment with gradle 5.x only if - you are using `java 8` as runtime. Please refer to [open issue](https://github.com/awslabs/aws-lambda-powertools-java/issues/146) for more details. \ No newline at end of file + ``` \ No newline at end of file diff --git a/docs/utilities/sqs_large_message_handling.md b/docs/utilities/sqs_large_message_handling.md index 7d5e4968b..d42756d2d 100644 --- a/docs/utilities/sqs_large_message_handling.md +++ b/docs/utilities/sqs_large_message_handling.md @@ -81,8 +81,7 @@ To install this utility, add the following dependency to your project. ```groovy dependencies { ... - implementation 'software.amazon.lambda:powertools-sqs:1.10.0' - aspectpath 'software.amazon.lambda:powertools-sqs:1.10.0' + aspect 'software.amazon.lambda:powertools-sqs:1.10.0' } ``` diff --git a/docs/utilities/validation.md b/docs/utilities/validation.md index 6c138db91..2e1560481 100644 --- a/docs/utilities/validation.md +++ b/docs/utilities/validation.md @@ -62,8 +62,7 @@ To install this utility, add the following dependency to your project. ```groovy dependencies { - implementation 'software.amazon.lambda:powertools-validation:1.10.0' - aspectpath 'software.amazon.lambda:powertools-validation:1.10.0' + aspect 'software.amazon.lambda:powertools-validation:1.10.0' } ```