Skip to content

fix for #121. Just rearranged the requence of things in 'apply'. #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mdbergmann wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix for #121. Just rearranged the requence of things in 'apply'. #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 23 additions & 21 deletions src/main/groovy/no/nils/wsdl2java/Wsdl2JavaPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,37 +26,39 @@ class Wsdl2JavaPlugin implements Plugin<Project> {
// Add new configuration for our plugin and add required dependencies to it later.
def wsdl2javaConfiguration = project.configurations.maybeCreate(WSDL2JAVA)

// Get compile configuration and add Java 9+ dependencies if required.
project.configurations.named("compile").configure {
it.withDependencies {
if (JavaVersion.current().isJava9Compatible()) {
JAVA_9_DEPENDENCIES.each { dep -> it.add(project.dependencies.create(dep)) }
}
def wsdl2JavaTask = project.tasks.register(WSDL2JAVA, Wsdl2JavaTask.class) {task ->
task.group = "Wsdl2Java"
task.description = "Generate java source code from WSDL files."
task.classpath = wsdl2javaConfiguration
task.extension = extension
}

wsdl2javaConfiguration = wsdl2javaConfiguration.withDependencies {
it.add(project.dependencies.create("org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb:${cxfVersion.get()}"))
it.add(project.dependencies.create("org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws:${cxfVersion.get()}"))
if (project.wsdl2java.wsdlsToGenerate.any { it.contains('-xjc-Xts') }) {
it.add(project.dependencies.create("org.apache.cxf.xjcplugins:cxf-xjc-ts:${cxfPluginVersion.get()}"))
}
if (project.wsdl2java.wsdlsToGenerate.any { it.contains('-xjc-Xbg') }) {
it.add(project.dependencies.create("org.apache.cxf.xjcplugins:cxf-xjc-boolean:${cxfPluginVersion.get()}"))
}

if (JavaVersion.current().isJava9Compatible()) {
JAVA_9_DEPENDENCIES.each { dep -> it.add(project.dependencies.create(dep)) }
}
}

def wsdl2JavaTask = project.tasks.register(WSDL2JAVA, Wsdl2JavaTask.class) { task ->
wsdl2javaConfiguration.withDependencies {
it.add(project.dependencies.create("org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb:${cxfVersion.get()}"))
it.add(project.dependencies.create("org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws:${cxfVersion.get()}"))
if (project.wsdl2java.wsdlsToGenerate.any { it.contains('-xjc-Xts') }) {
it.add(project.dependencies.create("org.apache.cxf.xjcplugins:cxf-xjc-ts:${cxfPluginVersion.get()}"))
}
if (project.wsdl2java.wsdlsToGenerate.any { it.contains('-xjc-Xbg') }) {
it.add(project.dependencies.create("org.apache.cxf.xjcplugins:cxf-xjc-boolean:${cxfPluginVersion.get()}"))
}

// Get compile configuration and add Java 9+ dependencies if required.
project.configurations.named("compile").configure {
it.withDependencies {
if (JavaVersion.current().isJava9Compatible()) {
JAVA_9_DEPENDENCIES.each { dep -> it.add(project.dependencies.create(dep)) }
}
}

task.group = "Wsdl2Java"
task.description = "Generate java source code from WSDL files."
task.classpath = wsdl2javaConfiguration
task.extension = extension
}


project.tasks.named("compileJava").configure {
it.dependsOn wsdl2JavaTask
}
Expand Down