diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b7685ea666de5..68486ce90ffd1 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1 +1,2 @@ -By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. +By submitting this pull request, I confirm that my contribution is made under +the terms of the beta license. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000..d5241f82629f7 --- /dev/null +++ b/LICENSE @@ -0,0 +1,7 @@ +These additional terms and conditions supplement the terms and conditions +contained in the AWS Customer Agreement between you and Amazon Web Services, +Inc. (the “Agreement”), and apply to your participation in the Beta Service +described below. Without limitation, Section 1.10 of the Service Terms describes +additional terms and conditions applicable to this Beta Service. IF YOU DO NOT +AGREE TO THE ADDITIONAL TERMS AND CONDITIONS IN THIS DOCUMENT, YOU MAY NOT USE +THE BETA SERVICE. \ No newline at end of file diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000000000..219fa2e56a04f --- /dev/null +++ b/NOTICE @@ -0,0 +1,3 @@ +AWS Cloud Development Kit – Beta +Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. +See LICENSE file for license terms. \ No newline at end of file diff --git a/README.md b/README.md index e0e274034bd7f..ff05c8e2b8088 100644 --- a/README.md +++ b/README.md @@ -181,3 +181,8 @@ To vend another language for the CDK (given there's jsii support for it): 5. Edit [getting-started.rst](packages/aws-cdk-docs/src/getting-started.rst) and make there there's a getting started sections and examples for the new language. + +# License + +Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. +See [LICENSE](./LICENSE) file for license terms. diff --git a/examples/package.json b/examples/package.json index 5428bc233a086..61a9d39d402f6 100644 --- a/examples/package.json +++ b/examples/package.json @@ -15,7 +15,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "aws-cdk": "^0.6.0", "pkglint": "^0.6.0" diff --git a/package.json b/package.json index d30e20ecf740f..42f7b41631512 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "ignore": true }, "scripts": { - "pkglint": "packages/pkglint/bin/pkglint -f ." + "pkglint": "tools/pkglint/bin/pkglint -f ." }, "devDependencies": { "lerna": "^2.11.0", diff --git a/packages/@aws-cdk/acm/package.json b/packages/@aws-cdk/acm/package.json index 6d35c3495fc0b..ccbf2d91be5c4 100644 --- a/packages/@aws-cdk/acm/package.json +++ b/packages/@aws-cdk/acm/package.json @@ -33,7 +33,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/applet-js/package.json b/packages/@aws-cdk/applet-js/package.json index 30ba38c9c413b..fb60f1c706b3a 100644 --- a/packages/@aws-cdk/applet-js/package.json +++ b/packages/@aws-cdk/applet-js/package.json @@ -18,7 +18,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@types/yamljs": "^0.2.0", "pkglint": "^0.6.0" diff --git a/packages/@aws-cdk/assert/package.json b/packages/@aws-cdk/assert/package.json index 6c2727aa7e8ba..8dd6c50669cc3 100644 --- a/packages/@aws-cdk/assert/package.json +++ b/packages/@aws-cdk/assert/package.json @@ -19,7 +19,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "pkglint": "^0.6.0" }, diff --git a/packages/@aws-cdk/cloudformation-diff/package.json b/packages/@aws-cdk/cloudformation-diff/package.json index ec713c9c8b4c2..f8968be2968b3 100644 --- a/packages/@aws-cdk/cloudformation-diff/package.json +++ b/packages/@aws-cdk/cloudformation-diff/package.json @@ -15,7 +15,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "pkglint": "^0.6.0" }, diff --git a/packages/@aws-cdk/cloudfront/package.json b/packages/@aws-cdk/cloudfront/package.json index 14af1927bf795..39971a1b3be30 100644 --- a/packages/@aws-cdk/cloudfront/package.json +++ b/packages/@aws-cdk/cloudfront/package.json @@ -33,7 +33,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/cloudtrail/package.json b/packages/@aws-cdk/cloudtrail/package.json index 78e1836d8b7a1..3a2adfc21211d 100644 --- a/packages/@aws-cdk/cloudtrail/package.json +++ b/packages/@aws-cdk/cloudtrail/package.json @@ -33,7 +33,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/codebuild/package.json b/packages/@aws-cdk/codebuild/package.json index b0b519f37ac96..86e90c595a000 100644 --- a/packages/@aws-cdk/codebuild/package.json +++ b/packages/@aws-cdk/codebuild/package.json @@ -34,7 +34,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "@aws-cdk/sns": "^0.6.0", diff --git a/packages/@aws-cdk/codecommit/package.json b/packages/@aws-cdk/codecommit/package.json index 204e30e52ee28..e27a82bff30c4 100644 --- a/packages/@aws-cdk/codecommit/package.json +++ b/packages/@aws-cdk/codecommit/package.json @@ -34,7 +34,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "@aws-cdk/sns": "^0.6.0", diff --git a/packages/@aws-cdk/codepipeline/package.json b/packages/@aws-cdk/codepipeline/package.json index 97c72feca2c21..37d2949ff958c 100644 --- a/packages/@aws-cdk/codepipeline/package.json +++ b/packages/@aws-cdk/codepipeline/package.json @@ -37,7 +37,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "@aws-cdk/sns": "^0.6.0", diff --git a/packages/@aws-cdk/core/package.json b/packages/@aws-cdk/core/package.json index 45ef0525b021a..898844e5214fc 100644 --- a/packages/@aws-cdk/core/package.json +++ b/packages/@aws-cdk/core/package.json @@ -35,7 +35,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "cfn2ts": "^0.6.0", "pkglint": "^0.6.0" diff --git a/packages/@aws-cdk/custom-resources/package.json b/packages/@aws-cdk/custom-resources/package.json index 59050af29c465..440a1b48cfd30 100644 --- a/packages/@aws-cdk/custom-resources/package.json +++ b/packages/@aws-cdk/custom-resources/package.json @@ -34,7 +34,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/cx-api/package.json b/packages/@aws-cdk/cx-api/package.json index cbe8c52a2aaf6..276610844ad38 100644 --- a/packages/@aws-cdk/cx-api/package.json +++ b/packages/@aws-cdk/cx-api/package.json @@ -22,7 +22,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "pkglint": "^0.6.0" }, diff --git a/packages/@aws-cdk/dynamodb/package.json b/packages/@aws-cdk/dynamodb/package.json index 4f452bc0e58bf..a19b0c52a7440 100644 --- a/packages/@aws-cdk/dynamodb/package.json +++ b/packages/@aws-cdk/dynamodb/package.json @@ -34,7 +34,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/ec2/package.json b/packages/@aws-cdk/ec2/package.json index 5132d0dfbfc80..07a0991e7b55b 100644 --- a/packages/@aws-cdk/ec2/package.json +++ b/packages/@aws-cdk/ec2/package.json @@ -36,7 +36,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/events/package.json b/packages/@aws-cdk/events/package.json index 8ce98960cc603..cbbdbc19f82b3 100644 --- a/packages/@aws-cdk/events/package.json +++ b/packages/@aws-cdk/events/package.json @@ -37,7 +37,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/iam/package.json b/packages/@aws-cdk/iam/package.json index 1efcbac1303b9..4494d558ba8d9 100644 --- a/packages/@aws-cdk/iam/package.json +++ b/packages/@aws-cdk/iam/package.json @@ -35,7 +35,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "pkglint": "^0.6.0" diff --git a/packages/@aws-cdk/kms/package.json b/packages/@aws-cdk/kms/package.json index 0cce7c4cb7b77..268cc515fbc11 100644 --- a/packages/@aws-cdk/kms/package.json +++ b/packages/@aws-cdk/kms/package.json @@ -33,7 +33,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/lambda/package.json b/packages/@aws-cdk/lambda/package.json index 9a110d106f93c..b17361ab5201e 100644 --- a/packages/@aws-cdk/lambda/package.json +++ b/packages/@aws-cdk/lambda/package.json @@ -34,7 +34,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/neptune/package.json b/packages/@aws-cdk/neptune/package.json index 0c4a663aab006..38580615263ef 100644 --- a/packages/@aws-cdk/neptune/package.json +++ b/packages/@aws-cdk/neptune/package.json @@ -33,7 +33,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "pkglint": "^0.6.0" }, diff --git a/packages/@aws-cdk/quickstarts/package.json b/packages/@aws-cdk/quickstarts/package.json index d58c53649f707..fa328b8c7b151 100644 --- a/packages/@aws-cdk/quickstarts/package.json +++ b/packages/@aws-cdk/quickstarts/package.json @@ -34,7 +34,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "pkglint": "^0.6.0" }, diff --git a/packages/@aws-cdk/rds/package.json b/packages/@aws-cdk/rds/package.json index 63d3965a04019..df9ecbdb9a43b 100644 --- a/packages/@aws-cdk/rds/package.json +++ b/packages/@aws-cdk/rds/package.json @@ -34,7 +34,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/resources/package.json b/packages/@aws-cdk/resources/package.json index 15323e8797b76..d752ca9b71e30 100644 --- a/packages/@aws-cdk/resources/package.json +++ b/packages/@aws-cdk/resources/package.json @@ -29,7 +29,7 @@ "url": "git://github.com/awslabs/aws-cdk", "type": "git" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "author": { "name": "Amazon Web Services", "url": "https://aws.amazon.com" diff --git a/packages/@aws-cdk/route53/package.json b/packages/@aws-cdk/route53/package.json index 13198591c2b84..1bc3189ab3553 100644 --- a/packages/@aws-cdk/route53/package.json +++ b/packages/@aws-cdk/route53/package.json @@ -34,7 +34,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/rtv/package.json b/packages/@aws-cdk/rtv/package.json index 1efa9a8c5ed8b..6ab850e70d97d 100644 --- a/packages/@aws-cdk/rtv/package.json +++ b/packages/@aws-cdk/rtv/package.json @@ -31,7 +31,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "pkglint": "^0.6.0" }, diff --git a/packages/@aws-cdk/s3/package.json b/packages/@aws-cdk/s3/package.json index 85e1171249be9..3082eb1d7cfbe 100644 --- a/packages/@aws-cdk/s3/package.json +++ b/packages/@aws-cdk/s3/package.json @@ -34,7 +34,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/sns/package.json b/packages/@aws-cdk/sns/package.json index 5dbcc490329a2..a05d3a70db6f2 100644 --- a/packages/@aws-cdk/sns/package.json +++ b/packages/@aws-cdk/sns/package.json @@ -34,7 +34,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/sqs/package.json b/packages/@aws-cdk/sqs/package.json index fb7dccae88f6e..8d1a66c7b023d 100644 --- a/packages/@aws-cdk/sqs/package.json +++ b/packages/@aws-cdk/sqs/package.json @@ -34,7 +34,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@aws-cdk/assert": "^0.6.0", "aws-cdk": "^0.6.0", diff --git a/packages/@aws-cdk/util/package.json b/packages/@aws-cdk/util/package.json index 01216fab606c5..39d64df30e1b3 100644 --- a/packages/@aws-cdk/util/package.json +++ b/packages/@aws-cdk/util/package.json @@ -25,7 +25,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "pkglint": "^0.6.0" }, diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json index b890e3596f246..1a07261bb8039 100644 --- a/packages/aws-cdk/package.json +++ b/packages/aws-cdk/package.json @@ -17,7 +17,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "pkglint": "^0.6.0", "@types/fs-extra": "^4.0.8", diff --git a/packages/simple-resource-bundler/package.json b/packages/simple-resource-bundler/package.json index f4a19e5431392..f79d047b8309e 100644 --- a/packages/simple-resource-bundler/package.json +++ b/packages/simple-resource-bundler/package.json @@ -17,7 +17,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "@types/fs-extra": "^4.0.8", "@types/yargs": "^8.0.3", diff --git a/tools/cfn2ts/package.json b/tools/cfn2ts/package.json index a5a9c5feb95b8..b6a787a1d2eb0 100644 --- a/tools/cfn2ts/package.json +++ b/tools/cfn2ts/package.json @@ -23,7 +23,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "dependencies": { "colors": "^1.2.1", "fast-json-patch": "^2.0.6", diff --git a/tools/pkglint/lib/rules.ts b/tools/pkglint/lib/rules.ts index 8ddd7f21de9b7..92f009c7bc05e 100644 --- a/tools/pkglint/lib/rules.ts +++ b/tools/pkglint/lib/rules.ts @@ -39,11 +39,11 @@ export class RepositoryCorrect extends ValidationRule { } /** - * The license must be Apache-2.0 + * The license must be LicenseRef-LICENSE (beta). */ -export class ApacheLicense extends ValidationRule { +export class License extends ValidationRule { public validate(pkg: PackageJson): void { - expectJSON(pkg, 'license', 'Apache-2.0'); + expectJSON(pkg, 'license', 'LicenseRef-LICENSE'); } } diff --git a/tools/pkgtools/package.json b/tools/pkgtools/package.json index f4e1abed1d953..d3eba19bb3b0d 100644 --- a/tools/pkgtools/package.json +++ b/tools/pkgtools/package.json @@ -22,7 +22,7 @@ "name": "Amazon Web Services", "url": "https://aws.amazon.com" }, - "license": "Apache-2.0", + "license": "LicenseRef-LICENSE", "devDependencies": { "pkglint": "^0.6.0" }, diff --git a/update-version.sh b/update-version.sh index c58b298b81963..a23feb9f315e6 100755 --- a/update-version.sh +++ b/update-version.sh @@ -12,4 +12,4 @@ if [ -z "${commit}" ]; then commit="$(git rev-parse --verify HEAD)" fi -exec node_modules/.bin/lerna publish --skip-git --skip-npm --repo-version=${version}-pre+${commit:0:7} --yes +exec node_modules/.bin/lerna publish --skip-git --skip-npm --repo-version=${version}-beta+${commit:0:7} --yes