Skip to content

Commit 1e00371

Browse files
committed
Bump of versions in archetypes and changed API Gateway endpoints to be regional
1 parent ddebe84 commit 1e00371

File tree

12 files changed

+48
-12
lines changed

12 files changed

+48
-12
lines changed

aws-serverless-jersey-archetype/src/main/resources/archetype-resources/pom.xml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,33 @@
2020
<dependency>
2121
<groupId>com.amazonaws.serverless</groupId>
2222
<artifactId>aws-serverless-java-container-jersey</artifactId>
23-
<version>1.1.4</version>
23+
<version>1.2</version>
2424
</dependency>
2525

2626
<dependency>
2727
<groupId>org.glassfish.jersey.media</groupId>
2828
<artifactId>jersey-media-json-jackson</artifactId>
2929
<version>${jersey.version}</version>
30+
<exclusions>
31+
<exclusion>
32+
<groupId>com.fasterxml.jackson.core</groupId>
33+
<artifactId>jackson-annotations</artifactId>
34+
</exclusion>
35+
<exclusion>
36+
<groupId>com.fasterxml.jackson.core</groupId>
37+
<artifactId>jackson-databind</artifactId>
38+
</exclusion>
39+
<exclusion>
40+
<groupId>com.fasterxml.jackson.core</groupId>
41+
<artifactId>jackson-core</artifactId>
42+
</exclusion>
43+
</exclusions>
44+
</dependency>
45+
46+
<dependency>
47+
<groupId>com.fasterxml.jackson.core</groupId>
48+
<artifactId>jackson-databind</artifactId>
49+
<version>2.9.7</version>
3050
</dependency>
3151

3252
<dependency>

aws-serverless-jersey-archetype/src/main/resources/archetype-resources/sam.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
AWSTemplateFormatVersion: '2010-09-09'
2424
Transform: AWS::Serverless-2016-10-31
2525
Description: AWS Serverless Jersey API - ${groupId}::${artifactId}
26+
Globals:
27+
Api:
28+
EndpointConfiguration: REGIONAL
29+
2630
Resources:
2731
${resourceName}Function:
2832
Type: AWS::Serverless::Function

aws-serverless-jersey-archetype/src/main/resources/archetype-resources/src/test/java/StreamLambdaHandlerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public void ping_streamRequest_respondsWithHello() {
5151
assertTrue(response.getBody().contains("pong"));
5252
assertTrue(response.getBody().contains("Hello, World!"));
5353

54-
assertTrue(response.getHeaders().containsKey(HttpHeaders.CONTENT_TYPE));
55-
assertTrue(response.getHeaders().get(HttpHeaders.CONTENT_TYPE).startsWith(MediaType.APPLICATION_JSON));
54+
assertTrue(response.getMultiValueHeaders().containsKey(HttpHeaders.CONTENT_TYPE));
55+
assertTrue(response.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE).startsWith(MediaType.APPLICATION_JSON));
5656
}
5757

5858
@Test

aws-serverless-spark-archetype/src/main/resources/archetype-resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>com.amazonaws.serverless</groupId>
2525
<artifactId>aws-serverless-java-container-spark</artifactId>
26-
<version>1.1.4</version>
26+
<version>1.2</version>
2727
</dependency>
2828

2929
<dependency>

aws-serverless-spark-archetype/src/main/resources/archetype-resources/sam.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
AWSTemplateFormatVersion: '2010-09-09'
2424
Transform: AWS::Serverless-2016-10-31
2525
Description: AWS Serverless Spark API - ${groupId}::${artifactId}
26+
Globals:
27+
Api:
28+
EndpointConfiguration: REGIONAL
29+
2630
Resources:
2731
${resourceName}Function:
2832
Type: AWS::Serverless::Function

aws-serverless-spark-archetype/src/main/resources/archetype-resources/src/test/java/StreamLambdaHandlerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public void ping_streamRequest_respondsWithHello() {
5151
assertTrue(response.getBody().contains("pong"));
5252
assertTrue(response.getBody().contains("Hello, World!"));
5353

54-
assertTrue(response.getHeaders().containsKey(HttpHeaders.CONTENT_TYPE));
55-
assertTrue(response.getHeaders().get(HttpHeaders.CONTENT_TYPE).startsWith(MediaType.APPLICATION_JSON));
54+
assertTrue(response.getMultiValueHeaders().containsKey(HttpHeaders.CONTENT_TYPE));
55+
assertTrue(response.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE).startsWith(MediaType.APPLICATION_JSON));
5656
}
5757

5858
@Test

aws-serverless-spring-archetype/src/main/resources/archetype-resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>com.amazonaws.serverless</groupId>
2626
<artifactId>aws-serverless-java-container-spring</artifactId>
27-
<version>1.1.4</version>
27+
<version>1.2</version>
2828
</dependency>
2929

3030
<dependency>

aws-serverless-spring-archetype/src/main/resources/archetype-resources/sam.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
AWSTemplateFormatVersion: '2010-09-09'
2424
Transform: AWS::Serverless-2016-10-31
2525
Description: AWS Serverless Spring API - ${groupId}::${artifactId}
26+
Globals:
27+
Api:
28+
EndpointConfiguration: REGIONAL
29+
2630
Resources:
2731
${resourceName}Function:
2832
Type: AWS::Serverless::Function

aws-serverless-spring-archetype/src/main/resources/archetype-resources/src/test/java/StreamLambdaHandlerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public void ping_streamRequest_respondsWithHello() {
5151
assertTrue(response.getBody().contains("pong"));
5252
assertTrue(response.getBody().contains("Hello, World!"));
5353

54-
assertTrue(response.getHeaders().containsKey(HttpHeaders.CONTENT_TYPE));
55-
assertTrue(response.getHeaders().get(HttpHeaders.CONTENT_TYPE).startsWith(MediaType.APPLICATION_JSON));
54+
assertTrue(response.getMultiValueHeaders().containsKey(HttpHeaders.CONTENT_TYPE));
55+
assertTrue(response.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE).startsWith(MediaType.APPLICATION_JSON));
5656
}
5757

5858
@Test

aws-serverless-springboot-archetype/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.1.4</version>
30+
<version>1.2</version>
3131
</dependency>
3232

3333
<dependency>

0 commit comments

Comments
 (0)