Merge branch 'main' of https://github.com/ExpediaGroup/expediagroup-j…

…ava-sdk into dependabot/maven/main/org.jetbrains.kotlinx-kotlinx-coroutines-bom-1.7.3

# Conflicts:
#	pom.xml

.github/workflows/core-verify.yml → .github/workflows/core-verify.yaml

@@ -11,13 +11,15 @@ jobs:
   verify-core:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "JDK set-up"
         uses: actions/setup-java@v3
         with:
           java-version: '11'
-          distribution: 'adopt'
-      - run: mvn verify -P github-verify-action-profile
+          distribution: 'temurin'
+      - name: verify core
+        working-directory: core
+        run: mvn verify -P github-verify-action-profile
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
         with:

.github/workflows/generator-generate.yml → .github/workflows/generator-generate.yaml

@@ -14,12 +14,12 @@ jobs:
   generate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
       - id: build
         working-directory: generator
         run: mvn clean install
@@ -32,10 +32,17 @@ jobs:
         run: |
           mvn clean install
           mvn exec:java "-Dnamespace=${{ inputs.name }}" -DsdkVersion=${{ inputs.version }} "-Dspec=./specs.yaml"
-          cd target/sdk
+      - name: install sdk
+        working-directory: generator/openapi/target/sdk
+        run: |
           mvn clean install
-          mvn dokka:dokka
       - uses: actions/upload-artifact@v3
         with:
           name: sdk
-          path: generator/openapi/target/sdk
+          path: |
+            generator/openapi/target/sdk
+            !generator/openapi/target/sdk/target
+      - uses: actions/upload-artifact@v3
+        with:
+          name: docs
+          path: generator/openapi/target/sdk/target/dokka

.github/workflows/generator-main.yaml

@@ -0,0 +1,52 @@
+name: Generate SDK - Main
+on:
+  workflow_dispatch:
+    inputs:
+      name:
+        description: 'SDK Name'
+        required: true
+      version:
+        description: 'SDK Version'
+        required: true
+      endpoint_prefix:
+        description: 'Endpoint to prepend specs paths with'
+        required: true
+        type: string
+      specs_url:
+        description: 'URL to download API specs from'
+        required: true
+        type: string
+      production_release:
+        description: 'Release to production'
+        required: true
+        type: boolean
+        default: false
+jobs:
+  download_specs:
+    uses: ./.github/workflows/generator-download-specs.yaml
+    with:
+      url: ${{ github.event.inputs.specs_url }}
+  transform_specs:
+    needs: [ download_specs ]
+    uses: ./.github/workflows/generator-transform-specs.yaml
+    with:
+      configurations: -th -te ${{ github.event.inputs.endpoint_prefix }} -tt ${{ github.event.inputs.name }}
+  generate:
+    needs: [ transform_specs ]
+    uses: ./.github/workflows/generator-generate.yaml
+    with:
+      name: ${{ github.event.inputs.name }}
+      version: ${{ github.event.inputs.version }}
+  publish_sources:
+    if: ${{ github.event.inputs.production_release == 'true' }}
+    needs: [ generate ]
+    uses: ./.github/workflows/generator-publish-sources.yaml
+    with:
+      name: ${{ github.event.inputs.name }}
+      version: ${{ github.event.inputs.version }}
+  publish_artifact:
+    needs: [ generate ]
+    uses: ./.github/workflows/generator-publish-artifact.yaml
+    secrets: inherit
+    with:
+      production_release: ${{ github.event.inputs.production_release == 'true' }}

.github/workflows/generator-publish-artifact.yml → .github/workflows/generator-publish-artifact.yaml

@@ -3,39 +3,45 @@ on:
   workflow_call:
     inputs:
       production_release:
-        description: 'Release to Production? (yes/no)'
-        type: string
+        description: 'Release to Production'
+        type: boolean
         required: true
 jobs:
   publish:
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.publish.outputs.version }}
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          name: sdk
-          path: generator/sdk
+          java-version: '11'
+          distribution: 'temurin'
       - name: "JDK set-up"
         uses: actions/setup-java@v3
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           server-id: oss-sonatype # Value of the distributionManagement/repository/id field of the pom.xml
           server-username: SONATYPE_USERNAME # env variable for username in deploy
           server-password: SONATYPE_PASSWORD # env variable for token in deploy
           # only signed artifacts will be released to maven central. this sets up things for the maven-gpg-plugin
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: GPG_PASSPHRASE # env variable for GPG private key passphrase
           settings-path: ${{ github.workspace }}
-      - name: "Release artifacts"
+      - uses: actions/download-artifact@v3
+        with:
+          name: sdk
+          path: generator/openapi/target/sdk
+      - name: Release artifacts
+        working-directory: generator/openapi/target/sdk
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }}
         run: |
-          cd generator/sdk
-          if [[ "${{github.event.inputs.production_release}}" == "yes" ]]; then
+          if [[ "${{github.event.inputs.production_release}}" == "true" ]]; then
             mvn deploy --settings $GITHUB_WORKSPACE/settings.xml -B -U -P release -DskipTests=true
           else
             VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)

.github/workflows/generator-publish-sources.yml → .github/workflows/generator-publish-sources.yaml

@@ -10,16 +10,12 @@ on:
         description: 'SDK Version'
         required: true
         type: string
-      production_release:
-        description: 'Release to Production? (yes/no)'
-        type: string
-        required: true
 
 jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/download-artifact@v3
         with:
           name: sdk
@@ -28,9 +24,12 @@ jobs:
         with:
           name: specs
           path: generator/sdk
+      - uses: actions/download-artifact@v3
+        with:
+          name: docs
+          path: generator/sdk/docs
       - name: Add generated source code
         working-directory: generator/sdk
-        if: github.event.inputs.production_release == 'yes'
         run: |
           rm -rf ../../release/"${{github.event.inputs.name}}"
           mkdir -p ../../release/"${{github.event.inputs.name}}"
@@ -40,7 +39,7 @@ jobs:
           cp ./README.md ../../release/"${{github.event.inputs.name}}"/src
           cp ./specs.yaml ../../release/"${{github.event.inputs.name}}"/src/specs.yaml
 
-          cp -r ./target/dokka ../../release/"${{github.event.inputs.name}}"/docs
+          cp -r ./docs ../../release/"${{github.event.inputs.name}}"/docs
       - name: Create PR
         uses: peter-evans/create-pull-request@v5
         with:
@@ -49,4 +48,3 @@ jobs:
           title: "chore: Publish ${{github.event.inputs.name}} [${{github.event.inputs.version}}] SDK"
           add-paths: |
             release/*
-

.github/workflows/generator-verify.yml → .github/workflows/generator-verify.yaml

@@ -10,12 +10,12 @@ jobs:
   generate-sdk:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
       - id: build-with-maven
         working-directory: generator
         run: mvn clean install -P github-generate-action-profile
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: generate-sdk
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/download-artifact@v3
         with:
           name: sdk
@@ -41,9 +41,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '11'
-          distribution: 'adopt'
-      - name: Set up core
-        run: mvn clean install
+          distribution: 'temurin'
       - name: verify generated sdk
         working-directory: generator/openapi/target/sdk
         run: mvn verify

CHANGELOG.md

@@ -1,6 +1,6 @@
-# Open World SDK Core Change Log
+# Expedia Group SDK Core Change Log
 
 All notable changes to this project will be documented in this file.
 
 ### [0.0.1] 2022.08.xx
-* Initial release
+* Initial release