Skip to content

Commit

Permalink
fix: update CDK versions for Java examples to latest (#217)
Browse files Browse the repository at this point in the history 
Updated all Java examples to the latest CDK version.
We switched to use a version range in `pom.xml`,
so we will now always use the latest versions as they are available.

Also fixed the expected CFN output for the ECS examples tests
(the updated CDK versions brought with them more taggable resources in the CFN spec).

Fixes #216
  • Loading branch information
@NGL321 @skinny85
NGL321 authored and skinny85 committed Jan 4, 2020
1 parent 22a34b5 commit ec41849
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 38 deletions.
6 changes: 3 additions & 3 deletions java/custom-resource/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,19 @@
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>core</artifactId>
<version>1.18.0</version>
<version>[1.19.0, 2)</version>
</dependency>

<!-- Respective AWS Construct Libraries -->
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>cloudformation</artifactId>
<version>1.18.0</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>lambda</artifactId>
<version>1.18.0</version>
<version>[1.19.0, 2)</version>
</dependency>

<!-- https://mvnrepository.com/artifact/junit/junit -->
Expand Down
6 changes: 3 additions & 3 deletions java/ecs/fargate-load-balanced-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>core</artifactId>
<version>1.16.0.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>

<!-- Respective AWS Construct Libraries -->
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>ecs</artifactId>
<version>1.16.0.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>ecs-patterns</artifactId>
<version>1.16.0.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>

<dependency>
Expand Down
16 changes: 14 additions & 2 deletions ...ate-load-balanced-service/src/test/resources/com/amazonaws/cdk/examples/expected.cfn.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,13 @@
"MyVpcPublicSubnet1EIP096967CB": {
"Type": "AWS::EC2::EIP",
"Properties": {
"Domain": "vpc"
"Domain": "vpc",
"Tags": [
{
"Key": "Name",
"Value": "test/MyVpc/PublicSubnet1"
}
]
}
},
"MyVpcPublicSubnet1NATGatewayAD3400C1": {
Expand Down Expand Up @@ -188,7 +194,13 @@
"MyVpcPublicSubnet2EIP8CCBA239": {
"Type": "AWS::EC2::EIP",
"Properties": {
"Domain": "vpc"
"Domain": "vpc",
"Tags": [
{
"Key": "Name",
"Value": "test/MyVpc/PublicSubnet2"
}
]
}
},
"MyVpcPublicSubnet2NATGateway91BFBEC9": {
Expand Down
14 changes: 7 additions & 7 deletions java/hello-world/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,38 +55,38 @@
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>core</artifactId>
<version>[1.17.0.DEVPREVIEW, 2)</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>autoscaling</artifactId>
<version>[1.17.0.DEVPREVIEW, 2)</version>
<version>[1.19.0, 2)</version>
</dependency>

<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>ec2</artifactId>
<version>[1.17.0.DEVPREVIEW, 2)</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>s3</artifactId>
<version>[1.17.0.DEVPREVIEW, 2)</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>sns</artifactId>
<version>[1.17.0.DEVPREVIEW, 2)</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>sqs</artifactId>
<version>[1.17.0.DEVPREVIEW, 2)</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>sns-subscriptions</artifactId>
<version>[1.17.0.DEVPREVIEW, 2)</version>
<version>[1.19.0, 2)</version>
</dependency>

<!-- https://mvnrepository.com/artifact/junit/junit -->
Expand Down
6 changes: 3 additions & 3 deletions java/lambda-cron/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,19 @@
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>core</artifactId>
<version>[1.17.0.DEVPREVIEW, 2)</version>
<version>[1.19.0, 2)</version>
</dependency>

<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>lambda</artifactId>
<version>[1.17.0.DEVPREVIEW, 2)</version>
<version>[1.19.0, 2)</version>
</dependency>

<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>events-targets</artifactId>
<version>[1.17.0.DEVPREVIEW, 2)</version>
<version>[1.19.0, 2)</version>
</dependency>

<!-- https://mvnrepository.com/artifact/junit/junit -->
Expand Down
8 changes: 4 additions & 4 deletions java/my-widget-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,22 @@
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>core</artifactId>
<version>1.18.0</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>s3</artifactId>
<version>1.18.0</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>apigateway</artifactId>
<version>1.18.0</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>iam</artifactId>
<version>1.18.0</version>
<version>[1.19.0, 2)</version>
</dependency>
<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion java/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"devDependencies": {
"aws-cdk": "1.0.0"
"aws-cdk": "*"
}
}
8 changes: 4 additions & 4 deletions java/resource-overrides/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,25 @@
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>core</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>
<!-- https://mvnrepository.com/artifact/software.amazon.awscdk/s3 -->
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>s3</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>
<!-- https://mvnrepository.com/artifact/software.amazon.awscdk/ec2 -->
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>ec2</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>
<!-- https://mvnrepository.com/artifact/software.amazon.awscdk/autoscaling -->
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>autoscaling</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>

<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
Expand Down
8 changes: 7 additions & 1 deletion ...es/src/test/resources/software/amazon/awscdk/examples/testResourceOverrides.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,13 @@
"VPCPublicSubnet1EIP6AD938E8": {
"Type": "AWS::EC2::EIP",
"Properties": {
"Domain": "vpc"
"Domain": "vpc",
"Tags": [
{
"Key": "Name",
"Value": "resource-overrides/VPC/PublicSubnet1"
}
]
}
},
"VPCPublicSubnet1NATGatewayE0556630": {
Expand Down
14 changes: 7 additions & 7 deletions java/static-site/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,40 +55,40 @@
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>core</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>

<!-- Respective AWS Construct Libraries -->

<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>cloudfront</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>route53</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>route53-targets</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>s3</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>s3-deployment</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>certificatemanager</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>

<!-- https://mvnrepository.com/artifact/junit/junit -->
Expand Down
6 changes: 3 additions & 3 deletions java/stepfunctions-job-poller/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>core</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>

<!-- Respective AWS Construct Libraries -->

<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>stepfunctions</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>
<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>stepfunctions-tasks</artifactId>
<version>1.17.1.DEVPREVIEW</version>
<version>[1.19.0, 2)</version>
</dependency>

<!-- https://mvnrepository.com/artifact/junit/junit -->
Expand Down

0 comments on commit ec41849

Please sign in to comment.