Merge branch 'main' into renovate/io.mockk-mockk-1.x

Author: Mohammad-Dwairi

.github/workflows/build-and-test.yml

@@ -12,22 +12,19 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Setup JDK 8
+      - name: Setup JDK 11
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '1.8'
+          java-version: 11
+          distribution: corretto
 
       - name: Build and Test
-        run: ./gradlew clan build
+        run: ./gradlew clean build
 
   run-integration-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run Integration Tests
-        uses: ./.github/workflows/run-integration-tests.yaml
-        with:
-          branch: main
-          jdk: '1.8'
-          distribution: 'corretto'
+    uses: ./.github/workflows/run-integration-tests.yaml
+    with:
+      branch: ${{ github.ref }}
+      jdk: 11
+      distribution: corretto
 

.github/workflows/manual-release.yml

@@ -7,15 +7,15 @@ permissions:
   contents: write
 
 jobs:
-  run-examples:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run Examples
-        uses: ./.github/workflows/run-examples.yaml
-        with:
-          branch: main
-          jdk: '1.8'
-          distribution: 'corretto'
+#  run-examples:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Run Examples
+#        uses: ./.github/workflows/run-examples.yaml
+#        with:
+#          branch: main
+#          jdk: 11
+#          distribution: corretto
 
   run-integration-tests:
     runs-on: ubuntu-latest
@@ -24,23 +24,23 @@ jobs:
         uses: ./.github/workflows/run-integration-tests.yaml
         with:
           branch: main
-          jdk: '1.8'
-          distribution: 'corretto'
+          jdk: 11
+          distribution: corretto
 
   publish-to-maven-central:
     runs-on: ubuntu-latest
-    needs: [run-examples, run-integration-tests]
+    needs: [run-integration-tests]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup JDK 8
+      - name: Setup JDK 11
         uses: actions/setup-java@v4
         with:
-          distribution: 'corretto'
-          java-version: '1.8'
+          java-version: 11
+          distribution: corretto
 
       - name: Build and Test
         run: ./gradlew clean build

.github/workflows/release-sdk-snapshot.yaml

@@ -15,11 +15,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup JDK 8
+      - name: Setup JDK 11
         uses: actions/setup-java@v4
         with:
-          distribution: 'corretto'
-          java-version: '1.8'
+          java-version: 11
+          distribution: corretto
 
       - name: Clean and Build
         run: ./gradlew clean build

.github/workflows/run-integration-tests.yaml

@@ -28,6 +28,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.branch }}
+          fetch-depth: 0
 
       - name: Set up JDK
         uses: actions/setup-java@v4

buildSrc/build.gradle.kts

@@ -8,5 +8,5 @@ repositories {
 
 dependencies {
     api("org.openapitools:openapi-generator:7.11.0")
-    implementation("com.samskivert:jmustache:1.15")
+    implementation("com.samskivert:jmustache:1.16")
 }

examples/build.gradle.kts

@@ -46,6 +46,6 @@ dependencies {
 
     implementation("org.apache.logging.log4j:log4j-api:2.24.3")
     implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3")
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.19.2")
     implementation("org.apache.commons:commons-lang3:3.17.0")
 }

xap-sdk/build.gradle.kts

@@ -22,7 +22,7 @@ version = property("VERSION") as String
 dependencies {
     api("com.expediagroup:expediagroup-sdk-rest:1.0.0")
 
-    implementation(platform("com.fasterxml.jackson:jackson-bom:2.18.2"))
+    implementation(platform("com.fasterxml.jackson:jackson-bom:2.19.2"))
     implementation("com.fasterxml.jackson.core:jackson-databind")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     runtimeOnly("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")