Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
34ef04e
chore: rename files and directories for improved structure
OmarAlJarrah Apr 20, 2025
c673e98
chore: delete old code
OmarAlJarrah Apr 20, 2025
6397e09
Revert "chore: delete old code"
OmarAlJarrah Apr 20, 2025
3ad78e6
chore: delete old code
OmarAlJarrah Apr 20, 2025
23c0239
chore: delete old code
OmarAlJarrah Apr 20, 2025
a56a07e
Merge branch 'v2-dev' into v2/delete-old-code
OmarAlJarrah Apr 20, 2025
e80a2f3
chore: initialize project gradle structure and configuration files
OmarAlJarrah Apr 21, 2025
33c6156
chore: initial generator config
OmarAlJarrah Apr 21, 2025
dd9a5e1
feat: initialize xap sdk module
OmarAlJarrah Apr 21, 2025
869d2cf
chore: generate new sdk
OmarAlJarrah Apr 21, 2025
2e8fb9c
Revert "chore: delete old code"
OmarAlJarrah Apr 21, 2025
93c6388
Revert "chore: delete old code"
OmarAlJarrah Apr 21, 2025
32004dd
chore: undelete code
OmarAlJarrah Apr 21, 2025
be222dc
Merge branch 'v2/delete-old-code' into v2/initial-gradle-setup
OmarAlJarrah Apr 21, 2025
0249634
Merge branch 'v2/initial-gradle-setup' into v2/generator-config
OmarAlJarrah Apr 21, 2025
d0a54a0
Merge branch 'v2/generator-config' into v2/initial-xap-sdk-module
OmarAlJarrah Apr 21, 2025
88249e2
Merge branch 'v2/initial-xap-sdk-module' into v2/generate-new-sdk
OmarAlJarrah Apr 21, 2025
405ba2f
chore: examples module
OmarAlJarrah Apr 21, 2025
cb24ad4
chore: add Apache License header to example scenario files
OmarAlJarrah Apr 21, 2025
34c2e6c
feat: github actions and dokka config
OmarAlJarrah Apr 21, 2025
dc2172b
chore: clean up build.gradle.kts and update mergeSpecs task
OmarAlJarrah Apr 21, 2025
3b1d370
Merge branch 'v2/initial-gradle-setup' into v2/generator-config
OmarAlJarrah Apr 21, 2025
5122213
chore: add imports for AllowedMediaTypesLambda and CodegenConstants
OmarAlJarrah Apr 22, 2025
251f90b
Merge branch 'v2/generator-config' into v2/initial-xap-sdk-module
OmarAlJarrah Apr 22, 2025
8e21f8e
Merge branch 'v2/initial-xap-sdk-module' into v2/generate-new-sdk
OmarAlJarrah Apr 22, 2025
d737609
Merge branch 'v2/generate-new-sdk' into v2/examples-module
OmarAlJarrah Apr 22, 2025
c9023c0
Merge branch 'v2/examples-module' into v2/initialize-github-actions
OmarAlJarrah Apr 22, 2025
8bb97ea
Merge branch 'v2-dev' into v2/initial-gradle-setup
OmarAlJarrah Apr 24, 2025
7b9d080
Merge branch 'v2/initial-gradle-setup' into v2/generator-config
OmarAlJarrah Apr 24, 2025
5d66eff
Merge branch 'v2/generator-config' into v2/initial-xap-sdk-module
OmarAlJarrah Apr 24, 2025
8aaca0d
chore: update path for specs.gradle.kts in build.gradle.kts
OmarAlJarrah Apr 24, 2025
10a8782
chore: update OpenAPI generator plugin version to 0.0.9-alpha
OmarAlJarrah Apr 24, 2025
73b0557
chore: refactor transformSpecs task to use Exec type and streamline c…
OmarAlJarrah Apr 24, 2025
c14ebda
chore: remove obsolete POM license properties from gradle.properties
OmarAlJarrah Apr 24, 2025
fbc53af
chore: add mavenCentral repository to plugin management
OmarAlJarrah Apr 24, 2025
245448f
Merge branch 'v2/initial-gradle-setup' into v2/generator-config
OmarAlJarrah Apr 24, 2025
217d02f
chore: update openApiGenerate task to use project.providers.exec for …
OmarAlJarrah Apr 24, 2025
05b0741
Merge branch 'v2/generator-config' into v2/initial-xap-sdk-module
OmarAlJarrah Apr 24, 2025
3d08ce4
chore: rename XAP_OBJECT_MAPPER to OBJECT_MAPPER for consistency
OmarAlJarrah Apr 24, 2025
dca26a5
Merge branch 'v2/initial-xap-sdk-module' into v2/generate-new-sdk
OmarAlJarrah Apr 24, 2025
7eff73e
Merge branch 'v2/generate-new-sdk' into v2/examples-module
OmarAlJarrah Apr 24, 2025
aa32aad
chore: add Checkstyle plugin and configuration to build.gradle.kts
OmarAlJarrah Apr 24, 2025
6b2f426
chore: update Checkstyle configuration and include examples module in…
OmarAlJarrah Apr 24, 2025
3f2c900
chore: add activity scenarios to XapSdkDemoTestRun for demonstration
OmarAlJarrah Apr 24, 2025
5e19d67
Merge branch 'v2/examples-module' into v2/initialize-github-actions
OmarAlJarrah Apr 24, 2025
c8b1dd3
chore: del spec files
OmarAlJarrah Apr 27, 2025
2a88f73
Merge branch 'v2/generator-config' into v2/initial-xap-sdk-module
OmarAlJarrah Apr 27, 2025
c3be42f
chore: remove unnecessary blank line in XapSdkDemoTestRun.java
OmarAlJarrah Apr 27, 2025
ff72988
Merge branch 'v2/examples-module' into v2/initialize-github-actions
OmarAlJarrah Apr 27, 2025
cf74946
chore: rename generate-and-publish-sdk.yaml to generate-and-publish-s…
OmarAlJarrah Apr 27, 2025
2fc4bf3
chore: update command line for spec transformer to include additional…
OmarAlJarrah Apr 27, 2025
bd97e01
chore: update inputSpec path in openApiGenerate configuration to use …
OmarAlJarrah Apr 27, 2025
1b7c1b8
Merge branch 'v2/generator-config' into v2/initial-xap-sdk-module
OmarAlJarrah Apr 27, 2025
702c50c
chore: add license plugin and header configuration to build.gradle.kts
OmarAlJarrah Apr 27, 2025
37396cc
Merge branch 'v2/generator-config' into v2/initial-xap-sdk-module
OmarAlJarrah Apr 27, 2025
dcaa50c
Merge branch 'v2/initial-xap-sdk-module' into v2/generate-new-sdk
OmarAlJarrah Apr 27, 2025
3f0a2eb
chore: add Apache License 2.0 header to multiple operation files
OmarAlJarrah Apr 27, 2025
af8631f
chore: update license plugin ID in build.gradle.kts
OmarAlJarrah Apr 27, 2025
23d4bf9
Merge branch 'v2/generator-config' into v2/initial-xap-sdk-module
OmarAlJarrah Apr 27, 2025
1763bcd
Merge branch 'v2/generate-new-sdk' into v2/examples-module
OmarAlJarrah Apr 27, 2025
5ad53bb
Merge branch 'v2/initial-xap-sdk-module' into v2/generate-new-sdk
OmarAlJarrah Apr 27, 2025
f45c553
Merge branch 'v2/generate-new-sdk' into v2/examples-module
OmarAlJarrah Apr 27, 2025
643684e
Merge branch 'v2/examples-module' into v2/initialize-github-actions
OmarAlJarrah Apr 27, 2025
727f06c
Merge branch 'v2-dev' into v2/generator-config
OmarAlJarrah Apr 27, 2025
3b89186
Merge branch 'v2/generator-config' into v2/initial-xap-sdk-module
OmarAlJarrah Apr 27, 2025
8cf5d0b
Merge branch 'v2/initial-xap-sdk-module' into v2/generate-new-sdk
OmarAlJarrah Apr 27, 2025
332f8ee
Merge branch 'v2/generate-new-sdk' into v2/examples-module
OmarAlJarrah Apr 27, 2025
d22f76f
Merge branch 'v2/examples-module' into v2/initialize-github-actions
OmarAlJarrah Apr 27, 2025
584a367
Merge branch 'v2-dev' into v2/initial-xap-sdk-module
OmarAlJarrah Apr 28, 2025
fc3a5cd
Merge branch 'v2/initial-xap-sdk-module' into v2/generate-new-sdk
OmarAlJarrah Apr 28, 2025
4460a46
Merge branch 'v2/generate-new-sdk' into v2/examples-module
OmarAlJarrah Apr 28, 2025
6d71956
Merge branch 'v2/examples-module' into v2/initialize-github-actions
OmarAlJarrah Apr 28, 2025
9b5aa97
Merge branch 'v2-dev' into v2/generate-new-sdk
OmarAlJarrah Apr 28, 2025
5748121
Merge branch 'v2/generate-new-sdk' into v2/examples-module
OmarAlJarrah Apr 28, 2025
4b3cc3e
Merge branch 'v2-dev' into v2/examples-module
OmarAlJarrah Apr 28, 2025
a5435c6
chore: format code for consistency in quick start scenario files
OmarAlJarrah Apr 28, 2025
6d03e47
Merge branch 'v2/examples-module' into v2/initialize-github-actions
OmarAlJarrah Apr 28, 2025
df00285
Merge branch 'v2-dev' into v2/initialize-github-actions
Mohammad-Dwairi May 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 37 additions & 16 deletions .github/workflows/generate-and-publish-sdk-sources.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,44 @@
name: Generate and Publish SDK Sources

