From d29fce31b4735c95cb23ae59a730e4de5ba43328 Mon Sep 17 00:00:00 2001 From: charithag Date: Tue, 12 Jan 2016 14:11:03 +0530 Subject: [PATCH] Use dependencies from P2 --- .../connectedcup/component/plugin/pom.xml | 10 +- .../samples/connectedcup/component/pom.xml | 190 +++++++++++++- .../connectedcup/component/service/pom.xml | 22 +- modules/samples/connectedcup/feature/pom.xml | 10 +- modules/samples/connectedcup/pom.xml | 245 +++++++++++++++++- 5 files changed, 428 insertions(+), 49 deletions(-) diff --git a/modules/samples/connectedcup/component/plugin/pom.xml b/modules/samples/connectedcup/component/plugin/pom.xml index 20beb420..47c121b8 100644 --- a/modules/samples/connectedcup/component/plugin/pom.xml +++ b/modules/samples/connectedcup/component/plugin/pom.xml @@ -1,6 +1,6 @@ @@ -30,8 +30,8 @@ org.coffeeking.connectedcup.plugin 1.9.2-SNAPSHOT bundle - WSO2 IoTS(Device Types) - Connected Cup CDMF Plugin - WSO2 IoTS(Device Types) - Connected Cup CDMF Plugin + WSO2 IoTS(Device Types) - Connected Cup CDMF Plugin + WSO2 IoTS(Device Types) - Connected Cup CDMF Plugin http://wso2.org @@ -120,4 +120,4 @@ - \ No newline at end of file + diff --git a/modules/samples/connectedcup/component/pom.xml b/modules/samples/connectedcup/component/pom.xml index 40f7e973..83531d4f 100644 --- a/modules/samples/connectedcup/component/pom.xml +++ b/modules/samples/connectedcup/component/pom.xml @@ -1,6 +1,6 @@ @@ -23,9 +23,9 @@ org.wso2.carbon.devicemgt-plugins - carbon-device-mgt-plugins-parent + device.mgt.iot.connectedcup-parent 1.9.2-SNAPSHOT - ../../pom.xml + ../pom.xml 4.0.0 @@ -61,4 +61,184 @@ - \ No newline at end of file + + + + + org.wso2.carbon + org.wso2.carbon.ndatasource.core + ${carbon.kernel.version} + system + + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_4.4.2.jar + + + + org.wso2.carbon.devicemgt-plugins + org.wso2.carbon.device.mgt.iot + ${carbon.iot.device.mgt.version} + system + + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.iot_1.9.2.SNAPSHOT.jar + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.core + ${carbon.device.mgt.version} + system + + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.core_0.9.2.SNAPSHOT.jar + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.common + ${carbon.device.mgt.version} + system + + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.common_0.9.2.SNAPSHOT.jar + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.certificate.mgt.core + ${carbon.device.mgt.version} + system + + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.certificate.mgt.core_0.9.2.SNAPSHOT.jar + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.apimgt.annotations + ${carbon.device.mgt.version} + system + + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.apimgt.annotations_0.9.2.SNAPSHOT.jar + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.analytics + ${carbon.device.mgt.version} + system + + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.analytics_0.9.2.SNAPSHOT.jar + + + + commons-httpclient.wso2 + commons-httpclient + ${commons-httpclient.orbit.version} + system + + ${basedir}/../../../../repository/components/plugins/commons-httpclient_3.1.0.wso2v2.jar + + + + org.wso2.carbon + org.wso2.carbon.utils + ${carbon.kernel.version} + + + org.bouncycastle.wso2 + bcprov-jdk15on + + + org.wso2.carbon + org.wso2.carbon.user.api + + + org.wso2.carbon + org.wso2.carbon.queuing + + + org.wso2.carbon + org.wso2.carbon.base + + + org.apache.axis2.wso2 + axis2 + + + org.igniterealtime.smack.wso2 + smack + + + org.igniterealtime.smack.wso2 + smackx + + + jaxen + jaxen + + + commons-fileupload.wso2 + commons-fileupload + + + org.apache.ant.wso2 + ant + + + org.apache.ant.wso2 + ant + + + commons-httpclient.wso2 + commons-httpclient + + + org.eclipse.equinox + javax.servlet + + + org.wso2.carbon + org.wso2.carbon.registry.api + + + system + + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_4.4.2.jar + + + + org.igniterealtime.smack.wso2 + smack + ${smack.wso2.version} + system + + ${basedir}/../../../../repository/components/plugins/smack_3.0.4.wso2v1.jar + + + + org.igniterealtime.smack.wso2 + smackx + ${smackx.wso2.version} + system + + ${basedir}/../../../../repository/components/plugins/smackx_3.0.4.wso2v1.jar + + + + org.json.wso2 + json + ${commons-json.version} + system + + ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar + + + + commons-codec + commons-codec + 1.4.0.wso2v1 + system + + ${basedir}/../../../../repository/components/plugins/commons-codec_1.4.0.wso2v1.jar + + + + + diff --git a/modules/samples/connectedcup/component/service/pom.xml b/modules/samples/connectedcup/component/service/pom.xml index f2308c21..b2cffd92 100644 --- a/modules/samples/connectedcup/component/service/pom.xml +++ b/modules/samples/connectedcup/component/service/pom.xml @@ -1,6 +1,6 @@ @@ -40,12 +40,10 @@ org.wso2.carbon.devicemgt org.wso2.carbon.device.mgt.common - provided org.wso2.carbon.devicemgt org.wso2.carbon.device.mgt.core - provided org.apache.axis2.wso2 @@ -57,7 +55,6 @@ org.wso2.carbon.devicemgt org.wso2.carbon.device.mgt.analytics - provided org.apache.axis2.wso2 @@ -69,7 +66,6 @@ org.wso2.carbon.devicemgt org.wso2.carbon.certificate.mgt.core - provided commons-codec.wso2 @@ -83,37 +79,30 @@ org.apache.cxf cxf-rt-frontend-jaxws - provided org.apache.cxf cxf-rt-frontend-jaxrs - provided org.apache.cxf cxf-rt-transports-http - provided org.eclipse.paho mqtt-client - provided org.apache.httpcomponents httpasyncclient - 4.1 - provided org.wso2.carbon.devicemgt-plugins org.wso2.carbon.device.mgt.iot - provided @@ -22,9 +22,9 @@ org.wso2.carbon.devicemgt-plugins - device-mgt-iot-connectedcup-feature + device.mgt.iot.connectedcup-parent 1.9.2-SNAPSHOT - ../component/pom.xml + ../pom.xml 4.0.0 @@ -141,4 +141,4 @@ - \ No newline at end of file + diff --git a/modules/samples/connectedcup/pom.xml b/modules/samples/connectedcup/pom.xml index 89c0b524..7e8b2ccc 100644 --- a/modules/samples/connectedcup/pom.xml +++ b/modules/samples/connectedcup/pom.xml @@ -1,6 +1,6 @@ @@ -20,24 +20,241 @@ - - org.wso2.carbon.devicemgt-plugins - carbon-device-mgt-plugins-parent - 1.9.2-SNAPSHOT - ../../pom.xml - - 4.0.0 - device-mgt-iot-connectedcup-feature - 1.9.2-SNAPSHOT + + org.wso2.carbon.devicemgt-plugins + device.mgt.iot.connectedcup-parent + 1.9.2-SNAPSHOT pom - WSO2 IoTS(Device Types) - Connected Cup - WSO2 IoTS(Device Types) - Connected Cup + WSO2 IoTS(Device Types) - Connected Cup + WSO2 IoTS(Device Types) - Connected Cup http://wso2.org + + + + org.eclipse.osgi + org.eclipse.osgi + ${eclipse.osgi.version} + provided + + + org.eclipse.equinox + org.eclipse.equinox.common + ${eclipse.equinox.common.version} + provided + + + org.testng + testng + ${testng.version} + + + junit + junit + + + org.beanshell + bsh + + + org.yaml + snakeyaml + + + provided + + + org.eclipse.osgi + org.eclipse.osgi.services + 3.3.100.v20120522-1822 + provided + + + org.wso2.carbon + org.wso2.carbon.logging + ${carbon.kernel.version} + + + org.apache.log4j.wso2 + log4j + + + commons-logging + commons-logging + + + org.wso2.carbon + org.wso2.carbon.bootstrap + + + provided + + + + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} + + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + + + + org.eclipse.paho + mqtt-client + ${paho.mqtt.version} + provided + + + org.codehaus.jackson + jackson-core-asl + ${jackson.version} + + + org.codehaus.jackson + jackson-jaxrs + ${jackson.version} + + + javax + javaee-web-api + 6.0 + provided + + + javax.ws.rs + jsr311-api + ${javax.ws.rs.version} + + + + org.apache.httpcomponents + httpasyncclient + 4.1 + provided + + + + + + + wso2.releases + WSO2 internal Repository + http://maven.wso2.org/nexus/content/repositories/releases/ + + true + daily + ignore + + + + + wso2.snapshots + Apache Snapshot Repository + http://maven.wso2.org/nexus/content/repositories/snapshots/ + + true + daily + + + false + + + + wso2-nexus + WSO2 internal Repository + http://maven.wso2.org/nexus/content/groups/wso2-public/ + + true + daily + ignore + + + + + + + + wso2-nexus + WSO2 internal Repository + http://maven.wso2.org/nexus/content/groups/wso2-public/ + + true + daily + ignore + + + + wso2.releases + WSO2 internal Repository + http://maven.wso2.org/nexus/content/repositories/releases/ + + true + daily + ignore + + + + wso2.snapshots + WSO2 Snapshot Repository + http://maven.wso2.org/nexus/content/repositories/snapshots/ + + true + daily + + + false + + + + wso2-staging + WSO2 internal Repository + http://maven.wso2.org/nexus/content/repositories/orgwso2carbonapimgt-174/ + + true + daily + ignore + + + + + + + 4.4.2 + 0.9.2-SNAPSHOT + 0.4.0 + 3.0.4.wso2v1 + 3.0.0.wso2v1 + 3.8.1.v20120830-144521 + 1.9.2-SNAPSHOT + 1.1.1 + + 3.0.4.wso2v1 + 3.0.4.wso2v1 + 2.6.1 + 1.9.0 + 3.1.0.wso2v2 + 3.0.0.wso2v1 + 3.6.100.v20120522-1841 + + component - feature + feature