Merge branch 'awslabs:master' into ml-7.12

awslabs · Oct 25, 2024 · 946f0b0 · 946f0b0
2 parents 65d0114 + 5178240
commit 946f0b0
Show file tree

Hide file tree

Showing 21 changed files with 129 additions and 1,277 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Makefile versions
-MAKEFILE_VERSION := 2.3
+MAKEFILE_VERSION := 2.3.1
 UPDATE_VERSION := make/latest
 
 # This Makefile requires Python version 3.9 or later
@@ -129,7 +129,7 @@ version_report: report_versions
 build_deps: .venv
 	( \
 		. .venv/bin/activate; \
-		pip install aws-sam-cli yq; \
+		pip install aws-sam-cli yq packaging; \
 	)
 
 deps: .venv

diff --git a/samples/sample-fargate-node-app/package-lock.json b/samples/sample-fargate-node-app/package-lock.json
diff --git a/samples/sample-fargate-node-app/package.json b/samples/sample-fargate-node-app/package.json
@@ -11,6 +11,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "ejs": "^3.1.10",
-    "express": "^4.19.2"
+    "express": "^4.21.0"
   }
 }
diff --git a/samples/sample-rdk-rules/.gitignore b/samples/sample-rdk-rules/.gitignore
diff --git a/samples/sample-rdk-rules/README.md b/samples/sample-rdk-rules/README.md
diff --git a/samples/sample-rdk-rules/buildspec.yml b/samples/sample-rdk-rules/buildspec.yml