Merge branch 'awsdocs:main' into dotnet-controltower

rlhagerm · web-flow · commit 1be4d10b103c · 2025-06-26T09:18:30.000-05:00
diff --git a/.tools/readmes/requirements_freeze.txt b/.tools/readmes/requirements_freeze.txt
@@ -28,5 +28,5 @@ shellingham==1.5.4
 typer==0.15.1
 types-PyYAML==6.0.12.12
 typing_extensions==4.12.2
-urllib3==2.3.0
+urllib3==2.5.0
 yamale==4.0.4
diff --git a/.tools/test/stacks/plugin/typescript/package-lock.json b/.tools/test/stacks/plugin/typescript/package-lock.json
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -47,6 +47,7 @@ without needing to create a fork.
 as [DRY](https://en.wikipedia.org/wiki/Don%27t_repeat_yourself) and [SOLID](https://en.wikipedia.org/wiki/SOLID) where possible.
 2. Carefully read the pull request template and follow it closely.
 3. Don't include AWS account identifiers or secret keys in your examples.
+4. To conform to licensing expectation, please follow instructions on our [Licensing guidelines wiki page](https://github.com/awsdocs/aws-doc-sdk-examples/wiki/Licensing-guidelines).
 
 ---
 
diff --git a/README.md b/README.md
@@ -100,3 +100,8 @@ Copyright © Amazon Web Services, Inc. or its affiliates. All rights reserved.
 Except where otherwise noted, all examples in this collection are licensed under the [Apache
 license, version 2.0](https://www.apache.org/licenses/LICENSE-2.0) (the "License"). The full
 license text is provided in the `LICENSE` file accompanying this repository.
+
+Please include the following licensing text as a comment at top of all possible files:
+
+*Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0*
diff --git a/python/example_code/bedrock-agent-runtime/requirements.txt b/python/example_code/bedrock-agent-runtime/requirements.txt
@@ -10,4 +10,4 @@ pytest-asyncio==0.21.1
 python-dateutil==2.8.2
 s3transfer==0.8.2
 six==1.16.0
-urllib3==2.0.7
+urllib3==2.5.0
