Merge pull request #2088 from atlanhq/dependencies

Bump dependencies

Author: cmgrote

.github/workflows/custom-package-container.yml

@@ -14,13 +14,19 @@ on:
       version:
         required: true
         type: string
+      branch:
+        required: false
+        type: string
+        default: ''
 
 jobs:
   custom-package-container:
     runs-on: ubuntu-latest
     name: "${{inputs.package_name}} container"
     steps:
       - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
+        with:
+          ref: ${{ inputs.branch != '' && inputs.branch || github.ref }}
       - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435  # v3.11.1
       - name: Log in to container registry
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef  # v3.6.0
@@ -39,13 +45,24 @@ jobs:
         with:
           name: "${{inputs.package_name}}-arm64"
           path: ./containers/custom-package/arm64/assembly
+      - name: Determine image tags
+        id: tags
+        run: |
+          if [ -n "${{ inputs.branch }}" ]; then
+            # For manual runs with branch specified, use version and branch name (sanitized)
+            BRANCH_NAME=$(echo "${{ inputs.branch }}" | sed 's/[^a-zA-Z0-9._-]/-/g')
+            echo "tags=ghcr.io/atlanhq/csa-${{inputs.package_name}}:${{inputs.version}}-${BRANCH_NAME}" >> $GITHUB_OUTPUT
+          else
+            # For main branch pushes, use version and latest
+            echo "tags=ghcr.io/atlanhq/csa-${{inputs.package_name}}:${{inputs.version}},ghcr.io/atlanhq/csa-${{inputs.package_name}}:latest" >> $GITHUB_OUTPUT
+          fi
       - name: Build and publish container image
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83  # v6.18.0
         with:
           build-args: |
             VERSION=${{inputs.version}}
             PKG_NAME=${{inputs.package_name}}
           push: true
-          tags: ghcr.io/atlanhq/csa-${{inputs.package_name}}:${{inputs.version}}, ghcr.io/atlanhq/csa-${{inputs.package_name}}:latest
+          tags: ${{ steps.tags.outputs.tags }}
           context: ./containers/custom-package
           platforms: linux/amd64,linux/arm64

.github/workflows/merge.yml

@@ -7,6 +7,12 @@ permissions:
 on:
   push:
     branches: [main]
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to build'
+        required: true
+        type: string
 
 jobs:
   merge-build:
@@ -24,6 +30,8 @@ jobs:
       version: ${{ steps.get_version.outputs.version }}
     steps:
       - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
+        with:
+          ref: ${{ github.event.inputs.branch || github.ref }}
       - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165  # v5.0.0
         with:
           java-version: 21
@@ -129,6 +137,7 @@ jobs:
           name: lambda-layer-${{ matrix.arch }}
           path: sdk/build/distributions/sdk-*.zip
   publish-docs:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     permissions:
       contents: write
     runs-on: ubuntu-latest
@@ -151,6 +160,7 @@ jobs:
           GRGIT_PASS: ${{ secrets.GITHUB_TOKEN }}
           NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
   publish-snapshot:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     name: "Snapshot"
     steps:
@@ -185,6 +195,8 @@ jobs:
     name: "Base image"
     steps:
       - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
+        with:
+          ref: ${{ github.event.inputs.branch || github.ref }}
       - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435  # v3.11.1
       - name: Log in to container registry
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef  # v3.6.0
@@ -211,12 +223,22 @@ jobs:
         with:
           name: package-toolkit-runtime-arm64
           path: ./containers/base/arm64/assembly
+      - name: Determine image tags
+        id: tags
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            # For manual runs, use version and branch name (sanitized)
+            BRANCH_NAME=$(echo "${{ github.event.inputs.branch }}" | sed 's/[^a-zA-Z0-9._-]/-/g')
+            echo "tags=ghcr.io/atlanhq/atlan-java:${{ needs.merge-build.outputs.version }}-${BRANCH_NAME}" >> $GITHUB_OUTPUT
+          else
+            # For main branch pushes, use version and latest
+            echo "tags=ghcr.io/atlanhq/atlan-java:${{ needs.merge-build.outputs.version }},ghcr.io/atlanhq/atlan-java:latest" >> $GITHUB_OUTPUT
+          fi
       - name: Build and publish container image
-        if: ${{ github.ref == 'refs/heads/main'}}
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83  # v6.18.0
         with:
           push: true
-          tags: ghcr.io/atlanhq/atlan-java:${{ needs.merge-build.outputs.version }}, ghcr.io/atlanhq/atlan-java:latest
+          tags: ${{ steps.tags.outputs.tags }}
           context: ./containers/base
           platforms: linux/amd64,linux/arm64
   custom-package-images:
@@ -249,3 +271,4 @@ jobs:
     with:
       package_name: ${{ matrix.package_name }}
       version: ${{ needs.merge-build.outputs.version }}
+      branch: ${{ github.event.inputs.branch || '' }}

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
 jackson = "2.20.1"
 slf4j = "2.0.17"
-elasticsearch = "9.2.0"
+elasticsearch = "9.2.1"
 freemarker = "2.3.34"
 classgraph = "4.8.184"
 testng = "7.11.0"
 log4j = "2.25.2"
 wiremock = "3.13.2"
 jnanoid = "2.0.0"
-awssdk = "2.38.7"
-gcs = "26.71.0"
+awssdk = "2.39.1"
+gcs = "26.72.0"
 system-stubs = "2.1.8"
 fastcsv = "4.1.0"
 poi = "5.5.0"
@@ -36,8 +36,8 @@ jetty = "12.1.4"
 netty = "4.2.7.Final"
 rhino = "1.8.0"
 nimbus = "10.6"
-otel = "1.55.0"
-otel-instrumentation = "2.21.0-alpha"
+otel = "1.56.0"
+otel-instrumentation = "2.22.0-alpha"
 
 [libraries]
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }