Merge branch 'master' of https://github.com/charithag/product-iot-server

# Conflicts: # modules/samples/doormanager/component/pom.xml
9 years ago · dc3540f2ef
parent 07ebc9f783 6029428336
commit dc3540f2ef
12 changed files with 14 additions and 14 deletions
--- a/modules/distribution/src/repository/patches/patch0001/org.wso2.carbon.analytics.dataservice.core_1.0.4.jar
+++ b/modules/distribution/src/repository/patches/patch0001/org.wso2.carbon.analytics.dataservice.core_1.0.4.jar
--- a/modules/distribution/src/repository/patches/patch0002/org.wso2.carbon.analytics.spark.core_1.0.4.jar
+++ b/modules/distribution/src/repository/patches/patch0002/org.wso2.carbon.analytics.spark.core_1.0.4.jar
--- a/modules/distribution/src/repository/patches/patch0003/andes_3.0.1.jar
+++ b/modules/distribution/src/repository/patches/patch0003/andes_3.0.1.jar
--- a/modules/distribution/src/repository/patches/patch0003/hadoop-client_2.6.0.wso2v2.jar
+++ b/modules/distribution/src/repository/patches/patch0003/hadoop-client_2.6.0.wso2v2.jar
--- a/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.analytics.spark.core_1.0.4.jar
+++ b/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.analytics.spark.core_1.0.4.jar
--- a/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.agent_5.0.6.jar
+++ b/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.agent_5.0.6.jar
--- a/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.commons.thrift_5.0.6.jar
+++ b/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.commons.thrift_5.0.6.jar
--- a/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.receiver.thrift_5.0.6.jar
+++ b/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.receiver.thrift_5.0.6.jar
--- a/modules/samples/connectedcup/component/pom.xml
+++ b/modules/samples/connectedcup/component/pom.xml
@ -248,7 +248,7 @@
                <version>${commons-json.version}</version>
                <scope>system</scope>
                <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar
+                    ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
                </systemPath>
            </dependency>
            <dependency>
--- a/modules/samples/currentsensor/component/pom.xml
+++ b/modules/samples/currentsensor/component/pom.xml
@ -241,7 +241,7 @@
                <version>${commons-json.version}</version>
                <scope>system</scope>
                <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar
+                    ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
                </systemPath>
            </dependency>
            <dependency>
--- a/modules/samples/doormanager/component/pom.xml
+++ b/modules/samples/doormanager/component/pom.xml
@ -236,7 +236,7 @@
                <version>${commons-json.version}</version>
                <scope>system</scope>
                <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar
+                    ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
                </systemPath>
            </dependency>
            <dependency>
@ -273,11 +273,11 @@
            </dependency>
        </dependencies>
    </dependencyManagement>
-    <modules>
+  <modules>
-        <module>plugin</module>
+    <module>plugin</module>
-        <module>controller</module>
+    <module>controller</module>
-        <module>manager</module>
+    <module>manager</module>
-        <module>analytics</module>
+    <module>analytics</module>
-        <module>ui</module>
+    <module>ui</module>
-    </modules>
+  </modules>
 </project>
--- a/modules/samples/firealarm/component/pom.xml
+++ b/modules/samples/firealarm/component/pom.xml
@ -239,7 +239,7 @@
                <version>${commons-json.version}</version>
                <scope>system</scope>
                <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar
+                    ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
                </systemPath>
            </dependency>
            <dependency>