Skip to content

Switch to different xjc plugin #14490

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

Merged
merged 1 commit into from
Aug 22, 2025
Merged

Switch to different xjc plugin #14490

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("org.unbroken-dome.xjc")
id("com.github.bjornvester.xjc")
id("otel.java-conventions")
}

Expand All @@ -10,6 +10,11 @@ tasks {
}
}

xjc {
xsdDir.set(layout.projectDirectory.dir("src/main/schema"))
useJakarta.set(false)
}

dependencies {
api("javax.xml.ws:jaxws-api:2.0")
api("javax.jws:javax.jws-api:1.1")
Expand Down
10 changes: 6 additions & 4 deletions instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("org.unbroken-dome.xjc")
id("com.github.bjornvester.xjc")
id("otel.java-conventions")
}

Expand All @@ -10,6 +10,11 @@ tasks {
}
}

xjc {
xsdDir.set(layout.projectDirectory.dir("src/main/schema"))
useJakarta.set(true)
}

dependencies {
api("jakarta.xml.ws:jakarta.xml.ws-api:3.0.0")
api("jakarta.jws:jakarta.jws-api:3.0.0")
Expand All @@ -18,7 +23,4 @@ dependencies {
api("org.springframework.ws:spring-ws-core:4.0.0")

implementation(project(":testing-common"))

xjcTool("com.sun.xml.bind:jaxb-xjc:3.0.2")
xjcTool("com.sun.xml.bind:jaxb-impl:3.0.2")
}
18 changes: 2 additions & 16 deletions instrumentation/spring/spring-ws-2.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
id("org.unbroken-dome.xjc")
id("otel.javaagent-instrumentation")
}

Expand All @@ -14,21 +13,6 @@ muzzle {
}
}

sourceSets {
test {
resources {
srcDirs("src/test/schema")
}
}
}

tasks {
named<Checkstyle>("checkstyleTest") {
// exclude generated web service classes
exclude("**/hello_web_service/**")
}
}

dependencies {
compileOnly("org.springframework.ws:spring-ws-core:2.0.0.RELEASE")

Expand All @@ -46,7 +30,9 @@ dependencies {
testImplementation("javax.xml.bind:jaxb-api:2.2.11")
testImplementation("com.sun.xml.bind:jaxb-core:2.2.11")
testImplementation("com.sun.xml.bind:jaxb-impl:2.2.11")
testImplementation("javax.activation:activation:1.1.1")
testImplementation("com.google.guava:guava")
testImplementation(project(":instrumentation:spring:spring-ws-2.0:testing"))

testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
}
Expand Down
27 changes: 27 additions & 0 deletions instrumentation/spring/spring-ws-2.0/testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
plugins {
id("com.github.bjornvester.xjc")
id("otel.java-conventions")
}

sourceSets {
main {
resources {
srcDirs("src/main/schema")
}
}
}

tasks {
named<Checkstyle>("checkstyleMain") {
// exclude generated web service classes
exclude("**/hello_web_service/**")
}
}

xjc {
xsdDir.set(layout.projectDirectory.dir("src/main/schema"))
useJakarta.set(false)
}

dependencies {
}
0 ...s-2.0/javaagent/src/test/schema/hello.xsd → ...-ws-2.0/testing/src/main/schema/hello.xsd
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pluginManagement {
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
id("org.jetbrains.kotlin.jvm") version "2.2.10"
id("org.xbib.gradle.plugin.jflex") version "3.0.2"
id("org.unbroken-dome.xjc") version "2.0.0"
id("com.github.bjornvester.xjc") version "1.8.2"
id("org.graalvm.buildtools.native") version "0.11.0"
}
}
Expand Down Expand Up @@ -590,6 +590,7 @@ include(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library")
include(":instrumentation:spring:spring-webmvc:spring-webmvc-common:javaagent")
include(":instrumentation:spring:spring-webmvc:spring-webmvc-common:testing")
include(":instrumentation:spring:spring-ws-2.0:javaagent")
include(":instrumentation:spring:spring-ws-2.0:testing")
include(":instrumentation:spring:starters:spring-boot-starter")
include(":instrumentation:spring:starters:zipkin-spring-boot-starter")
include(":instrumentation:spymemcached-2.12:javaagent")
Expand Down