Skip to content

Commit eb62cc7

Browse files
laurentschoelensmattrpav
authored andcommitted
[#429] Fixing error warning on javax classes not found
(cherry picked from commit e5a9ae1)
1 parent c9250b3 commit eb62cc7

File tree

1 file changed

+4
-21
lines changed

1 file changed

+4
-21
lines changed

maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/AbstractXJCMojo.java

+4-21
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ public void setProject(MavenProject project) {
11221122
this.project = project;
11231123
}
11241124

1125-
private static final String XML_SCHEMA_CLASS_QNAME = "javax.xml.bind.annotation."
1125+
private static final String XML_SCHEMA_CLASS_QNAME = "jakarta.xml.bind.annotation."
11261126
+ XML_SCHEMA_CLASS_NAME;
11271127

11281128
public ArtifactResolver getArtifactResolver() {
@@ -1145,7 +1145,7 @@ public void setArtifactMetadataSource(
11451145
this.artifactMetadataSource = artifactMetadataSource;
11461146
}
11471147

1148-
private static final String XML_SCHEMA_RESOURCE_QNAME = "/javax/xml/bind/annotation/"
1148+
private static final String XML_SCHEMA_RESOURCE_QNAME = "/jakarta/xml/bind/annotation/"
11491149
+ XML_SCHEMA_RESOURCE_NAME;
11501150

11511151
public ArtifactFactory getArtifactFactory() {
@@ -1166,7 +1166,7 @@ public void setLocalRepository(ArtifactRepository localRepository) {
11661166
this.localRepository = localRepository;
11671167
}
11681168

1169-
private static final String XML_ELEMENT_REF_CLASS_QNAME = "javax.xml.bind.annotation."
1169+
private static final String XML_ELEMENT_REF_CLASS_QNAME = "jakarta.xml.bind.annotation."
11701170
+ XML_ELEMENT_REF_CLASS_NAME;
11711171

11721172
public MavenProjectBuilder getMavenProjectBuilder() {
@@ -1203,26 +1203,9 @@ protected void logApiConfiguration() {
12031203
location = draftLocation;
12041204
}
12051205
getLog().info("JAXB API is loaded from the [" + location + "].");
1206-
1207-
try {
1208-
xmlSchemaClass.getMethod("location");
1209-
1210-
final Class<?> xmlElementRefClass = Class
1211-
.forName(XML_ELEMENT_REF_CLASS_QNAME);
1212-
1213-
try {
1214-
xmlElementRefClass.getMethod("required");
1215-
getLog().info("Detected JAXB API version [2.2].");
1216-
} catch (NoSuchMethodException nsmex2) {
1217-
getLog().info("Detected JAXB API version [2.1].");
1218-
}
1219-
} catch (NoSuchMethodException nsmex1) {
1220-
getLog().info("Detected JAXB API version [2.0].");
1221-
1222-
}
12231206
} catch (ClassNotFoundException cnfex) {
12241207
getLog().error(
1225-
"Could not find JAXB 2.x API classes. Make sure JAXB 2.x API is on the classpath.");
1208+
"Could not find JAXB Jakarta API classes. Make sure JAXB Jakarta API is on the classpath.");
12261209
}
12271210
}
12281211

0 commit comments

Comments
 (0)