Merge remote-tracking branch 'upstream/master'

Author: dfangl

.github/dependabot.yml

@@ -4,3 +4,9 @@ updates:
     directory: "/"
     schedule: 
       interval: "weekly"
+
+  - package-ecosystem: "maven"
+    directory: "/"
+    open-pull-requests-limit: 4
+    schedule:
+      interval: "daily"

.github/workflows/privileged-run.yml

@@ -1,19 +1,21 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+# This workflow will trigger on pushes, pull requests (to master branch), and manually from the GitHub Actions tab (when requested)
+# sample_run uses matrix to create 12 unique combinations of operating systems and python versions
+# each of the 12 runs download the jars needed to run the KCL, run the sample_kinesis_wordputter.py, and use a timeout command to run the sample_kclpy_app.py
+# auto_merge uses GitHub events to check if dependabot is the pull requester, and if the request fits the criteria the PR is automatically merged
 
-name: Build Intensive
+name: Sample Run and Dependabot Auto-merge
 on:
   push:
     branches: [ master ]
-  pull_request_target:
-    branches: [ master ]
 
 permissions:
   id-token: write
-  contents: read
+  contents: write
+  pull-requests: write
+  statuses: write
 
 jobs:
-  build-intensive:
+  sample-run:
     timeout-minutes: 8
     runs-on: ${{ matrix.os }}
     defaults:
@@ -23,7 +25,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.8", "3.9", "3.10", "3.11" ]
+        python-version: [ "3.9", "3.10", "3.11" ]
+        jdk-version: [ "8", "11", "17", "21", "24" ]
         os: [ ubuntu-latest, macOS-latest, windows-latest ]
 
     steps:
@@ -34,13 +37,13 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-region: us-east-1
-          role-to-assume: arn:aws:iam::751999266872:role/GitHubWorkflows
-          role-session-name: myGitHubActions
+          role-to-assume: arn:aws:iam::751999266872:role/GitHubPython
+          role-session-name: myGitHubActionsPython
 
-      - name: Set up JDK 8
+      - name: Set up JDK ${{ matrix.jdk-version }}
         uses: actions/setup-java@v4
         with:
-          java-version: '8'
+          java-version: ${{ matrix.jdk-version }}
           distribution: 'corretto'
 
       - name: Set up Python ${{ matrix.python-version }}
@@ -64,6 +67,8 @@ jobs:
           python -m build
           python setup.py download_jars
           python setup.py install
+        env:
+          KCL_MVN_REPO_SEARCH_URL: https://repo1.maven.org/maven2/
 
       - name: Put words to sample stream
         run: |
@@ -79,3 +84,29 @@ jobs:
         run: |
           brew install coreutils
           gtimeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi
+
+  auto-merge-dependabot:
+    needs: [sample-run]
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]' && github.event.pull_request.user.login == 'dependabot[bot]'
+    steps:
+      - name: Fetch Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          alert-lookup: true
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+#      - name: Approve PR
+#        if: steps.metadata.outputs.update-type != 'version-update:semver-major'
+#        run: gh pr review --approve "$PR_URL"
+#        env:
+#          PR_URL: ${{github.event.pull_request.html_url}}
+#          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+#      - name: Enable auto-merge for Dependabot PRs
+#        if: steps.metadata.outputs.update-type != 'version-update:semver-major'
+#        run: gh pr merge --auto --merge "$PR_URL"
+#        env:
+#          PR_URL: ${{github.event.pull_request.html_url}}
+#          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

README.md

@@ -155,6 +155,15 @@ all languages.
 * The [Amazon Kinesis Forum][kinesis-forum]
 
 ## Release Notes
+### Release 3.0.5 (June 6, 2025)
+* [#274](https://github.com/awslabs/amazon-kinesis-client-python/pull/274) Add ability to set mvn repo search URL with a unique ENV Variable
+* [#279](https://github.com/awslabs/amazon-kinesis-client-python/pull/279) Create sample KCL build tests
+* [#280](https://github.com/awslabs/amazon-kinesis-client-python/pull/280) Add dependabot auto-merge and workflow dispatch
+* [#283](https://github.com/awslabs/amazon-kinesis-client-python/pull/283) Update AWS credentials used for running sample workflow
+* [#287](https://github.com/awslabs/amazon-kinesis-client-python/pull/287) Upgrade org.checkerframework:checker-qual from 2.5.2 to 3.49.4
+* [#285](https://github.com/awslabs/amazon-kinesis-client-python/pull/285) Upgrade netty.version from 4.1.118.Final to 4.2.1.Final
+* [#284](https://github.com/awslabs/amazon-kinesis-client-python/pull/284) Upgrade commons-beanutils:commons-beanutils from 1.9.4 to 1.11.0
+
 ### Release 3.0.3 (March 25, 2025)
 * Downgrade logback from 1.5.16 to 1.3.15 to maintain JDK 8 compatability
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <properties>
         <awssdk.version>2.25.64</awssdk.version>
-        <kcl.version>3.0.2</kcl.version>
+        <kcl.version>3.0.3</kcl.version>
         <netty.version>4.1.118.Final</netty.version>
         <netty-reactive.version>2.0.6</netty-reactive.version>
         <fasterxml-jackson.version>2.13.5</fasterxml-jackson.version>
@@ -260,7 +260,7 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>2.5.2</version>
+            <version>3.49.4</version>
         </dependency>
         <dependency>
             <groupId>com.google.errorprone</groupId>
@@ -391,7 +391,7 @@
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
-            <version>1.9.4</version>
+            <version>1.11.0</version>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>

setup.py

@@ -42,7 +42,7 @@
 
 PACKAGE_NAME = 'amazon_kclpy'
 JAR_DIRECTORY = os.path.join(PACKAGE_NAME, 'jars')
-PACKAGE_VERSION = '3.0.3'
+PACKAGE_VERSION = '3.0.5'
 PYTHON_REQUIREMENTS = [
     'boto3',
     # argparse is part of python2.7 but must be declared for python2.6
@@ -114,8 +114,9 @@ def package_url(self, group_id, artifact_id, version):
         #
         # Sample url:
         # https://search.maven.org/remotecontent?filepath=org/apache/httpcomponents/httpclient/4.2/httpclient-4.2.jar
+        # https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.2/httpclient-4.2.jar
         #
-        prefix = os.getenv("KCL_MVN_REPO_SEARCH_URL", 'https://search.maven.org/remotecontent?filepath=')
+        prefix = os.getenv("KCL_MVN_REPO_SEARCH_URL", 'https://repo1.maven.org/maven2/')
         return '{prefix}{path}/{artifact_id}/{version}/{dest}'.format(
                                         prefix=prefix,
                                         path='/'.join(group_id.split('.')),