Skip to content

Commit e6a514b

Browse files
sapessisapessi
authored
Merge pull request #143 from awslabs/core
Preparing for 1.1 release
2 parents 5f706f2 + 0a81cde commit e6a514b

File tree

39 files changed

+619
-223
lines changed

39 files changed

+619
-223
lines changed

‎archetypes/jersey/src/main/resources/archetype-resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>com.amazonaws.serverless</groupId>
2222
<artifactId>aws-serverless-java-container-jersey</artifactId>
23-
<version>1.0.1</version>
23+
<version>1.1</version>
2424
</dependency>
2525

2626
<dependency>

‎archetypes/spark/src/main/resources/archetype-resources/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
<properties>
1616
<maven.compiler.source>1.8</maven.compiler.source>
1717
<maven.compiler.target>1.8</maven.compiler.target>
18-
<jackson.version>2.9.4</jackson.version>
18+
<jackson.version>2.9.5</jackson.version>
1919
<spark.version>2.7.1</spark.version>
2020
</properties>
2121

2222
<dependencies>
2323
<dependency>
2424
<groupId>com.amazonaws.serverless</groupId>
2525
<artifactId>aws-serverless-java-container-spark</artifactId>
26-
<version>1.0.1</version>
26+
<version>1.1</version>
2727
</dependency>
2828

2929
<dependency>

‎archetypes/spring/src/main/resources/META-INF/maven/archetype-metadata.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<include>**/*.java</include>
1616
</includes>
1717
</fileSet>
18+
<fileSet>
19+
<directory>src/main/resources</directory>
20+
<includes>
21+
<include>**/*.xml</include>
22+
</includes>
23+
</fileSet>
1824
<fileSet filtered="true">
1925
<directory></directory>
2026
<includes>

‎archetypes/spring/src/main/resources/archetype-resources/pom.xml

Lines changed: 56 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
<maven.compiler.source>1.8</maven.compiler.source>
1717
<maven.compiler.target>1.8</maven.compiler.target>
1818
<spring.version>5.0.3.RELEASE</spring.version>
19+
<junit.version>4.12</junit.version>
20+
<log4j.version>2.8.2</log4j.version>
1921
</properties>
2022

2123
<dependencies>
2224
<dependency>
2325
<groupId>com.amazonaws.serverless</groupId>
2426
<artifactId>aws-serverless-java-container-spring</artifactId>
25-
<version>1.0.1</version>
27+
<version>1.1</version>
2628
</dependency>
2729

2830
<dependency>
@@ -37,10 +39,47 @@
3739
<version>${spring.version}</version>
3840
</dependency>
3941

42+
<!--
43+
the Spring Context Indexer run an annotation processor at compile time and generates
44+
a META-INF/spring.components file that Spring can use to speed up component scanning at boot time.
45+
For small applications, this doesn't make a big difference. However, for large applications with
46+
complex dependencies this may improve your cold start time significantly.
47+
-->
48+
<dependency>
49+
<groupId>org.springframework</groupId>
50+
<artifactId>spring-context-indexer</artifactId>
51+
<version>${spring.version}</version>
52+
<optional>true</optional>
53+
</dependency>
54+
55+
<dependency>
56+
<groupId>org.apache.logging.log4j</groupId>
57+
<artifactId>log4j-core</artifactId>
58+
<version>${log4j.version}</version>
59+
</dependency>
60+
61+
<dependency>
62+
<groupId>org.apache.logging.log4j</groupId>
63+
<artifactId>log4j-api</artifactId>
64+
<version>${log4j.version}</version>
65+
</dependency>
66+
67+
<dependency>
68+
<groupId>org.apache.logging.log4j</groupId>
69+
<artifactId>log4j-slf4j-impl</artifactId>
70+
<version>${log4j.version}</version>
71+
</dependency>
72+
73+
<dependency>
74+
<groupId>com.amazonaws</groupId>
75+
<artifactId>aws-lambda-java-log4j2</artifactId>
76+
<version>1.1.0</version>
77+
</dependency>
78+
4079
<dependency>
4180
<groupId>junit</groupId>
4281
<artifactId>junit</artifactId>
43-
<version>4.12</version>
82+
<version>${junit.version}</version>
4483
<scope>test</scope>
4584
</dependency>
4685

