diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b908cc..84096c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,16 +3,28 @@ name: CI on: [push, pull_request] jobs: - build: + dependency-submission: runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v7 # https://github.com/actions/checkout + - name: Setup Java + uses: actions/setup-java@v6 # https://github.com/actions/setup-java + with: + distribution: 'temurin' + java-version: 17 + - name: Generate and submit dependency graph + uses: gradle/actions/dependency-submission@v6 # https://github.com/gradle/actions + build: + runs-on: ubuntu-latest steps: - name: Checkout the repository - uses: actions/checkout@v4 # https://github.com/actions/checkout + uses: actions/checkout@v7 # https://github.com/actions/checkout - name: Validate the Gradle wrapper - uses: gradle/wrapper-validation-action@v2 # https://github.com/gradle/wrapper-validation-action + uses: gradle/actions/wrapper-validation@v6 # https://github.com/gradle/actions - name: Set up JDK 17 - uses: actions/setup-java@v5 # https://github.com/actions/setup-java + uses: actions/setup-java@v6 # https://github.com/actions/setup-java with: distribution: temurin java-version: 17 @@ -21,7 +33,7 @@ jobs: export LANG=C.UTF-8 locale ./gradlew --version - - name: Build with Gradle (this action caches various parts as well) - uses: gradle/gradle-build-action@v3 # https://github.com/gradle/gradle-build-action - with: - arguments: check + - name: Setup Gradle (this action caches various parts as well) + uses: gradle/actions/setup-gradle@v6 # https://github.com/gradle/actions + - name: Build with Gradle + run: ./gradlew check diff --git a/README.md b/README.md index 43c361d..c5b6ce8 100644 --- a/README.md +++ b/README.md @@ -65,10 +65,23 @@ You can specify the version of CXF used for code generation like this: ```kotlin wsdl2java { - cxfVersion.set("4.1.8") + cxfVersion.set("3.6.12") } ``` +Note that: +- CXF version 4.2.x: Jakarta EE 11 (jakarta namespace). JDK 17 baseline. +- CXF version 4.1.x: Jakarta EE 10 (jakarta namespace). JDK 17 baseline. +- CXF version 4.0.x: Jakarta EE 9.1 (jakarta namespace). JDK 11 baseline. +- CXF version 3.6.x: Java EE 8 (javax namespace). JDK 11 baseline. +- CXF version 3.5.x: Java EE 8 (javax namespace). JDK 8 baseline. + +If you use Spring Boot, you should match the alignment to Jakarta EE: +- Spring Boot version 4.0-4.2: Jakarta EE 11 +- Spring Boot version 3.2-3.5 Jakarta EE 9/10 +- Spring Boot version 3.0-3.1: Jakarta EE 9 (EE 10 supported) +- Spring Boot version 2.0-2.7: Java EE 7/8 + ### Configure included WSDL files By default, the plugin will find all WSDL files in the `wsdlDir` directory, which defaults to `src/main/resources`. diff --git a/src/main/kotlin/com/github/bjornvester/wsdl2java/Wsdl2JavaTask.kt b/src/main/kotlin/com/github/bjornvester/wsdl2java/Wsdl2JavaTask.kt index b81bdde..8804dfb 100644 --- a/src/main/kotlin/com/github/bjornvester/wsdl2java/Wsdl2JavaTask.kt +++ b/src/main/kotlin/com/github/bjornvester/wsdl2java/Wsdl2JavaTask.kt @@ -109,7 +109,7 @@ abstract class Wsdl2JavaTask @Inject constructor( if (includesWithOptions.isPresent && includesWithOptions.get().isNotEmpty()) { includesWithOptions.get().forEach { (includePattern, includeOptions) -> - addWsdlToArgs(listOf(includePattern), defaultArgs + includeOptions as List, wsdlToArgs) + addWsdlToArgs(listOf(includePattern), defaultArgs + includeOptions.map { it.toString() }, wsdlToArgs) } } else { addWsdlToArgs(includes.get(), defaultArgs, wsdlToArgs)