Merge pull request #105 from charithag/master

Fix json library version
9 years ago · f630876d7a
parent 3246c14935 16a8e63497
commit f630876d7a
13 changed files with 8 additions and 8 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>
@ -260,4 +260,4 @@
            </dependency>
        </dependencies>
    </dependencyManagement>
-</project>
+</project>
--- 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>
@ -280,4 +280,4 @@
        <module>analytics</module>
        <module>ui</module>
    </modules>
-</project>
+</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>
@ -265,4 +265,4 @@
        <module>analytics</module>
        <module>ui</module>
    </modules>
-</project>
+</project>
--- a/modules/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/pom.xml
@ -20,7 +20,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-parent</artifactId>
+        <artifactId>wso2cdmf-tools</artifactId>
        <version>1.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>