# Conflicts:
#	modules/samples/doormanager/component/pom.xml
merge-requests/1/head
charithag 9 years ago
commit dc3540f2ef

@ -248,7 +248,7 @@
<version>${commons-json.version}</version> <version>${commons-json.version}</version>
<scope>system</scope> <scope>system</scope>
<systemPath> <systemPath>
${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
</systemPath> </systemPath>
</dependency> </dependency>
<dependency> <dependency>

@ -241,7 +241,7 @@
<version>${commons-json.version}</version> <version>${commons-json.version}</version>
<scope>system</scope> <scope>system</scope>
<systemPath> <systemPath>
${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
</systemPath> </systemPath>
</dependency> </dependency>
<dependency> <dependency>

@ -236,7 +236,7 @@
<version>${commons-json.version}</version> <version>${commons-json.version}</version>
<scope>system</scope> <scope>system</scope>
<systemPath> <systemPath>
${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
</systemPath> </systemPath>
</dependency> </dependency>
<dependency> <dependency>

@ -239,7 +239,7 @@
<version>${commons-json.version}</version> <version>${commons-json.version}</version>
<scope>system</scope> <scope>system</scope>
<systemPath> <systemPath>
${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
</systemPath> </systemPath>
</dependency> </dependency>
<dependency> <dependency>

Loading…
Cancel
Save