Merge remote-tracking branch 'origin/2.3.x' into master

Author: maciejwalkowiak

docs/pom.xml

@@ -32,7 +32,7 @@
 		<docs.main>spring-cloud-aws</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
 		<docs.whitelisted.branches>2.1.x,2.2.x,2.3.x</docs.whitelisted.branches>
-		<configprops.inclusionPattern>cloud.aws.*|aws.*</configprops.inclusionPattern>
+		<configprops.inclusionPattern>cloud.aws.*|aws.*|spring.cloud.aws.*</configprops.inclusionPattern>
 		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
 		<generated-docs-multipage-output.dir>${project.build.directory}/generated-docs/${project.version}/reference/html</generated-docs-multipage-output.dir>
 		<generated-docs-singlepage-output.dir>${project.build.directory}/generated-docs/${project.version}/reference/htmlsingle</generated-docs-singlepage-output.dir>

docs/src/main/asciidoc/_configprops.adoc

@@ -56,5 +56,12 @@
 |cloud.aws.stack.auto | true | Enables the automatic stack name detection for the application.
 |cloud.aws.stack.enabled | true | Enables Stack integration.
 |cloud.aws.stack.name |  | The name of the manually configured stack name that will be used to retrieve the resources.
+|spring.cloud.aws.security.cognito.algorithm | RS256 | Encryption algorithm used to sign the JWK token.
+|spring.cloud.aws.security.cognito.app-client-id |  | Non-dynamic audience string to validate.
+|spring.cloud.aws.security.cognito.enabled | true | Enables Cognito integration.
+|spring.cloud.aws.security.cognito.region |  | 
+|spring.cloud.aws.security.cognito.user-pool-id |  | 
+|spring.cloud.aws.ses.enabled | true | Enables Simple Email Service integration.
+|spring.cloud.aws.ses.region |  | Overrides the default region.
 
-|===
+|===