Merge branch 'main' of https://github.com/apache/camel into NO-JIRA-a…

…dd-sparkplug-b-component
ryan-highley · Dec 1, 2023 · e09a379 · e09a379
2 parents 86be4f0 + 7e0dedb
commit e09a379
Show file tree

Hide file tree

Showing 738 changed files with 32,024 additions and 18,985 deletions.
diff --git a/.github/workflows/alternative-os-build-main.yml b/.github/workflows/alternative-os-build-main.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Set up JDK ${{ matrix.os }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17

diff --git a/.github/workflows/generate-sbom-main.yml b/.github/workflows/generate-sbom-main.yml
@@ -42,7 +42,7 @@ jobs:
       - id: install-mvnd
         uses: ./.github/actions/install-mvnd
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/pr-build-camel-3.yml b/.github/workflows/pr-build-camel-3.yml
@@ -42,7 +42,7 @@ jobs:
     - id: install-mvnd
       uses: ./.github/actions/install-mvnd
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: 11
@@ -83,7 +83,7 @@ jobs:
       - id: install-mvnd
         uses: ./.github/actions/install-mvnd
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/pr-build-camel-40x.yml b/.github/workflows/pr-build-camel-40x.yml
@@ -48,7 +48,7 @@ jobs:
       - id: install-mvnd
         uses: ./.github/actions/install-mvnd
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/pr-build-main.yml b/.github/workflows/pr-build-main.yml
@@ -48,7 +48,7 @@ jobs:
       - id: install-mvnd
         uses: ./.github/actions/install-mvnd
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
@@ -55,7 +55,7 @@ jobs:
       - id: install-packages
         uses: ./.github/actions/install-packages
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/push-build-camel-3.yml b/.github/workflows/push-build-camel-3.yml
@@ -48,7 +48,7 @@ jobs:
       - id: install-mvnd
         uses: ./.github/actions/install-mvnd
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/push-build-camel-40x.yml b/.github/workflows/push-build-camel-40x.yml
@@ -48,7 +48,7 @@ jobs:
       - id: install-mvnd
         uses: ./.github/actions/install-mvnd
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/push-build-main.yml b/.github/workflows/push-build-main.yml
@@ -48,7 +48,7 @@ jobs:
       - id: install-mvnd
         uses: ./.github/actions/install-mvnd
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}

diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
@@ -126,6 +126,11 @@
         <artifactId>camel-aws-cloudtrail</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-aws-config</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-secrets-manager</artifactId>