diff --git a/build.gradle b/build.gradle
index e20a11b2e6..6f424d8f44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
 
 
 plugins {
-	id 'org.hibernate.build.xjc-jakarta' version '2.0.2' apply false
+	id 'org.hibernate.build.xjc-jakarta' version '2.0.3' apply false
 	id 'org.hibernate.matrix-test' version '3.1.1' apply false
 	id 'org.hibernate.orm.database-service' apply false
 	id 'biz.aQute.bnd' version '6.3.1' apply false
diff --git a/gradle/javadoc.gradle b/gradle/javadoc.gradle
index e6936cb933..ee7d7fd156 100644
--- a/gradle/javadoc.gradle
+++ b/gradle/javadoc.gradle
@@ -15,6 +15,8 @@ tasks.named( "javadoc", Javadoc ) {
 
     // exclude any generated sources and internal packages
     exclude '**/generated-src/**'
+    exclude '**/generated/source/**'
+    exclude '**/generated/sources/**'
     exclude '**/internal/**'
     include '**/*.java'
 
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index 5fa28aafd4..40366b094e 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -102,13 +102,6 @@ ext {
 }
 
 sourceSets {
-    main {
-        // add the XJC generated JAXB classes to the main source-set
-        java{
-            srcDir project.jaxbTargetDir
-        }
-    }
-
     test {
         resources {
             srcDir 'src/test/resources'