diff --git a/archetypes/jersey/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey/src/main/resources/archetype-resources/pom.xml index 57479e343..5a9a2bcbc 100644 --- a/archetypes/jersey/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/jersey/src/main/resources/archetype-resources/pom.xml @@ -20,7 +20,7 @@ com.amazonaws.serverless aws-serverless-java-container-jersey - 1.0.1 + 1.1 diff --git a/archetypes/spark/src/main/resources/archetype-resources/pom.xml b/archetypes/spark/src/main/resources/archetype-resources/pom.xml index 5bfcfdfdc..04eb1b39d 100644 --- a/archetypes/spark/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/spark/src/main/resources/archetype-resources/pom.xml @@ -15,7 +15,7 @@ 1.8 1.8 - 2.9.4 + 2.9.5 2.7.1 @@ -23,7 +23,7 @@ com.amazonaws.serverless aws-serverless-java-container-spark - 1.0.1 + 1.1 diff --git a/archetypes/spring/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/spring/src/main/resources/META-INF/maven/archetype-metadata.xml index a6d717260..ab816387b 100644 --- a/archetypes/spring/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/spring/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -15,6 +15,12 @@ **/*.java + + src/main/resources + + **/*.xml + + diff --git a/archetypes/spring/src/main/resources/archetype-resources/pom.xml b/archetypes/spring/src/main/resources/archetype-resources/pom.xml index 9d0ab8c7a..c7da99e7e 100644 --- a/archetypes/spring/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/spring/src/main/resources/archetype-resources/pom.xml @@ -16,13 +16,15 @@ 1.8 1.8 5.0.3.RELEASE + 4.12 + 2.8.2 com.amazonaws.serverless aws-serverless-java-container-spring - 1.0.1 + 1.1 @@ -37,10 +39,47 @@ ${spring.version} + + + org.springframework + spring-context-indexer + ${spring.version} + true + + + + org.apache.logging.log4j + log4j-core + ${log4j.version} + + + + org.apache.logging.log4j + log4j-api + ${log4j.version} + + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} + + + + com.amazonaws + aws-lambda-java-log4j2 + 1.1.0 + + junit junit - 4.12 + ${junit.version} test @@ -52,17 +91,29 @@ org.apache.maven.plugins maven-shade-plugin 2.3 - - false - package shade + + false + + + + + + + + com.github.edwgiz + maven-shade-plugin.log4j2-cachefile-transformer + 2.8.1 + + diff --git a/archetypes/spring/src/main/resources/archetype-resources/src/main/resources/log4j2.xml b/archetypes/spring/src/main/resources/archetype-resources/src/main/resources/log4j2.xml new file mode 100644 index 000000000..fada3aded --- /dev/null +++ b/archetypes/spring/src/main/resources/archetype-resources/src/main/resources/log4j2.xml @@ -0,0 +1,15 @@ + + + + + + %d{yyyy-MM-dd HH:mm:ss} %X{AWSRequestId} %-5p %c{1}:%L - %m%n + + + + + + + + + \ No newline at end of file diff --git a/archetypes/springboot/src/main/resources/archetype-resources/pom.xml b/archetypes/springboot/src/main/resources/archetype-resources/pom.xml index 1f01ebbf7..183512173 100644 --- a/archetypes/springboot/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/springboot/src/main/resources/archetype-resources/pom.xml @@ -27,7 +27,7 @@ com.amazonaws.serverless aws-serverless-java-container-spring - 1.0.1 + 1.1 diff --git a/archetypes/springboot/src/main/resources/archetype-resources/src/main/resources/application.properties b/archetypes/springboot/src/main/resources/archetype-resources/src/main/resources/application.properties new file mode 100644 index 000000000..ec1cb9792 --- /dev/null +++ b/archetypes/springboot/src/main/resources/archetype-resources/src/main/resources/application.properties @@ -0,0 +1,3 @@ +# Reduce logging level to make sure the application works with SAM local +# https://github.com/awslabs/aws-serverless-java-container/issues/134 +logging.level.root=WARN \ No newline at end of file