From 66971e4860770509a3d1166b11547d4c13056ad2 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Tue, 8 Mar 2016 15:52:09 +0530 Subject: [PATCH] removed conflicting jars that exports same packages --- modules/distribution/src/assembly/bin.xml | 19 ++++++++++++++++++- pom.xml | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index c478eb37..d9293494 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -90,8 +90,25 @@ **/plugins/org.wso2.carbon.endpoint.ui* **/plugins/org.wso2.carbon.inbound.ui* **/plugins/org.wso2.carbon.rest.api.ui* - + **/asm-all_4.1.0.wso2v1.jar + **/java-property-utils_1.9.0.wso2v1.jar + **/axis2-transport-jms_1.1.0.wso2v13.jar + **/axis2-transport-mail_1.1.0.wso2v13.jar + **/commons-digester_1.8.1.wso2v1.jar + **/org.apache.commons.configuration_1.10.0.jar + **/apache-zookeeper_3.3.4.wso2v1.jar + **/commons-configuration_1.6.0.wso2v1.jar + **/net.minidev.json-smart_1.2.0.jar + **/libthrift_0.7.0.wso2v2.jar + **/com.google.gson_2.3.1.jar + **/com.google.gson_2.2.4.jar + **/com.google.gson_2.1.0.jar + **/com.jayway.jsonpath_0.8.1.wso2v1.jar + **/json_1.0.0.wso2v1.jar + **/json_2.0.0.wso2v1.jar + **/bcprov-jdk15on_1.49.0.wso2v1.jar + **/xmlbeans_2.3.0.wso2v1.jar diff --git a/pom.xml b/pom.xml index bff2ec7d..711438a1 100644 --- a/pom.xml +++ b/pom.xml @@ -1079,7 +1079,7 @@ 1.0.0-wso2v3 1.0.9 1.0.0 - 2.0.11 + 2.0.12 4.3.5-SNAPSHOT 3.1.0.wso2v2