nilsmagnus · silverwind85 · May 1, 2021 · May 1, 2021 · May 1, 2021 · May 1, 2021
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,4 @@ repo/
 consumer/generated*
 out
 .DS_Store
+./gradle.properties
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Nils Larsgård, nilsmagnus@gmail.com
+Copyright (c) 2021 Peter Vermes, peter.vermes@yupzip.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,35 +1,37 @@
-### Deprecation notice
-
-This plugin is no longer maintained by its creator since I dont have any interest in using this plugin anymore and find no pleasure in maintaining it for free/fun. Please fork it and use it as you like. The plugin is not published to any relevant plugin-portals. 
+### Note
+
+* Version 4.0.0
+  * Plugin built with Gradle 9.4.1
+  * JDK 17+ required
+  * CXF Tool version 4.1.2 (cxfVersion property removed)
+  * CXF Plugin version 4.1.2 (cxfPlugin property removed)
+  * CXF Tools version 4.2.0
+  * JAXB2 naming prefix version 2.0 (org.jvnet.jaxb2_commons:jaxb2-namespace-prefix)
+  * JAXB2 basic plugins version 3.0.0 (org.codes.rafael.jaxb2_commons:jaxb2-basics)
+  * wsdlDir property is now a string
+  * generatedWsdlDir property is now a string
+  * inclusion of generated classes in source to be configured in build.gradle, e.g.:
+    ```groovy
+    sourceSets.main.java.srcDirs "src/generated-sources/java"
+    ```
+* Version 3.0.1 - adaption for Gradle 9
+* Version 3.0.0 contains a breaking change: 'cxfVersion' and 'cxfPluginVersion' properties are now required.
+* This plugin is forked from deprecated nilsmagnus/wsdl2java to make the plugin compatible with Gradle 7+. 
 
 wsdl2java gradle plugin
 =========
