Beta License (aws#96)

* Add LICENSE and NOTICE files for private beta * Modify `package.json` files to use `LicenseRef-LICENSE` * Change the version tag from "pre" to "beta" * Updated the PR template
jonife · Jun 13, 2018 · c96511a · c96511a
1 parent 8ef1f03
commit c96511a
Show file tree

Hide file tree

Showing 40 changed files with 55 additions and 39 deletions.
diff --git 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
@@ -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.
diff --git a/NOTICE 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.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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