diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileFeatureDAOTestSuite.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileFeatureDAOTestSuite.java
index e5363c6025..497ac6f533 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileFeatureDAOTestSuite.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileFeatureDAOTestSuite.java
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 2015, WSO2 Inc. (http:www.wso2.org) All Rights Reserved.
*
@@ -227,6 +226,9 @@ public class MobileFeatureDAOTestSuite {
@Test(dependsOnMethods = {"addMobileFeatureTest"})
public void deleteMobileFeatureByIdTest()
throws MobileDeviceManagementDAOException {
+ Connection conn = null;
+ Statement stmt = null;
+
boolean status = mblFeatureDAO.deleteMobileFeatureById(mblFeatureId);
try {
conn = DriverManager.getConnection(testDBConfiguration.getConnectionURL());
@@ -237,7 +239,6 @@ public class MobileFeatureDAOTestSuite {
while (resultSet.next()) {
status = false;
}
- conn.close();
} catch (SQLException e) {
log.error("Error in deleting Mobile Feature data ", e);
throw new MobileDeviceManagementDAOException("Error in deleting Mobile Feature data ",
@@ -252,6 +253,9 @@ public class MobileFeatureDAOTestSuite {
public void updateMobileFeatureTest()
throws MobileDeviceManagementDAOException {
+ Connection conn = null;
+ Statement stmt = null;
+
MobileFeature mobileFeature = new MobileFeature();
MobileFeature testMblFeature = new MobileFeature();
mobileFeature.setCode(MBL_FEATURE_UPDATED_CODE);
@@ -272,7 +276,6 @@ public class MobileFeatureDAOTestSuite {
testMblFeature.setName(resultSet.getString(3));
testMblFeature.setDescription(resultSet.getString(4));
}
- conn.close();
} catch (SQLException e) {
log.error("Error in updating Mobile Feature data ", e);
throw new MobileDeviceManagementDAOException("Error in updating Mobile Feature data ",
diff --git a/pom.xml b/pom.xml
index 9282161b9b..b102978ca2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,9 +26,9 @@
wso2mdm-parent
pom
2.0.0-SNAPSHOT
- WSO2 CDM - Parent
+ WSO2 MDM - Parent
http://wso2.org
- WSO2 Connected Device Manager
+ WSO2 Mobile Device Manager
org.wso2
@@ -64,16 +64,100 @@
test
- org.wso2.carbon
+ org.wso2.carbon.automationutils
org.wso2.carbon.integration.common.extensions
- ${test.framework.version}
+ ${automation.utils.version}
test
+
+
+ org.apache.ftpserver
+ ftpserver-core
+
+
+ org.apache.activemq
+ activemq-all
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-core
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-logging-juli
+
+
+ org.springframework.ws.wso2
+ spring.framework
+
+
+ org.apache.cxf
+ cxf-rt-frontend-jaxrs
+
+
+ org.seleniumhq.selenium
+ selenium-java
+
+
+ com.opera
+ operadriver
+
+
+ org.apache.jmeter
+ ApacheJMeter_core
+
+
+ com.saucelabs.selenium
+ sauce-ondemand-driver
+
+
+ com.saucelabs.selenium
+ selenium-client-factory
+
+
+ org.apache.axis2.wso2
+ axis2
+
+
+ org.apache.ws.commons.axiom.wso2
+ axiom
+
+
+ net.lingala.zip4j
+ zip4j
+
+
- org.wso2.carbon
+ org.wso2.carbon.automationutils
org.wso2.carbon.integration.common.admin.client
- ${test.automation.stub.version}
+ ${automation.utils.version}
test
+
+
+ org.wso2.carbon.commons
+ org.wso2.carbon.user.mgt.stub
+
+
+ org.wso2.carbon.commons
+ org.wso2.carbon.logging.view.stub
+
+
+ org.wso2.carbon.commons
+ org.wso2.carbon.ndatasource.stub
+
+
+ org.wso2.carbon.commons
+ org.wso2.carbon.authenticator.stub
+
+
+ org.wso2.carbon.commons
+ org.wso2.carbon.authenticator.stub
+
+
+ org.wso2.carbon
+ org.wso2.carbon.utils
+
+
@@ -364,7 +448,7 @@
org.wso2.carbon.user.core
- org.wso2.carbon
+ org.wso2.carbon.governance
org.wso2.carbon.governance.api
@@ -542,12 +626,14 @@
0.9.0.ALPHA6
1.0.0
- 1.1.0-SNAPSHOT
+ 1.2.0
+ 1.1.0
+ 1.1.0
4.3.1
6.8
- 4.3.0-SNAPSHOT
+ 4.3.0
1.1.0
@@ -574,25 +660,25 @@
1.1.1
- 4.3.2
+ 4.3.4
4.3.0-SNAPSHOT
- 4.3.0
+ 4.3.1
- 4.3.0
+ 4.3.2
- 4.3.0
+ 4.3.3
4.3.0
- 4.3.0-SNAPSHOT
+ 4.3.0
4.3.0-SNAPSHOT
@@ -606,19 +692,12 @@
4.3.0-SNAPSHOT
-
+
1.51.0.0
-
-
1.49
-
-
2.0.0
-
-
3.0.21
-
diff --git a/product/modules/integration/tests-common/ui-pages/pom.xml b/product/modules/integration/tests-common/ui-pages/pom.xml
index 25426b5a35..a770a82368 100644
--- a/product/modules/integration/tests-common/ui-pages/pom.xml
+++ b/product/modules/integration/tests-common/ui-pages/pom.xml
@@ -36,7 +36,7 @@
- org.wso2.carbon
+ org.wso2.carbon.automationutils
org.wso2.carbon.integration.common.admin.client
compile
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index 0eca9cc140..ccfca8738e 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -126,6 +126,9 @@
org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.feature:${carbon.deployment.version}
+
+ org.wso2.carbon.deployment:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.deployment.version}
+
@@ -133,7 +136,7 @@
org.jaggeryjs:org.jaggeryjs.feature:${jaggery.version}
- org.jaggeryjs.modules:carbon.feature:${jaggery.extensions.version}
+ org.jaggeryjs.modules:carbon.feature:${jaggery.extensions.carbon.version}
org.jaggeryjs.modules:process.feature:${jaggery.extensions.version}
@@ -148,19 +151,10 @@
org.jaggeryjs.modules:i18n.feature:${jaggery.extensions.version}
- org.jaggeryjs.modules:jaggery-test.feature:${jaggery.extensions.version}
+ org.jaggeryjs.modules:jaggery-test.feature:${jaggery.extensions.test.version}
-
-
- org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.transport.mgt.version}
-
-
- org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version}
-
-
-
org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.api.mgt.version}
@@ -189,14 +183,14 @@
-
-
-
+
+ org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.server.feature:${carbon.multitenancy.version}
+
- org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.platform.version}
+ org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version}
org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.client.feature:${carbon.identity.version}
@@ -284,13 +278,13 @@
- org.wso2.carbon:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version}
+ org.wso2.carbon.governance:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version}
- org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version}
+ org.wso2.carbon.governance:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version}
- org.wso2.carbon:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version}
+ org.wso2.carbon.governance:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version}
@@ -336,6 +330,10 @@
org.wso2.carbon.module.mgt.feature.group
${carbon.deployment.version}
+
+ org.wso2.carbon.as.runtimes.cxf.feature.group
+ ${carbon.deployment.version}
+
@@ -345,7 +343,7 @@
org.jaggeryjs.modules.carbon.feature.group
- ${jaggery.extensions.version}
+ ${jaggery.extensions.carbon.version}
org.jaggeryjs.modules.process.feature.group
@@ -365,21 +363,10 @@
org.jaggeryjs.modules.jaggery-test.feature.group
- ${jaggery.extensions.version}
+ ${jaggery.extensions.test.version}
-
-
- org.wso2.carbon.transport.mgt.feature.group
- ${carbon.transport.mgt.version}
-
-
- org.wso2.carbon.as.runtimes.cxf.feature.group
- ${carbon.platform.version}
-
-
-
org.wso2.carbon.apimgt.core.feature.group
@@ -416,16 +403,16 @@
-
-
-
-
+
+ org.wso2.carbon.tenant.common.server.feature.group
+ ${carbon.multitenancy.version}
+
org.wso2.carbon.security.mgt.feature.group
- ${carbon.platform.version}
+ ${carbon.identity.version}
org.wso2.carbon.um.ws.service.client.feature.group