Reintegrated changes from trunk.
diff --git a/modules/adb-codegen/pom.xml b/modules/adb-codegen/pom.xml index e97cd53..a942da5 100644 --- a/modules/adb-codegen/pom.xml +++ b/modules/adb-codegen/pom.xml
@@ -47,8 +47,8 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> </dependency> <dependency> <groupId>commons-cli</groupId>
diff --git a/modules/fastinfoset/pom.xml b/modules/fastinfoset/pom.xml index ecedba3..0cb6941 100644 --- a/modules/fastinfoset/pom.xml +++ b/modules/fastinfoset/pom.xml
@@ -62,8 +62,8 @@ <artifactId>commons-fileupload</artifactId> </dependency> <dependency> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> </dependency> <dependency> <groupId>org.apache.axis2</groupId>
diff --git a/modules/java2wsdl/pom.xml b/modules/java2wsdl/pom.xml index 3481b38..904ab8f 100644 --- a/modules/java2wsdl/pom.xml +++ b/modules/java2wsdl/pom.xml
@@ -58,8 +58,8 @@ <!--added this to support to keep WSDL information in AxisService--> <dependency> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId>
diff --git a/modules/kernel/pom.xml b/modules/kernel/pom.xml index df61967..ee11398 100644 --- a/modules/kernel/pom.xml +++ b/modules/kernel/pom.xml
@@ -65,8 +65,8 @@ <artifactId>wsdl4j</artifactId> </dependency> <dependency> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> </dependency> <dependency> <groupId>org.apache.neethi</groupId>
diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml index 9c30d7f..8a60312 100644 --- a/modules/parent/pom.xml +++ b/modules/parent/pom.xml
@@ -70,7 +70,7 @@ <axiom.version>1.2.13-SNAPSHOT</axiom.version> <neethi.version>3.0.2-SNAPSHOT</neethi.version> <woden.version>1.0-SNAPSHOT</woden.version> - <xmlschema.version>1.4.8-SNAPSHOT</xmlschema.version> + <xmlschema.version>2.0.1-SNAPSHOT</xmlschema.version> <!-- Use released versions for these projects --> <ant.version>1.7.0</ant.version> @@ -610,8 +610,8 @@ <version>${axiom.version}</version> </dependency> <dependency> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> <version>${xmlschema.version}</version> </dependency> <dependency>
diff --git a/modules/tool/axis2-ant-plugin/pom.xml b/modules/tool/axis2-ant-plugin/pom.xml index 83a226a..ef97c98 100644 --- a/modules/tool/axis2-ant-plugin/pom.xml +++ b/modules/tool/axis2-ant-plugin/pom.xml
@@ -81,8 +81,8 @@ <artifactId>neethi</artifactId> </dependency> <dependency> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId>
diff --git a/modules/tool/axis2-idea-plugin/pom.xml b/modules/tool/axis2-idea-plugin/pom.xml index 57e80ff..99776ee 100644 --- a/modules/tool/axis2-idea-plugin/pom.xml +++ b/modules/tool/axis2-idea-plugin/pom.xml
@@ -113,8 +113,8 @@ <artifactId>xmlbeans</artifactId> </dependency> <dependency> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> </dependency> <dependency> <groupId>org.apache.woden</groupId>