This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit f32222dfb27d76c312cdcb1fe9b7476564ec0f12 Author: Robert Lazarski <[email protected]> AuthorDate: Mon Apr 20 12:02:53 2026 -1000 AXIS2-6105 Remove remaining JiBX references from codegen and wsdl2code plugin Missed in the initial JiBX removal: import and usage of JiBXExtension in AbstractWSDL2CodeMojo.java, and JiBX entries in codegen-config.properties (databinding frameworks, unwrap support, extensions, templates). Also AXIS2-6040: revert global Automatic-Module-Name — hyphens in artifactIds produce invalid Java module names that break the build. --- .../org/apache/axis2/wsdl/codegen/codegen-config.properties | 13 ++++++------- .../axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java | 11 ++--------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties b/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties index 6b06ca74c6..97b3983f16 100644 --- a/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties +++ b/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties @@ -30,7 +30,6 @@ org.apache.axis2.wsdl.codegen.extension.JAXWSWapperExtension,\ org.apache.axis2.wsdl.codegen.extension.SchemaUnwrapperExtension,\ org.apache.axis2.wsdl.codegen.extension.XMLBeansExtension, \ org.apache.axis2.wsdl.codegen.extension.SimpleDBExtension, \ - org.apache.axis2.wsdl.codegen.extension.JiBXExtension, \ org.apache.axis2.wsdl.codegen.extension.JAXBRIExtension, \ org.apache.axis2.wsdl.codegen.extension.TypeMapperExtension, \ org.apache.axis2.wsdl.codegen.extension.DefaultDatabindingExtension, \ @@ -53,23 +52,23 @@ codegen.thirdparty.schema=xmime.xsd,soap-enc.xsd # Codegen data binding frameworks and their related information # The names of the codegeneration frameworks in lexical order # these are the names that should be passed onto the tool as arguments as well -codegen.databinding.frameworks=adb,xmlbeans,jibx,jaxbri,none +codegen.databinding.frameworks=adb,xmlbeans,jaxbri,none # this property keeps the names of the databinding frameworks which support # unwrapping -codegen.databinding.unwrap.supported=adb,xmlbeans,jibx,jaxbri +codegen.databinding.unwrap.supported=adb,xmlbeans,jaxbri # this property keeps the names of the databinding frameworks that handle unwrapping # directly (rather than by using the unwrapper extension) -codegen.databinding.unwrap.direct=jibx +# jibx removed: AXIS2-6105 # the related extensions for the specified data binding frameworks above # Note - these are in the lexical order of the framework names. There is an implicit assumption # that a given databinding framework will be processed only by one extension -codegen.databinding.extensions=org.apache.axis2.wsdl.codegen.extension.SimpleDBExtension,org.apache.axis2.wsdl.codegen.extension.XMLBeansExtension,org.apache.axis2.wsdl.codegen.extension.JiBXExtension,org.apache.axis2.wsdl.codegen.extension.JAXBRIExtension,org.apache.axis2.wsdl.codegen.extension.DefaultDatabindingExtension +codegen.databinding.extensions=org.apache.axis2.wsdl.codegen.extension.SimpleDBExtension,org.apache.axis2.wsdl.codegen.extension.XMLBeansExtension,org.apache.axis2.wsdl.codegen.extension.JAXBRIExtension,org.apache.axis2.wsdl.codegen.extension.DefaultDatabindingExtension # the default data binding framework name codegen.databinding.frameworks.default=adb # the databinding templates - codegen.databinding.adb.supporter.template=/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl codegen.databinding.xmlbeans.supporter.template=/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl -codegen.databinding.jibx.supporter.template=/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl +# jibx template removed: AXIS2-6105 codegen.databinding.jaxbri.supporter.template=/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl codegen.databinding.none.supporter.template=/org/apache/axis2/wsdl/template/java/NoneDatabindingTemplate.xsl @@ -114,7 +113,7 @@ java.service.template=org.apache.axis2.wsdl.codegen.writer.ServiceXMLWriter,/org java.message.receiver.template=org.apache.axis2.wsdl.codegen.writer.MessageReceiverWriter,/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl # java.antbuild.xmlbeans.template=org.apache.axis2.wsdl.codegen.writer.AntBuildWriter,/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl -java.antbuild.jibx.template=org.apache.axis2.wsdl.codegen.writer.AntBuildWriter,/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl +# jibx ant build template removed: AXIS2-6105 java.antbuild.jaxbri.template=org.apache.axis2.wsdl.codegen.writer.AntBuildWriter,/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl java.antbuild.adb.template=org.apache.axis2.wsdl.codegen.writer.AntBuildWriter,/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl java.antbuild.none.template=org.apache.axis2.wsdl.codegen.writer.AntBuildWriter,/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl diff --git a/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java b/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java index f24f999b34..4cc0594372 100644 --- a/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java +++ b/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java @@ -24,7 +24,6 @@ import org.apache.axis2.maven.shared.NamespaceMappingUtil; import org.apache.axis2.wsdl.codegen.CodeGenConfiguration; import org.apache.axis2.wsdl.codegen.CodeGenerationEngine; import org.apache.axis2.wsdl.codegen.CodeGenerationException; -import org.apache.axis2.wsdl.codegen.extension.JiBXExtension; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -68,11 +67,7 @@ public abstract class AbstractWSDL2CodeMojo extends AbstractMojo { @Parameter(property = "axis2.wsdl2code.databindingName", defaultValue = "adb") private String databindingName; - /** - * The binding file for JiBX databinding. - */ - @Parameter(property = "axis2.wsdl2code.jibxBindingFile") - private String jibxBindingFile; + // JiBX binding file parameter removed: AXIS2-6105 /** * Port name, for which to generate sources. By default, sources will be generated for a @@ -277,9 +272,7 @@ public abstract class AbstractWSDL2CodeMojo extends AbstractMojo { config.setOutputLocation(getOutputDirectory()); config.setDatabindingType(databindingName); - if ("jibx".equals(databindingName)) { - config.getProperties().put(JiBXExtension.BINDING_PATH_OPTION, jibxBindingFile); - } + // JiBX databinding support removed: AXIS2-6105 if ("async".equals(syncMode)) { config.setSyncOn(false);
