diff --git a/modules/tool/axis2-xsd2java-maven-plugin/pom.xml b/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
index b98d03e..23f8182 100644
--- a/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
+++ b/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
@@ -19,7 +19,7 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.axis2</groupId>
@@ -48,6 +48,12 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>axis2-adb-codegen</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -62,8 +68,33 @@
             <artifactId>maven-shared</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <!-- Maven supports SLF4J. -->
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${project.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <reporting>
         <plugins>
             <plugin>
diff --git a/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/AbstractXSD2JavaMojo.java b/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/AbstractXSD2JavaMojo.java
index 3cc7f77..15c08d5 100644
--- a/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/AbstractXSD2JavaMojo.java
+++ b/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/AbstractXSD2JavaMojo.java
@@ -35,6 +35,7 @@
 public abstract class AbstractXSD2JavaMojo extends AbstractMojo {
     /**
      * The maven project.
+     * 
      * @parameter expression="${project}"
      * @readonly
      * @required
@@ -43,13 +44,15 @@
 
     /**
      * The list of XSD files for which to generate the Java code.
+     * 
      * @parameter
-     * @required true
+     * @required
      */
     private File[] xsdFiles;
 
     /**
      * Mapping of namespaces to target Java packages.
+     * 
      * @parameter
      */
     private NamespaceMapping[] namespaceMappings;