Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 20 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
15 changes: 14 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String>, wsdlToArgs)
addWsdlToArgs(listOf(includePattern), defaultArgs + includeOptions.map { it.toString() }, wsdlToArgs)
}
} else {
addWsdlToArgs(includes.get(), defaultArgs, wsdlToArgs)
Expand Down
Loading