on:
workflow_dispatch:
inputs:
version:
description: |
SDK Version.
E.g., 1.0.0, 1.0.1, 1.0.0-SNAPSHOT, etc.
required: true
type: string
description: "Version to publish. For snapshot releases, add `-SNAPSHOT` suffix to the version. For example, `1.0.0-SNAPSHOT`."
required: true

jobs:
generate-and-publish-sources:
uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-full-workflow.yaml@v20250304
secrets: inherit
with:
name: xap
ref: ${{ github.head_ref || github.ref_name }}
repository: 'ExpediaGroup/xap-java-sdk'
sdk_repo_ref: 'v20250304'
transformations: '--headers key --operationIdsToTags'
version: ${{ inputs.version }}
generate-and-publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: '21'

- uses: gradle/actions/setup-gradle@v4
with:
gradle-version: "8.13"

- name: Install Post Processor
working-directory: generator/src/main/resources/post-processor
run: npm ci && npm run clean && npm run compile

- run: gradle build

- name: Generate SDK
working-directory: generator
run: |
export KOTLIN_POST_PROCESS_FILE="npm run --prefix src/main/resources/post-processor process"
gradle openApiGenerate

- name: Open PR
uses: peter-evans/create-pull-request@v7
working-directory: xap-sdk
with:
token: ${{ secrets.GITHUB_PAT }}
commit-message: "chore: publishing code for sdk release $(date +'%Y%m%d%H%M%S')"
title: "chore: code update on $(date +'%Y%m%d%H%M%S')"
branch: "xap-sdk-code-update-$(date +'%Y%m%d%H%M%S')"
add-paths: .
4 changes: 2 additions & 2 deletions .github/workflows/generate-docs-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ permissions:

