Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update java -v and fix flbs test #217

Merged
merged 18 commits into from
Jan 4, 2020
Merged

fix: update java -v and fix flbs test #217

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
97ebda9
update java cdk versions
NGL321 Dec 30, 2019
ef0f46a
update java/ecs/flbs test expected
NGL321 Jan 2, 2020
1d1d41b
Merge branch 'master' into java-version-fix
NGL321 Jan 2, 2020
8726ccb
update java/resource-overrides expected
NGL321 Jan 2, 2020
3109090
merge from upstream
NGL321 Jan 2, 2020
76f6c2e
revise resourceoverrides test
NGL321 Jan 2, 2020
5feb829
remove ionide metadata
NGL321 Jan 2, 2020
605a1bb
Revert "revise resourceoverrides test"
NGL321 Jan 2, 2020
3e228b5
update java version to keep updated
NGL321 Jan 2, 2020
b98bd9a
update java install cdk version to latest
NGL321 Jan 2, 2020
2579915
switch travis to use openjdk8
NGL321 Jan 2, 2020
b66423d
switch travis to use openjdk13
NGL321 Jan 3, 2020
ea3cb96
rollback specifying jdk
NGL321 Jan 3, 2020
b01ff2f
add language java to travis file
NGL321 Jan 3, 2020
79f667c
Merge branch 'master' into java-version-fix
NGL321 Jan 3, 2020
3d899f2
Merge branch 'master' into java-version-fix
NGL321 Jan 4, 2020
4d7e7bb
Revert changes to .travis.yml
skinny85 Jan 4, 2020
5810911
Merge branch 'master' into java-version-fix
skinny85 Jan 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: generic
language: java
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should not be here anymore, right?

dist: bionic

services:
Expand Down
6 changes: 3 additions & 3 deletions java/custom-resource/pom.xml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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