From aec835fc8a3f0ad29029036e2bf6f0960aea0b8b Mon Sep 17 00:00:00 2001 From: Niranjan-K Date: Wed, 3 Dec 2014 16:45:36 +0530 Subject: [PATCH] Removed patches from bin.xml --- .../org.wso2.carbon.device.mgt.core/pom.xml | 2 +- components/device-mgt/pom.xml | 2 +- .../modules/distribution/src/assembly/bin.xml | 71 ------------------- 3 files changed, 2 insertions(+), 73 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index 75240f3df7..e8790316fe 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon device-mgt - 2.0.0-SNAPSHOT + 4.2.0-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml index 0340cc35b2..c61e2ad8e2 100644 --- a/components/device-mgt/pom.xml +++ b/components/device-mgt/pom.xml @@ -31,7 +31,7 @@ 4.0.0 org.wso2.carbon device-mgt - 4.3.0-SNAPSHOT + 4.2.0-SNAPSHOT pom WSO2 Carbon - Device Management Component http://wso2.org diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml index fcc83cab7e..78ccfc0230 100644 --- a/product/modules/distribution/src/assembly/bin.xml +++ b/product/modules/distribution/src/assembly/bin.xml @@ -24,7 +24,6 @@ **/user-mgt.xml **/registry.xml **/axis2/axis2.xml - **/master-datasources.xml **/org.wso2.carbon.identity.relyingparty.ui-3.1.0.SNAPSHOT.jar **/org.wso2.carbon.identity.user.registration.ui-3.1.0.SNAPSHOT.jar @@ -411,76 +410,6 @@ wso2emm-${pom.version}/repository/conf/ true - - - ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0001/lib/org.wso2.carbon.server-${carbon.kernel.version}.jar - - ${pom.artifactId}-${pom.version}/lib/ - - - ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0001/dbscripts/db2.sql - ${pom.artifactId}-${pom.version}/dbscripts/ - 644 - - - ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0001/dbscripts/mysql.sql - - ${pom.artifactId}-${pom.version}/dbscripts/ - 644 - - - - ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0003/dbscripts/mysql_cluster.sql - - ${pom.artifactId}-${pom.version}/dbscripts/ - 644 - - - - - ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0002/repository/conf/security/cipher-text.properties - - ${pom.artifactId}-${pom.version}/repository/conf/security/ - - - - ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0002/repository/conf/security/cipher-tool.properties - - ${pom.artifactId}-${pom.version}/repository/conf/security/ - - - - ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0002/repository/conf/axis2/axis2.xml - - ${pom.artifactId}-${pom.version}/repository/conf/axis2/ - true - 644 - - - - ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0002/repository/conf/axis2/tenant-axis2.xml - - ${pom.artifactId}-${pom.version}/repository/conf/axis2/ - true - 644 - - - - ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0002/repository/conf/axis2/axis2_client.xml - - ${pom.artifactId}-${pom.version}/repository/conf/axis2/ - true - 644 - - - - ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0004/repository/conf/carbon.xml - - ${pom.artifactId}-${pom.version}/repository/conf/ - true - 644 - -