-
-[![Known Vulnerabilities](https://snyk.io/test/github/nilsmagnus/wsdl2java/badge.svg?targetFile=build.gradle)](https://snyk.io/test/github/nilsmagnus/wsdl2java?targetFile=build.gradle)
-[![Build Status](https://cloud.drone.io/api/badges/nilsmagnus/wsdl2java/status.svg)](https://cloud.drone.io/nilsmagnus/wsdl2java)
-[ ![Download](https://api.bintray.com/packages/nilsmagnus/maven/wsdl2java/images/download.svg?version=0.12) ](https://bintray.com/nilsmagnus/maven/wsdl2java/0.12/link)
-
-Gradle plugin for generating java from wsdl, using cxf under the hood and the same options as the maven wsdl-2-java plugin from apache-cxf.
-
-The plugin binaries are downloadable from bintray: https://bintray.com/nilsmagnus/maven/wsdl2java/
+Gradle plugin for generating java classes from wsdl using CXF under the hood.
 
 ### Issues
-If you have any issues with the plugin, please file an issue at github, https://github.com/nilsmagnus/wsdl2java/issues
+If you have any issues with the plugin, please file an issue at github, https://github.com/yupzip/wsdl2java/issues
 
 ### Contribution
-Contributions are welcome as long as they are sane.
+Contributions are welcome.
 
 #### Contributors
-- Nils Larsgård , https://github.com/nilsmagnus
-- Mats Faugli, https://github.com/fowlie
-- Thorben Schiller, https://github.com/thorbolo
-- Stefan Kloe, https://github.com/Pentadrago
-- Mattias Rundgren, https://github.com/matrun
-- Steffen Döring, https://github.com/s-doering
-- Jesper Skov, https://github.com/jskovjyskebankdk
-- Manuel Sanches Ortiz, https://github.com/manuelsanchezortiz
-- Ruben Gees, https://github.com/rubengees
-- Stefan Krause-Kjær, https://github.com/KrauseStefan
+- Peter Vermes , https://github.com/yupzip
+- Nicklas Bondesson , https://github.com/nicklasbondesson
+- https://github.com/cstsw
 
 ### CXF
 This plugin uses the apache-cxf tools to do the actual work.
@@ -38,13 +40,11 @@ This plugin uses the apache-cxf tools to do the actual work.
 
 | Name | Description | Dependecy |
 | ---- | ----------- | --------- |
-| wsdl2java | Generate java source from wsdl-files | CompileJava/CompileKotlin depends on wsdl2java |
-| ~~xsd2java~~ | ~~Generate java source from xsd-files~~ Removed in version 0.8 | ~~CompileJava depends on xsd2java~~ |
+| wsdl2javaTask | Generate java source from wsdl-files | CompileJava/CompileKotlin depends on wsdl2java |
 
 ## Usage
 
 To use this plugin, you must
-- modify your buildscript to have dependencies to the plugin
 - apply the plugin
 - set the properties of the plugin
 
@@ -53,181 +53,134 @@ To use this plugin, you must
 Groovy:
 
 ```groovy
-buildscript{
-    repositories{
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'no.nils:wsdl2java:0.12'
-    }
+plugins {
+    id 'java'
+    id 'com.yupzip.wsdl2java' version '4.0.0'
 }
-
-apply plugin: 'no.nils.wsdl2java'
 ```
 
 Kotlin:
 
 ```kotlin
 plugins {
     id("java")
-    id("no.nils.wsdl2java") version "0.12"
+    id("com.yupzip.wsdl2java") version "4.0.0"
 }
 ```
 
 ### Plugin options
 
-| Option | Default value | Description |
-| ------ | ------------- | ----------- |
-| wsdlDir | src/main/resources | Define the wsdl files directory to support incremental build. This means that the task will be up-to-date if nothing in this directory has changed. |
-| wsdlsToGenerate | empty | This is the main input to the plugin that defines the wsdls to process. It is a list of arguments where each argument is a list of arguments to process a wsdl-file. The Wsdl-file with full path is the last argument. The array can be supplied with the same options as described for the maven-cxf plugin(http://cxf.apache.org/docs/wsdl-to-java.html). |
-| locale | Locale.getDefault() | The locale for the generated sources – especially the JavaDoc. This might be necessary to prevent differing sources due to several development environments. |
-| encoding | platform default encoding | Set the encoding name for generated sources, such as EUC-JP or UTF-8. |
-| stabilizeAndMergeObjectFactory| false | If multiple WSDLs target the same package, merge their `ObjectFactory` classes. |
-| cxfVersion | "+" | Controls the CXF version used to generate code. |
-| cxfPluginVersion | "+" | Controls the CXF XJC-plugins version used to generate code. |
+| Option                         | Default value             | Description                                                                                                                                                                                                                                                                                                                                                  |
+|--------------------------------|---------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| wsdlDir                        | src/main/resources        | Define the wsdl files directory to support incremental build. This means that the task will be up-to-date if nothing in this directory has changed.                                                                                                                                                                                                          |
+| wsdlsToGenerate                | empty                     | This is the main input to the plugin that defines the wsdls to process. It is a list of arguments where each argument is a list of arguments to process a wsdl-file. The Wsdl-file with full path is the last argument. The array can be supplied with the same options as described for the maven-cxf plugin(http://cxf.apache.org/docs/wsdl-to-java.html). |
+| generatedWsdlDir               | build/generated/wsdl      | Destination directory for generated sources. The task will be up-to-date if nothing in this directory changes between builds.                                                                                                                                                                                                                                |
+| locale                         | Locale.getDefault()       | The locale for the generated sources – especially the JavaDoc. This might be necessary to prevent differing sources due to several development environments.                                                                                                                                                                                                 |
+| encoding                       | platform default encoding | Set the encoding name for generated sources, such as EUC-JP or UTF-8.                                                                                                                                                                                                                                                                                        |
+| stabilizeAndMergeObjectFactory | false                     | If multiple WSDLs target the same package, merge their `ObjectFactory` classes.                                                                                                                                                                                                                                                                              |
 
 Example setting of options:
 
 Groovy:
 
 ```groovy
 wsdl2java {
-    wsdlDir = file("src/main/resources/myWsdlFiles") // define to support incremental build
+    wsdlDir = "src/main/resources/myWsdlFiles"
     wsdlsToGenerate = [   //  2d-array of wsdls and cxf-parameters
             ['src/main/resources/wsdl/firstwsdl.wsdl'],
             ['-xjc','-b','bindingfile.xml','src/main/resources/wsdl/secondwsdl.wsdl']
     ]
     locale = Locale.GERMANY
-    cxfVersion = "2.5.1"
-    cxfPluginVersion = "2.4.0"
 }
 ```
 
 Kotlin:
 
 ```kotlin
-extra["cxfVersion"] = "3.3.2"
-extra["cxfPluginVersion"] = "3.2.2"
-
 wsdl2java {
-    wsdlDir = file("$projectDir/src/main/wsdl")
+    wsdlDir = "$projectDir/src/main/wsdl"
     wsdlsToGenerate = listOf(
         listOf("$wsdlDir/firstwsdl.wsdl"),
         listOf("-xjc", "-b", "bindingfile.xml", "$wsdlDir/secondwsdl.wsdl")
     )
 }
 ```
 
-### Options for xsd2java (deprecated, separate plugin coming soon)
-
-This will not work for version 0.8+!
-
-| Option | Default value | Description |
-| ------ | ------------- | ----------- |
-| generatedXsdDir | "generatedsources/src/main/java" | Destination directory for generated sources |
-| xsdsToGenerate | null | 2-d array consisting of 2 or 3 values in each array: 1. xsd-file(input), 2. package for the generated sources, 3. (optional) a map containing additional options for the xjc task |
-| encoding | platform default encoding | Set the encoding name for generated sources, such as EUC-JP or UTF-8. |
-
-Example setting of options:
-
+## Example gradle configuration for Spring Boot 4+ with jakarta namespace
 ```groovy
-xsd2java {
-    encoding = 'utf-8'
-    xsdsToGenerate = [
-        ["src/main/resources/xsd/CustomersAndOrders.xsd", 'no.nils.xsd2java.sample', [header: false] /* optional map */]
-    ]
-    generatedXsdDir = file("generatedsources/xsd2java")
+plugins {
+    id "java"
+    id "org.springframework.boot" version "4.0.4"
+    id "io.spring.dependency-management" version "1.7.0"
+    id "com.yupzip.wsdl2java" version "4.0.0"
 }
-```
 
-## Complete example usage
-This is a an example of a working build.gradle for a java project. You can also take a look at the test resources, which contain two working projects.
-
-```groovy
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'no.nils:wsdl2java:0.12'
-    }
+bootJar {
+    duplicatesStrategy(DuplicatesStrategy.WARN)
 }
 
-apply plugin: 'java'
-apply plugin: 'no.nils.wsdl2java'
-
-repositories {
-    mavenCentral()
+compileJava {
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
+    options.compilerArgs << '-parameters'
 }
 
-dependencies {
-    testCompile 'junit:junit:+'
-}
+sourceSets.main.java.srcDirs "src/generated-sources/java"
 
-wsdl2java {
-    wsdlsToGenerate = [
-            ['-p', 'com.acme.mypackage', '-autoNameResolution', "$projectDir/src/main/resources/wsdl/stockqoute.wsdl"]
-    ]
-    wsdlDir = file("$projectDir/src/main/resources/wsdl")
-    locale = Locale.FRANCE
-    cxfVersion = "2.5.1"
-    cxfPluginVersion = "2.4.0"
+dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-web-services'
+    implementation 'org.springframework.ws:spring-ws-support:4.0.0'
+    // your project dependencies
+
+    implementation 'com.sun.xml.bind:jaxb-impl:4.0.6'
+    implementation 'com.sun.xml.messaging.saaj:saaj-impl:3.0.4'
+    implementation 'com.sun.xml.ws:jaxws-ri:4.0.3'
+
+    implementation 'io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.7'
+
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.5'
+    implementation 'jakarta.xml.soap:jakarta.xml.soap-api:3.0.2'
+    implementation 'jakarta.xml.ws:jakarta.xml.ws-api:4.0.3'
+
+    implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.6'
 }
-```
-
-### Java 9+ support
-
-This plugin automatically adds the necessary dependencies to work on Java 9+ when detected.
-
-As of now, these dependencies are added:
-
-```groovy
-implementation "javax.xml.bind:jaxb-api:2.3.1",
-implementation "javax.xml.ws:jaxws-api:2.3.1",
-implementation "org.glassfish.jaxb:jaxb-runtime:2.3.2",
-implementation "org.glassfish.main.javaee-api:javax.jws:3.1.2.2",
-implementation "com.sun.xml.messaging.saaj:saaj-impl:1.5.1"
-```
 
-## Enable basic extension support for xjc
-
-Apache CXF supports [extension for xjc](http://confluence.highsource.org/display/J2B/JAXB2+Basics+Plugins), e.g. for creating a hashCode, equals and toString method in the classes generated by xjc.  
-To use those extensions some more dependencies are necessary.
-
-```groovy
-dependencies() {
-    compile 'org.jvnet.jaxb2_commons:jaxb2-basics-runtime:0.11.0'
-
-    // enable extension support for wsdl2java
-    wsdl2java 'org.jvnet.jaxb2_commons:jaxb2-basics-runtime:0.11.0'
-    wsdl2java 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0'
+configurations {
+    wsdl2java
 }
 
-wsdl2java{
+wsdl2java {
+    wsdlDir = "$projectDir/src/main/resources/wsdl/"
+    stabilizeAndMergeObjectFactory = true
     wsdlsToGenerate = [
-        ['-xjc-Xequals', '-xjc-XhashCode', 'src/main/resources/com/example/api/interface.wsdl']
+            ['-xjc',
+             '-xjc-Xnamespace-prefix',
+             '-b',"$projectDir/src/main/resources/wsdl/wsdlBindings.xml",
+             '-b',"$projectDir/src/main/resources/wsdl/wsdlTypeDefBindings.xjb",
+             '-wsdlLocation', 'classPath:wsdl/myWsdl.wsdl',
+             '-p', 'my.package',
+             '-autoNameResolution',
+             '-verbose',
+             "$projectDir/src/main/resources/wsdl/myWsdl.wsdl"
+            ],
+            ['-xjc',
+             '-xjc-Xnamespace-prefix',
+             '-b',"$projectDir/src/main/resources/wsdl/wsdlBindings2.xml",
+             '-b',"$projectDir/src/main/resources/wsdl/wsdlTypeDefBindings2.xjb",
+             '-wsdlLocation', 'classPath:wsdl/myWsdl2.wsdl',
+             '-p', 'my.package',
+             '-autoNameResolution',
+             '-verbose',
+             "$projectDir/src/main/resources/wsdl/myWsdl2.wsdl"]
     ]
+    generatedWsdlDir = "src/generated-sources/java"
 }
 ```
 
-This example creates the hashCode and the equals method.
-
 ### A notice on multi-module projects
 
 Instead of referring to absolute paths in your build-file, try using $projectDir as a prefix to your files and directories. As shown in the "Complete example usage".
-
-
-# Releasing
-
-* set version to final in build.gradle & commit
-
-* build artifact and upload
-
-    export BINTRAY_USER=<bintrayuser>
-    export BINTRAY_API_KEY=<apikey>
-    ./gradlew clean bintrayPublish bintrayUpload
-
-* increment version and set to SNAPSHOT & commit
-* git push