@@ -52,17 +91,29 @@
5291
<groupId>org.apache.maven.plugins</groupId>
5392
<artifactId>maven-shade-plugin</artifactId>
5493
<version>2.3</version>
55-
<configuration>
56-
<createDependencyReducedPom>false</createDependencyReducedPom>
57-
</configuration>
5894
<executions>
5995
<execution>
6096
<phase>package</phase>
6197
<goals>
6298
<goal>shade</goal>
6399
</goals>
100+
<configuration>
101+
<createDependencyReducedPom>false</createDependencyReducedPom>
102+
<transformers>
103+
<transformer
104+
implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer">
105+
</transformer>
106+
</transformers>
107+
</configuration>
64108
</execution>
65109
</executions>
110+
<dependencies>
111+
<dependency>
112+
<groupId>com.github.edwgiz</groupId>
113+
<artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
114+
<version>2.8.1</version>
115+
</dependency>
116+
</dependencies>
66117
</plugin>
67118
</plugins>
68119
</build>

‎archetypes/spring/src/main/resources/archetype-resources/src/main/resources/log4j2.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration packages="com.amazonaws.services.lambda.runtime.log4j2.LambdaAppender">
3+
<Appenders>
4+
<Lambda name="Lambda">
5+
<PatternLayout>
6+
<pattern>%d{yyyy-MM-dd HH:mm:ss} %X{AWSRequestId} %-5p %c{1}:%L - %m%n</pattern>
7+
</PatternLayout>
8+
</Lambda>
9+
</Appenders>
10+
<Loggers>
11+
<Root level="info">
12+
<AppenderRef ref="Lambda" />
13+
</Root>
14+
</Loggers>
15+
</Configuration>

‎archetypes/springboot/src/main/resources/META-INF/maven/archetype-metadata.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
<include>**/*.java</include>
1010
</includes>
1111
</fileSet>
12+
<fileSet>
13+
<directory>src/main/resources</directory>
14+
<includes>
15+
<include>**/*.properties</include>
16+
</includes>
17+
</fileSet>
1218
<fileSet filtered="true" packaged="true">
1319
<directory>src/test/java</directory>
1420
<includes>

‎archetypes/springboot/src/main/resources/archetype-resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>com.amazonaws.serverless</groupId>
2929
<artifactId>aws-serverless-java-container-spring</artifactId>
30-
<version>1.0.1</version>
30+
<version>1.1</version>
3131
</dependency>
3232

3333
<dependency>

‎archetypes/springboot/src/main/resources/archetype-resources/src/main/java/Application.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
@ComponentScan(basePackages = "${groupId}.controller")
2727
public class Application extends SpringBootServletInitializer {
2828

29-
// silence console logging
30-
@Value("${${logging}}")
31-
String message = "";
32-
3329
/*
3430
* Create required HandlerMapping, to avoid several default HandlerMapping instances being created
3531
*/

‎archetypes/springboot/src/main/resources/archetype-resources/src/main/resources/application.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Reduce logging level to make sure the application works with SAM local
2+
# https://github.com/awslabs/aws-serverless-java-container/issues/134
3+
logging.level.root=WARN

‎aws-serverless-java-container-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</parent>
1616

1717
<properties>
18-
<jackson.version>2.9.4</jackson.version>
18+
<jackson.version>2.9.5</jackson.version>
1919
<jaxrs.version>2.1</jaxrs.version>
2020
<servlet.version>3.1.0</servlet.version>
2121
</properties>

0 commit comments

Comments
 (0)