diff --git a/.travis.yml b/.travis.yml
index fcaf40f966b6..d0b917d79d88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,4 @@ cache:
directories:
- .autoconf
- $HOME/.m2
-script: mvn clean install -q -B -V | grep -v DEBUG; test ${PIPESTATUS[0]} -eq 0;
+script: mvn clean install
diff --git a/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml b/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml
index 6efccea10a27..bafb4e8496dc 100644
--- a/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml
+++ b/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml
@@ -43,7 +43,7 @@
${project.artifactId}
${project.artifactId}
- org.wso2.carbon.identity.template.mgt.ui.*,
+ org.wso2.carbon.identity.template.mgt.ui.*; version="${carbon.identity.package.export.version}",
javax.servlet.http,
diff --git a/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml b/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml
index d3a8ad784c2b..077846ac943c 100644
--- a/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml
+++ b/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml
@@ -42,7 +42,7 @@
org.wso2.carbon.identity.template.mgt.internal
!org.wso2.carbon.identity.template.mgt.internal,
- org.wso2.carbon.identity.template.mgt.*
+ org.wso2.carbon.identity.template.mgt.*; version="${carbon.identity.package.export.version}",
org.osgi.framework; version="${osgi.framework.imp.pkg.version.range}",
diff --git a/pom.xml b/pom.xml
index 1845c8ab615c..25ca446a91f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1976,6 +1976,7 @@
none
+ true
diff --git a/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml
index c0b15a919933..0e832e8ce5be 100644
--- a/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml
+++ b/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml
@@ -46,11 +46,14 @@
+
+
+
+
+
-
-
-
+
diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml
index b91a9558203b..3416e4c49213 100644
--- a/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml
+++ b/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml
@@ -53,9 +53,6 @@
-
-
-
diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml
index d4ff866c7518..78d2a27e597a 100644
--- a/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml
+++ b/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml
@@ -54,16 +54,10 @@
-
-
-
-
-
-
diff --git a/service-stubs/identity/org.wso2.carbon.identity.authenticator.token.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.authenticator.token.stub/pom.xml
index f4603b3161be..ab78157bcf66 100644
--- a/service-stubs/identity/org.wso2.carbon.identity.authenticator.token.stub/pom.xml
+++ b/service-stubs/identity/org.wso2.carbon.identity.authenticator.token.stub/pom.xml
@@ -46,11 +46,14 @@
+
+
+
+
+
-
-
-
+
diff --git a/service-stubs/identity/org.wso2.carbon.identity.entitlement.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.entitlement.stub/pom.xml
index 2ef166072028..3ebd886f40ec 100644
--- a/service-stubs/identity/org.wso2.carbon.identity.entitlement.stub/pom.xml
+++ b/service-stubs/identity/org.wso2.carbon.identity.entitlement.stub/pom.xml
@@ -46,23 +46,22 @@
+
+
+
+
+
-
-
-
+
-
-
-
+
-
-
-
+
diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml
index 79b62e21ed4d..424dacfa5b8f 100644
--- a/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml
+++ b/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml
@@ -46,11 +46,15 @@
+
+
+
+
+
+
-
-
-
+
diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml
index e05449619c68..e944a65db74e 100644
--- a/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml
+++ b/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml
@@ -46,11 +46,14 @@
+
+
+
+
+
-
-
-
+
diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml
index 9c6c8dd5a299..2013d5becbbc 100644
--- a/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml
+++ b/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml
@@ -47,16 +47,14 @@
-
-
-
-
+
+
+
+
-
-
-
+
diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml
index ec58ac17b3c2..2e5027a3829d 100644
--- a/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml
+++ b/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml
@@ -47,16 +47,14 @@
-
-
-
-
+
+
+
+
-
-
-
+
diff --git a/service-stubs/identity/org.wso2.carbon.identity.workflow.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.workflow.mgt.stub/pom.xml
index 68493cf5dc9b..a1bda15fa2eb 100644
--- a/service-stubs/identity/org.wso2.carbon.identity.workflow.mgt.stub/pom.xml
+++ b/service-stubs/identity/org.wso2.carbon.identity.workflow.mgt.stub/pom.xml
@@ -46,11 +46,14 @@
+
+
+
+
+
-
-
-
+
diff --git a/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml
index 4f9d1f1e2330..75662d5a4f38 100644
--- a/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml
+++ b/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml
@@ -54,9 +54,6 @@
-
-
-
diff --git a/service-stubs/identity/org.wso2.carbon.user.mgt.workflow.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.user.mgt.workflow.stub/pom.xml
index a7e67dff9afd..6164085e7f27 100644
--- a/service-stubs/identity/org.wso2.carbon.user.mgt.workflow.stub/pom.xml
+++ b/service-stubs/identity/org.wso2.carbon.user.mgt.workflow.stub/pom.xml
@@ -46,11 +46,14 @@
+
+
+
+
+
-
-
-
+