You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/04/22 07:04:11 UTC

[2/5] Updated carbon.ui pom.xml and removed plugin repositories

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/products/stratos/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/pom.xml b/products/stratos/pom.xml
index 60a1a8a..c15d969 100755
--- a/products/stratos/pom.xml
+++ b/products/stratos/pom.xml
@@ -1,334 +1,332 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<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/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>stratos-products-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-    
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.stratos</groupId>
-    <artifactId>stratos</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos Manager - Parent</name>
-    <url>http://apache.org</url>
-    <description>Apache Stratos Manager Parent</description>
-
-    <modules>
-        <module>modules/p2-profile-gen</module>
-        <module>modules/distribution</module>
-        <!--module>modules/integration</module-->
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.13</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.axis2.wso2</groupId>
-                <artifactId>axis2</artifactId>
-                <version>1.6.1.wso2v1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.ws.commons.axiom.wso2</groupId>
-                <artifactId>axiom</artifactId>
-                <version>1.2.11.wso2v2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.derby.wso2</groupId>
-                <artifactId>derby</artifactId>
-                <version>10.3.2.1wso2v1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.core</artifactId>
-                <version>${carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.ui</artifactId>
-                <version>${carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.registry.core</artifactId>
-                <version>${carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.registry.mgt.ui.search</artifactId>
-                <version>${carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.registry.ui.search</artifactId>
-                <version>${carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.registry.mgt.ui.resources</artifactId>
-                <version>${carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.registry.ui.resources</artifactId>
-                <version>${carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.registry.ui.common</artifactId>
-                <version>${carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.framework</artifactId>
-                <version>1.0.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.main</artifactId>
-                <version>1.0.3</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.osgi.compendium</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.equinox</groupId>
-                <artifactId>org.eclipse.equinox.http.servlet</artifactId>
-                <version>2.2.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.equinox</groupId>
-                <artifactId>org.eclipse.equinox.http.helper</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.equinox</groupId>
-                <artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
-                <version>1.0.1.R33x_v20070816</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.equinox</groupId>
-                <artifactId>javax.servlet.jsp</artifactId>
-                <version>2.0.0.v200706191603</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.equinox</groupId>
-                <artifactId>org.apache.jasper</artifactId>
-                <version>5.5.17.v200706111724</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>${servlet-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.swt</groupId>
-                <artifactId>org.eclipse.swt</artifactId>
-                <version>${eclipse.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.swt</groupId>
-                <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
-                <version>${eclipse.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jface</groupId>
-                <artifactId>org.eclipse.jface</artifactId>
-                <version>${eclipse.version}</version>
-            </dependency>
-
-            <!-- Dependencies required for Cloud Manager -->
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.captcha.mgt</artifactId>
-                <version>${carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.admin.mgt</artifactId>
-                <version>${carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.admin.mgt.ui</artifactId>
-                <version>${carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.account.mgt</artifactId>
-                <version>${stratos.component.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.tenant.mgt</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.tenant.mgt.email.sender</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.mgt.axis2</artifactId>
-                <version>${stratos.component.version}</version>
-            </dependency>
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.theme.mgt</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.redirector.servlet</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.batik.wso2</groupId>
-                <artifactId>batik</artifactId>
-                <version>1.7.0.wso2v1</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.0.10</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <distributionManagement>
-        <repository>
-            <id>wso2-maven2-repository</id>
-            <name>WSO2 Maven2 Repository</name>
-            <url>scp://dist.wso2.org/home/httpd/dist.wso2.org/maven2/</url>
-        </repository>
-        <snapshotRepository>
-            <id>wso2-maven2-snapshot-repository</id>
-            <name>WSO2 Maven2 Snapshot Repository</name>
-            <url>scp://dist.wso2.org/home/httpd/dist.wso2.org/snapshots/maven2/</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <profiles>
-        <profile>
-            <activation>
-                <property>
-                    <name>sign</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <properties>
-        <rampart.mar.version>1.6.1-wso2v8</rampart.mar.version>
-        <features-dashboard.war.version>1.0.0</features-dashboard.war.version>
-        <carbon.version>4.2.0</carbon.version>
-	   <synapse.version>2.1.2.wso2v3</synapse.version>
-        <stratos.manager.version>${project.version}</stratos.manager.version>
-        <stratos.component.version>2.1.0</stratos.component.version>
-        <stratos.component.patch.version>2.1.3</stratos.component.patch.version>
-        <eclipse.version>3.2.0</eclipse.version>
-        <servlet-api.version>2.4</servlet-api.version>
-        <shoppingcart.version>2.1.0</shoppingcart.version>
-	<shoppingcart.global.version>2.1.0</shoppingcart.global.version>
-	<carbon.kernel.version>4.2.0</carbon.kernel.version>
-	<version.synapse>2.1.1-wso2v3</version.synapse>
-	<carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
-	<carbon.platform.version>4.2.0</carbon.platform.version>
-	<carbon.platform.patch.version.4.2.1>4.2.1</carbon.platform.patch.version.4.2.1>
-        <carbon.platform.patch.version.4.2.2>4.2.2</carbon.platform.patch.version.4.2.2>
-        <carbon.platform.patch.version.4.2.3>4.2.3</carbon.platform.patch.version.4.2.3>
-        <carbon.platform.patch.version.4.2.4>4.2.4</carbon.platform.patch.version.4.2.4>
-	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <opencsv.version>1.8</opencsv.version>
-        <poi.version>3.0-FINAL</poi.version>
-        <axis2.transport.version>1.1.0-wso2v8</axis2.transport.version>
-        <axis2.wso2.version>1.6.1.wso2v8</axis2.wso2.version>
-        <axiom.osgi.version>1.2.11.wso2v4</axiom.osgi.version>
-        <axiom.osgi.version.range>[1.2.11.wso2v4, 1.3.0)</axiom.osgi.version.range>
-	<servlet-api.version>2.4</servlet-api.version>
-        <log4j.version>1.2.17</log4j.version>
-        <commons.logging.version>1.1</commons.logging.version>
-	<quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version>
-    </properties>
-
-</project>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.apache.stratos</groupId>
+        <artifactId>stratos-products-parent</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+    </parent>
+    
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.stratos</groupId>
+    <artifactId>stratos</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos Manager - Parent</name>
+    <url>http://apache.org</url>
+    <description>Apache Stratos Manager Parent</description>
+
+    <modules>
+        <module>modules/p2-profile-gen</module>
+        <module>modules/distribution</module>
+        <!--module>modules/integration</module-->
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.13</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.axis2.wso2</groupId>
+                <artifactId>axis2</artifactId>
+                <version>1.6.1.wso2v1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons.axiom.wso2</groupId>
+                <artifactId>axiom</artifactId>
+                <version>1.2.11.wso2v2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.derby.wso2</groupId>
+                <artifactId>derby</artifactId>
+                <version>10.3.2.1wso2v1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.core</artifactId>
+                <version>${carbon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.ui</artifactId>
+                <version>${carbon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.registry.core</artifactId>
+                <version>${carbon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.registry.mgt.ui.search</artifactId>
+                <version>${carbon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.registry.ui.search</artifactId>
+                <version>${carbon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.registry.mgt.ui.resources</artifactId>
+                <version>${carbon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.registry.ui.resources</artifactId>
+                <version>${carbon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.registry.ui.common</artifactId>
+                <version>${carbon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.framework</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.main</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.osgi.compendium</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.eclipse.equinox</groupId>
+                <artifactId>org.eclipse.equinox.http.servlet</artifactId>
+                <version>2.2.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.equinox</groupId>
+                <artifactId>org.eclipse.equinox.http.helper</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.equinox</groupId>
+                <artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
+                <version>1.0.1.R33x_v20070816</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.equinox</groupId>
+                <artifactId>javax.servlet.jsp</artifactId>
+                <version>2.0.0.v200706191603</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.equinox</groupId>
+                <artifactId>org.apache.jasper</artifactId>
+                <version>5.5.17.v200706111724</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>${servlet-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.swt</groupId>
+                <artifactId>org.eclipse.swt</artifactId>
+                <version>${eclipse.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.swt</groupId>
+                <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+                <version>${eclipse.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jface</groupId>
+                <artifactId>org.eclipse.jface</artifactId>
+                <version>${eclipse.version}</version>
+            </dependency>
+
+            <!-- Dependencies required for Cloud Manager -->
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.captcha.mgt</artifactId>
+                <version>${carbon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.admin.mgt</artifactId>
+                <version>${carbon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.admin.mgt.ui</artifactId>
+                <version>${carbon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.account.mgt</artifactId>
+                <version>${stratos.component.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.tenant.mgt</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.tenant.mgt.email.sender</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.tenant.mgt.axis2</artifactId>
+                <version>${stratos.component.version}</version>
+            </dependency>
+        <dependency>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+            <dependency>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.theme.mgt</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.redirector.servlet</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.batik.wso2</groupId>
+                <artifactId>batik</artifactId>
+                <version>1.7.0.wso2v1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-scr-plugin</artifactId>
+                    <version>1.0.10</version>
+                    <executions>
+                        <execution>
+                            <id>generate-scr-scrdescriptor</id>
+                            <goals>
+                                <goal>scr</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <distributionManagement>
+        <repository>
+            <id>wso2-maven2-repository</id>
+            <name>WSO2 Maven2 Repository</name>
+            <url>scp://dist.wso2.org/home/httpd/dist.wso2.org/maven2/</url>
+        </repository>
+        <snapshotRepository>
+            <id>wso2-maven2-snapshot-repository</id>
+            <name>WSO2 Maven2 Snapshot Repository</name>
+            <url>scp://dist.wso2.org/home/httpd/dist.wso2.org/snapshots/maven2/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <profiles>
+        <profile>
+            <activation>
+                <property>
+                    <name>sign</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <properties>
+        <rampart.mar.version>1.6.1-wso2v8</rampart.mar.version>
+        <features-dashboard.war.version>1.0.0</features-dashboard.war.version>
+        <carbon.version>4.2.0</carbon.version>
+	   <synapse.version>2.1.2.wso2v3</synapse.version>
+        <stratos.manager.version>${project.version}</stratos.manager.version>
+        <stratos.component.version>2.1.0</stratos.component.version>
+        <stratos.component.patch.version>2.1.3</stratos.component.patch.version>
+        <eclipse.version>3.2.0</eclipse.version>
+        <servlet-api.version>2.4</servlet-api.version>
+        <shoppingcart.version>2.1.0</shoppingcart.version>
+	<shoppingcart.global.version>2.1.0</shoppingcart.global.version>
+	<carbon.kernel.version>4.2.0</carbon.kernel.version>
+	<version.synapse>2.1.1-wso2v3</version.synapse>
+	<carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
+	<carbon.platform.version>4.2.0</carbon.platform.version>
+	<carbon.platform.patch.version.4.2.1>4.2.1</carbon.platform.patch.version.4.2.1>
+        <carbon.platform.patch.version.4.2.2>4.2.2</carbon.platform.patch.version.4.2.2>
+        <carbon.platform.patch.version.4.2.3>4.2.3</carbon.platform.patch.version.4.2.3>
+        <carbon.platform.patch.version.4.2.4>4.2.4</carbon.platform.patch.version.4.2.4>
+	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <opencsv.version>1.8</opencsv.version>
+        <poi.version>3.0-FINAL</poi.version>
+        <axis2.transport.version>1.1.0-wso2v8</axis2.transport.version>
+        <axis2.wso2.version>1.6.1.wso2v8</axis2.wso2.version>
+        <axiom.osgi.version>1.2.11.wso2v4</axiom.osgi.version>
+        <axiom.osgi.version.range>[1.2.11.wso2v4, 1.3.0)</axiom.osgi.version.range>
+	<servlet-api.version>2.4</servlet-api.version>
+        <log4j.version>1.2.17</log4j.version>
+        <commons.logging.version>1.1</commons.logging.version>
+	<quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version>
+    </properties>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.account.mgt.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.account.mgt.stub/pom.xml b/service-stubs/org.apache.stratos.account.mgt.stub/pom.xml
index 7ca701a..d5ae3d0 100644
--- a/service-stubs/org.apache.stratos.account.mgt.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.account.mgt.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -47,31 +47,25 @@
                         <configuration>
                             <tasks>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/AccountMgtService.wsdl -u -uw -o target/generated-code
-                                    -p org.apache.stratos.account.mgt.stub.services
-                                    -ns2p http://services.mgt.account.stratos.apache.org=org.apache.stratos.account.mgt.stub.services,http://util.mgt.account.stratos.apache.org/xsd=org.apache.stratos.account.mgt.stub.xsd,http://exceptions.core.registry.carbon.wso2.org/xsd=org.apache.stratos.account.mgt.stub.exceptions,http://beans.mgt.account.stratos.apache.org/xsd=org.apache.stratos.account.mgt.stub.beans.xsd"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/AccountMgtService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.account.mgt.stub.services -ns2p http://services.mgt.account.stratos.apache.org=org.apache.stratos.account.mgt.stub.services,http://util.mgt.account.stratos.apache.org/xsd=org.apache.stratos.account.mgt.stub.xsd,http://exceptions.core.registry.carbon.wso2.org/xsd=org.apache.stratos.account.mgt.stub.exceptions,http://beans.mgt.account.stratos.apache.org/xsd=org.apache.stratos.account.mgt.stub.beans.xsd" />
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
 
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/EmailValidationService.wsdl -u -uw -o target/generated-code
-                                    -p org.apache.stratos.account.mgt.stub.services
-                                    -ns2p http://services.mgt.account.stratos.apache.org=org.apache.stratos.account.mgt.stub.services,http://util.mgt.account.stratos.apache.org/xsd=org.apache.stratos.account.mgt.stub.xsd,http://exceptions.core.registry.carbon.wso2.org/xsd=org.apache.stratos.account.mgt.stub.exceptions"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/EmailValidationService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.account.mgt.stub.services -ns2p http://services.mgt.account.stratos.apache.org=org.apache.stratos.account.mgt.stub.services,http://util.mgt.account.stratos.apache.org/xsd=org.apache.stratos.account.mgt.stub.xsd,http://exceptions.core.registry.carbon.wso2.org/xsd=org.apache.stratos.account.mgt.stub.exceptions" />
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
 				
 				<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/BillingDataAccessService.wsdl -u -uw -o target/generated-code
-                                    -p org.apache.stratos.account.mgt.stub.services
-                                    -ns2p http://dataobjects.core.billing.carbon.wso2.org/xsd=org.apache.stratos.account.mgt.stub.services.beans.xsd,http://services.mgt.billing.carbon.wso2.org=org.apache.stratos.account.mgt.stub.services"/>
+                                    <arg line="-uri src/main/resources/BillingDataAccessService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.account.mgt.stub.services -ns2p http://dataobjects.core.billing.carbon.wso2.org/xsd=org.apache.stratos.account.mgt.stub.services.beans.xsd,http://services.mgt.billing.carbon.wso2.org=org.apache.stratos.account.mgt.stub.services" />
 
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
 
                             </tasks>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.adc.instanceinfo.mgt.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.adc.instanceinfo.mgt.stub/pom.xml b/service-stubs/org.apache.stratos.adc.instanceinfo.mgt.stub/pom.xml
index b22b3e0..ac6f7eb 100644
--- a/service-stubs/org.apache.stratos.adc.instanceinfo.mgt.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.adc.instanceinfo.mgt.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -47,15 +47,13 @@
                         <configuration>
                             <tasks>
                                 <path id="wsdl2java.classpath">
-				    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar"/>
+				    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar" />
                                 </path>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/InstanceInformationManagementService.wsdl -u -uw
-                                    -o target/generated-code -p org.apache.stratos.adc.instanceinfo.mgt.stub
-                                    -ns2p http://org.apache.axis2/xsd=org.apache.stratos.adc.instanceinfo.mgt.stub"/>
-                                    <classpath refid="wsdl2java.classpath"/>
+                                    <arg line="-uri src/main/resources/InstanceInformationManagementService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.adc.instanceinfo.mgt.stub -ns2p http://org.apache.axis2/xsd=org.apache.stratos.adc.instanceinfo.mgt.stub" />
+                                    <classpath refid="wsdl2java.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.adc.reponotification.service.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.adc.reponotification.service.stub/pom.xml b/service-stubs/org.apache.stratos.adc.reponotification.service.stub/pom.xml
index 10aa493..4609920 100644
--- a/service-stubs/org.apache.stratos.adc.reponotification.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.adc.reponotification.service.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -46,16 +46,16 @@
                         <configuration>
                             <tasks>
                                 <path id="wsdl2java.classpath">
-				    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${orbit.version.axiom}/axiom-${orbit.version.axiom}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${orbit.version.axis2}/axis2-client-${orbit.version.axis2}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${orbit.version.axis2}/axis2-${orbit.version.axis2}.jar"/>
+				    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${orbit.version.axiom}/axiom-${orbit.version.axiom}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${orbit.version.axis2}/axis2-client-${orbit.version.axis2}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${orbit.version.axis2}/axis2-${orbit.version.axis2}.jar" />
                                 </path>
                                     <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/RepoNotificationService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.adc.reponotification.stub -ns2p http://org.apache.axis2/xsd=org.apache.stratos.adc.reponotification.stub.types.axis2"/>
-                                      <classpath refid="wsdl2java.classpath"/>
-				     <classpath refid="maven.dependency.classpath"/>
-				    <classpath refid="maven.compile.classpath"/>
-				    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/RepoNotificationService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.adc.reponotification.stub -ns2p http://org.apache.axis2/xsd=org.apache.stratos.adc.reponotification.stub.types.axis2" />
+                                      <classpath refid="wsdl2java.classpath" />
+				     <classpath refid="maven.dependency.classpath" />
+				    <classpath refid="maven.compile.classpath" />
+				    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
index 65e517e..35dc4d2 100644
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -47,10 +47,10 @@
                         <configuration>
                             <tasks>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/AutoScalerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.autoscaler.stub -ns2p http://policy.deployment.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.deployment.policy,http://model.policy.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.policy.model,http://exception.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.exception,http://partition.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.deployment.partition,http://pojo.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.pojo,http://partition.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.partition"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/AutoScalerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.autoscaler.stub -ns2p http://policy.deployment.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.deployment.policy,http://model.policy.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.policy.model,http://exception.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.exception,http://partition.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.deployment.partition,http://pojo.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.pojo,http://partition.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.partition" />
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.billing.mgt.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.billing.mgt.stub/pom.xml b/service-stubs/org.apache.stratos.billing.mgt.stub/pom.xml
index f566e19..8e55a31 100644
--- a/service-stubs/org.apache.stratos.billing.mgt.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.billing.mgt.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -47,12 +47,10 @@
                         <configuration>
                             <tasks>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/MultitenancyBillingService.wsdl -u -uw -o target/generated-code
-                                    -p org.apache.stratos.billing.mgt.stub.services
-                                    -ns2p http://services.mgt.billing.stratos.apache.org=org.apache.stratos.billing.mgt.stub.services,http://beans.mgt.billing.stratos.apache.org/xsd=org.apache.stratos.billing.mgt.stub.beans.xsd,http://dataobjects.core.billing.stratos.apache.org/xsd=org.apache.stratos.billing.mgt.stub.beans.xsd,http://beans.core.billing.stratos.apache.org/xsd=org.apache.stratos.billing.mgt.stub.beans.xsd"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/MultitenancyBillingService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.billing.mgt.stub.services -ns2p http://services.mgt.billing.stratos.apache.org=org.apache.stratos.billing.mgt.stub.services,http://beans.mgt.billing.stratos.apache.org/xsd=org.apache.stratos.billing.mgt.stub.beans.xsd,http://dataobjects.core.billing.stratos.apache.org/xsd=org.apache.stratos.billing.mgt.stub.beans.xsd,http://beans.core.billing.stratos.apache.org/xsd=org.apache.stratos.billing.mgt.stub.beans.xsd" />
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.cartridge.agent.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.cartridge.agent.stub/pom.xml b/service-stubs/org.apache.stratos.cartridge.agent.stub/pom.xml
index 35cb945..d4e2c12 100644
--- a/service-stubs/org.apache.stratos.cartridge.agent.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.cartridge.agent.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
@@ -47,18 +47,16 @@
                         <configuration>
                             <tasks>
                                 <!--<path id="wsdl2java.classpath">
-				    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${orbit.version.axiom}/axiom-${orbit.version.axiom}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${orbit.version.axis2}/axis2-client-${orbit.version.axis2}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${orbit.version.axis2}/axis2-${orbit.version.axis2}.jar"/>
+				    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${orbit.version.axiom}/axiom-${orbit.version.axiom}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${orbit.version.axis2}/axis2-client-${orbit.version.axis2}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${orbit.version.axis2}/axis2-${orbit.version.axis2}.jar" />
                                 </path>-->
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/CartridgeAgentService.wsdl -u -uw
-                                    -o target/generated-code -p org.apache.stratos.cartridge.agent.stub
-                                    -ns2p http://utils.mgt.hosting.carbon.wso2.org/xsd=org.wso2.carbon.hosting.mgt.stub.types.carbon,http://org.apache.axis2/xsd=org.wso2.carbon.hosting.mgt.stub"/>
-<!--                                    <classpath refid="wsdl2java.classpath"/>-->
-<classpath refid="maven.dependency.classpath"/>
-<classpath refid="maven.compile.classpath"/>
-<classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/CartridgeAgentService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.cartridge.agent.stub -ns2p http://utils.mgt.hosting.carbon.wso2.org/xsd=org.wso2.carbon.hosting.mgt.stub.types.carbon,http://org.apache.axis2/xsd=org.wso2.carbon.hosting.mgt.stub" />
+<!--                                    <classpath refid="wsdl2java.classpath" />-->
+<classpath refid="maven.dependency.classpath" />
+<classpath refid="maven.compile.classpath" />
+<classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
index c9ba977..398c9fa 100644
--- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -47,10 +47,10 @@
                         <configuration>
                             <tasks>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/CloudControllerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.cloud.controller.stub -ns2p http://policy.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.deployment.policy,http://partition.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.deployment.partition,http://exception.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.exception,http://pojo.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.pojo,http://impl.controller.cloud.stratos.apache.org=org.apache.stratos.cloud.controller.stub.impl"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/CloudControllerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.cloud.controller.stub -ns2p http://policy.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.deployment.policy,http://partition.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.deployment.partition,http://exception.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.exception,http://pojo.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.pojo,http://impl.controller.cloud.stratos.apache.org=org.apache.stratos.cloud.controller.stub.impl" />
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.common.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.common.stub/pom.xml b/service-stubs/org.apache.stratos.common.stub/pom.xml
index 68f86da..4b2e5c8 100644
--- a/service-stubs/org.apache.stratos.common.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.common.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -47,16 +47,14 @@
                         <configuration>
                             <tasks>
                                 <path id="wsdl2java.classpath">
-			 <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axis2.wso2.version}/axiom-${axis2.wso2.version}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar"/>
+			 <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axis2.wso2.version}/axiom-${axis2.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" />
                                 </path>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/PackageInfoServce.wsdl -u -uw
-                                    -p org.apache.stratos.common.packages.stub -o target/generated-code
-                                    -ns2p http://packages.common.stratos.apache.org/xsd=org.apache.stratos.common.packages.stub,http://services.common.stratos.apache.org=org.apache.stratos.common.packages.stub"/>
-                                    <classpath refid="wsdl2java.classpath"/>
+                                    <arg line="-uri src/main/resources/PackageInfoServce.wsdl -u -uw -p org.apache.stratos.common.packages.stub -o target/generated-code -ns2p http://packages.common.stratos.apache.org/xsd=org.apache.stratos.common.packages.stub,http://services.common.stratos.apache.org=org.apache.stratos.common.packages.stub" />
+                                    <classpath refid="wsdl2java.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.manager.cleanup.notification.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.manager.cleanup.notification.stub/pom.xml b/service-stubs/org.apache.stratos.manager.cleanup.notification.stub/pom.xml
index 844f880..65f9f91 100644
--- a/service-stubs/org.apache.stratos.manager.cleanup.notification.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.manager.cleanup.notification.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -46,16 +46,16 @@
                         <configuration>
                             <tasks>
                                 <path id="wsdl2java.classpath">
-				    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar"/>
+				    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar" />
                                 </path>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/InstanceCleanupNotificationService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.manager.cleanup.notification.stub -ns2p http://exception.manager.stratos.apache.org/xsd=org.apache.stratos.manager.exception,http://dto.manager.stratos.apache.org/xsd=org.apache.stratos.manager.dto"/>
-                                    <classpath refid="wsdl2java.classpath"/>
-				    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/InstanceCleanupNotificationService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.manager.cleanup.notification.stub -ns2p http://exception.manager.stratos.apache.org/xsd=org.apache.stratos.manager.exception,http://dto.manager.stratos.apache.org/xsd=org.apache.stratos.manager.dto" />
+                                    <classpath refid="wsdl2java.classpath" />
+				    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml b/service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml
index b1bd847..5b5845a 100644
--- a/service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -47,12 +47,10 @@
                         <configuration>
                             <tasks>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/CloudManagerService.wsdl -u -uw -o target/generated-code
-                                                    -p org.apache.stratos.manager.dashboard.stub
-                                                    -ns2p http://common.core.carbon.wso2.org/xsd=org.apache.stratos.manager.dashboard.stub,http://services.mgt.services.manager.stratos.apache.org=org.apache.stratos.manager.dashboard.stub,http://beans.mgt.services.manager.stratos.apache.org/xsd=org.apache.stratos.manager.dashboard.stub.xsd"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/CloudManagerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.manager.dashboard.stub -ns2p http://common.core.carbon.wso2.org/xsd=org.apache.stratos.manager.dashboard.stub,http://services.mgt.services.manager.stratos.apache.org=org.apache.stratos.manager.dashboard.stub,http://beans.mgt.services.manager.stratos.apache.org/xsd=org.apache.stratos.manager.dashboard.stub.xsd" />
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.manager.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.manager.stub/pom.xml b/service-stubs/org.apache.stratos.manager.stub/pom.xml
index 4b6ea6f..e123fb8 100644
--- a/service-stubs/org.apache.stratos.manager.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.manager.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -46,16 +46,16 @@
                         <configuration>
                             <tasks>
                                 <path id="wsdl2java.classpath">
-				    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar"/>
+				    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar" />
                                 </path>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/ApplicationManagementService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.manager.stub -ns2p http://exception.manager.stratos.apache.org/xsd=org.apache.stratos.manager.exception,http://dto.manager.stratos.apache.org/xsd=org.apache.stratos.manager.dto"/>
-                                    <classpath refid="wsdl2java.classpath"/>
-				    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/ApplicationManagementService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.manager.stub -ns2p http://exception.manager.stratos.apache.org/xsd=org.apache.stratos.manager.exception,http://dto.manager.stratos.apache.org/xsd=org.apache.stratos.manager.dto" />
+                                    <classpath refid="wsdl2java.classpath" />
+				    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.redirector.servlet.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.redirector.servlet.stub/pom.xml b/service-stubs/org.apache.stratos.redirector.servlet.stub/pom.xml
index 8608da3..7f843c0 100644
--- a/service-stubs/org.apache.stratos.redirector.servlet.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.redirector.servlet.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -47,12 +47,10 @@
                         <configuration>
                             <tasks>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/RedirectorServletService.wsdl -u -uw -o target/generated-code
-                                    -p org.apache.stratos.redirector.servlet.stub
-                                    -ns2p http://services.servlet.redirector.stratos.apache.org=org.apache.stratos.redirector.servlet.stub.services,http://util.servlet.redirector.stratos.apache.org/xsd=org.apache.stratos.redirector.servlet.stub.beans.xsd"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/RedirectorServletService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.redirector.servlet.stub -ns2p http://services.servlet.redirector.stratos.apache.org=org.apache.stratos.redirector.servlet.stub.services,http://util.servlet.redirector.stratos.apache.org/xsd=org.apache.stratos.redirector.servlet.stub.beans.xsd" />
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.tenant.activity.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.tenant.activity.stub/pom.xml b/service-stubs/org.apache.stratos.tenant.activity.stub/pom.xml
index 6b6bd4d..4584c2c 100644
--- a/service-stubs/org.apache.stratos.tenant.activity.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.tenant.activity.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -47,12 +47,10 @@
                         <configuration>
                             <tasks>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/TenantActivityService.wsdl -u -uw -o target/generated-code
-                                    -p org.apache.stratos.tenant.activity.stub
-                                    -ns2p http://services.activity.tenant.stratos.apache.org=org.apache.stratos.tenant.activity.stub.services,http://beans.activity.tenant.stratos.apache.org/xsd=org.apache.stratos.tenant.activity.stub.beans.xsd"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/TenantActivityService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.tenant.activity.stub -ns2p http://services.activity.tenant.stratos.apache.org=org.apache.stratos.tenant.activity.stub.services,http://beans.activity.tenant.stratos.apache.org/xsd=org.apache.stratos.tenant.activity.stub.beans.xsd" />
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml b/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml
index c9efecf..ff32dd4 100644
--- a/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
     	<groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -47,12 +47,10 @@
                         <configuration>
                             <tasks>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/TenantMgtAdminService.wsdl -u -uw -o target/generated-code
-                                    -p org.apache.stratos.tenant.mgt.stub
-                                    -ns2p http://services.mgt.tenant.stratos.apache.org=org.apache.stratos.tenant.mgt.stub.services,http://beans.mgt.tenant.stratos.apache.org/xsd=org.apache.stratos.tenant.mgt.stub.beans.xsd,http://beans.common.stratos.apache.org/xsd=org.apache.stratos.tenant.mgt.stub.beans.xsd"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/TenantMgtAdminService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.tenant.mgt.stub -ns2p http://services.mgt.tenant.stratos.apache.org=org.apache.stratos.tenant.mgt.stub.services,http://beans.mgt.tenant.stratos.apache.org/xsd=org.apache.stratos.tenant.mgt.stub.beans.xsd,http://beans.common.stratos.apache.org/xsd=org.apache.stratos.tenant.mgt.stub.beans.xsd" />
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.tenant.register.gapp.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.tenant.register.gapp.stub/pom.xml b/service-stubs/org.apache.stratos.tenant.register.gapp.stub/pom.xml
index ba374f8..9a162c0 100644
--- a/service-stubs/org.apache.stratos.tenant.register.gapp.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.tenant.register.gapp.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
    </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -47,26 +47,21 @@
                         <configuration>
                             <tasks>
                                 <!--<path id="wsdl2java.classpath">
-			 <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${orbit.version.axiom}/axiom-${orbit.version.axiom}.jar"/>
-                                    <pathelement
-                                            location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${orbit.version.axis2}/axis2-client-${orbit.version.axis2}.jar"/>
-                                    <pathelement
-                                            location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${orbit.version.axis2}/axis2-${orbit.version.axis2}.jar"/>
-                                    <pathelement
-                                            location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${orbit.version.axiom}/axiom-${orbit.version.axiom}.jar"/>
+			 <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${orbit.version.axiom}/axiom-${orbit.version.axiom}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${orbit.version.axis2}/axis2-client-${orbit.version.axis2}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${orbit.version.axis2}/axis2-${orbit.version.axis2}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${orbit.version.axiom}/axiom-${orbit.version.axiom}.jar" />
                                 </path>-->
 				 <path id="wsdl2java.classpath">
-				    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axis2.wso2.version}/axiom-${axis2.wso2.version}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar"/>
-                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar"/>
+				    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axis2.wso2.version}/axiom-${axis2.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" />
                                 </path>
 
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/GAppTenantRegistrationService.wsdl -u -uw -o target/generated-code
-                                    -p org.apache.stratos.tenant.register.gapp.stub
-                                    -ns2p http://services.mgt.tenant.stratos.apache.org=org.apache.stratos.tenant.register.gapp.stub.services,http://beans.mgt.tenant.stratos.apache.org/xsd=org.apache.stratos.tenant.register.gapp.stub.xsd,http://org.apache.axis2/xsd=org.apache.stratos.tenant.register.gapp.stub.services,http://exception.mgt.tenant.stratos.apache.org/xsd=org.apache.stratos.tenant.register.gapp.stub.xsd"/>
-                                    <classpath refid="wsdl2java.classpath"/>
+                                    <arg line="-uri src/main/resources/GAppTenantRegistrationService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.tenant.register.gapp.stub -ns2p http://services.mgt.tenant.stratos.apache.org=org.apache.stratos.tenant.register.gapp.stub.services,http://beans.mgt.tenant.stratos.apache.org/xsd=org.apache.stratos.tenant.register.gapp.stub.xsd,http://org.apache.axis2/xsd=org.apache.stratos.tenant.register.gapp.stub.services,http://exception.mgt.tenant.stratos.apache.org/xsd=org.apache.stratos.tenant.register.gapp.stub.xsd" />
+                                    <classpath refid="wsdl2java.classpath" />
                                 </java>
 				
 			    </tasks>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c1292a/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml b/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml
index dc96659..37c7d96 100644
--- a/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-service-stubs-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -47,12 +47,10 @@
                         <configuration>
                             <tasks>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri src/main/resources/TenantMgtService.wsdl -u -uw -o target/generated-code
-                                    -p org.apache.stratos.tenant.register.stub
-                                    -ns2p http://services.mgt.tenant.stratos.apache.org=org.apache.stratos.tenant.register.stub.services,http://beans.mgt.tenant.stratos.apache.org/xsd=org.apache.stratos.tenant.register.stub.beans.xsd,http://beans.mgt.captcha.carbon.wso2.org/xsd=org.apache.stratos.tenant.register.stub.beans.xsd"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <arg line="-uri src/main/resources/TenantMgtService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.tenant.register.stub -ns2p http://services.mgt.tenant.stratos.apache.org=org.apache.stratos.tenant.register.stub.services,http://beans.mgt.tenant.stratos.apache.org/xsd=org.apache.stratos.tenant.register.stub.beans.xsd,http://beans.mgt.captcha.carbon.wso2.org/xsd=org.apache.stratos.tenant.register.stub.beans.xsd" />
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>