jobs:
deploy-reference-docs:
uses: "ExpediaGroup/expediagroup-java-sdk/.github/workflows/generate-ref-docs.yaml@main"
uses: "ExpediaGroup/expediagroup-java-sdk/.github/workflows/generate-ref-docs.yaml@feature/new-sdk-core"
with:
buildsystem: 'maven'
ref: ${{ inputs.ref != '' && inputs.ref || github.ref }}
sources_dir: 'xap-sdk'
secrets:
GITHUB_PAT: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
38 changes: 23 additions & 15 deletions .github/workflows/release-sdk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,27 @@ on:
default: ''

jobs:
integration-tests:
strategy:
matrix:
jdk: [ 8, 11, 17, 21 ]
uses: ./.github/workflows/integration-tests.yaml
secrets: inherit
with:
branch: ${{ inputs.branch }}
jdk: ${{ matrix.jdk }}
release:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.ref_name }}

release-sdk:
uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-release-sdk.yaml@v20250304
needs: [ integration-tests ]
secrets: inherit
with:
branch: ${{ inputs.branch }}
- name: Publish SDK
working-directory: xap-sdk
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }}
GPG_SECRET: ${{ secrets.GPG_PRIVATE_KEY }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
run: |
version="${{ github.event.inputs.version }}"
version="${version// /}"
if [[ "$version" == *"-SNAPSHOT" ]]; then
gradle publishSnapshot -PVERSION="${version}"
else
gradle publishToSonatype closeAndReleaseSonatypeStagingRepository -PVERSION="${version}"
fi
26 changes: 26 additions & 0 deletions xap-sdk/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id("signing")
id("maven-publish")
id("org.jetbrains.dokka") version "2.0.0"
id("com.github.hierynomus.license") version "0.16.1"
}

Expand All @@ -20,10 +21,35 @@ version = property("VERSION") as String

dependencies {
api("com.expediagroup:expediagroup-sdk-rest:0.0.6-alpha")

implementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2")
runtimeOnly("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2")

implementation("org.slf4j:slf4j-api:2.0.17")

dokkaHtmlPlugin("org.jetbrains.dokka:versioning-plugin:2.0.0")
}

dokka {
moduleName = "XAP SDK"

pluginsConfiguration {
html {
val dokkaAssets = File(project.findProperty("dokka-assets.location").toString())

customAssets.from(File(dokkaAssets, "logo-icon.svg"))
customStyleSheets.from(File(dokkaAssets, "custom-styles.css"))
}

versioning {
version = project.property("VERSION") as String

olderVersionsDir.set(File(project.findProperty("dokka-old-versions.location").toString()))

renderVersionsNavigationOnAllPages = true
}
}
}

apply("$rootDir/gradle-tasks/publish.gradle.kts")
Expand Down
1 change: 1 addition & 0 deletions xap-sdk/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ ARTIFACT_NAME=xap-sdk
DESCRIPTION=The Expedia API Platform (XAP) SDK

VERSION=2.0.0-SNAPSHOT
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled