From e98fc6c48df4ef11105e51e6e4bd5b9043c5d659 Mon Sep 17 00:00:00 2001 From: Niranjan-K Date: Wed, 3 Dec 2014 17:42:16 +0530 Subject: [PATCH] Changed carbon version to 4.3.0-SNAPSHOT --- .../org.wso2.carbon.device.mgt.core/pom.xml | 2 +- components/device-mgt/pom.xml | 2 +- .../modules/distribution/src/assembly/bin.xml | 55 +------------------ .../src/assembly/filter.properties | 8 +-- 4 files changed, 7 insertions(+), 60 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 e8790316feb..75240f3df74 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 - 4.2.0-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml index c61e2ad8e22..7e9fe17b30e 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.2.0-SNAPSHOT + 2.0.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 40398b4555d..3a3fbc673aa 100644 --- a/product/modules/distribution/src/assembly/bin.xml +++ b/product/modules/distribution/src/assembly/bin.xml @@ -42,7 +42,7 @@ - ../p2-profile-gen/target/wso2carbon-core-4.3.0/dbscripts/identity/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/ wso2emm-${project.version}/dbscripts/identity @@ -192,20 +192,6 @@ */** - - src/repository/dbscripts/storage - wso2emm-${project.version}/dbscripts/storage - - */** - - - - src/repository/dbscripts/apimgt - wso2emm-${project.version}/dbscripts/apimgt - - */** - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider @@ -214,18 +200,6 @@ */** - - - ../apps/productapipublisher/ - - ${pom.artifactId}-${project.version}/repository/deployment/server/jaggeryapps/productapipublisher - - - - ../apps/productapistore/ - ${pom.artifactId}-${project.version}/repository/deployment/server/jaggeryapps/productapistore - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules wso2emm-${project.version}/modules/ @@ -330,28 +304,7 @@ true 644 - - src/repository/conf/carbon.xml - wso2emm-${project.version}/repository/conf/ - true - - - src/repository/conf/registry.xml - wso2emm-${project.version}/repository/conf/ - true - - - - src/repository/conf/wso2emm.jks - wso2emm-${project.version}/repository/resources/security - true - - - src/repository/conf/cipher-tool.properties - wso2emm-${project.version}/repository/conf/security/ - true - src/repository/resources/policies/xacml/default/admin.xml @@ -398,12 +351,6 @@ wso2emm-${project.version}/repository/database 644 - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml - - wso2emm-${project.version}/repository/conf/ - true - diff --git a/product/modules/distribution/src/assembly/filter.properties b/product/modules/distribution/src/assembly/filter.properties index 4c1aba4b900..bd8f07d1e08 100644 --- a/product/modules/distribution/src/assembly/filter.properties +++ b/product/modules/distribution/src/assembly/filter.properties @@ -1,7 +1,7 @@ -product.name= WSO2 Enterprise Mobility Manager (EMM) -product.version=1.1.0 +product.name=WSO2 Connected Device Manager +product.version=2.0.0-SNAPSHOT product.key=EMM hotdeployment=true hotupdate=true -carbon.version=4.2.0 -default.server.role=MobilePlatform +carbon.version=4.3.0 +default.server.role=CDMPlatform