diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml index f39f8a7221..85212b6543 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml @@ -52,7 +52,7 @@ ${project.artifactId} ${project.artifactId} - ${project.version} + ${carbon.mobile.device.mgt.version} Device Management Mobile Impl Bundle org.wso2.carbon.device.mgt.mobile.internal diff --git a/pom.xml b/pom.xml index b102978ca2..2e6e8961ae 100644 --- a/pom.xml +++ b/pom.xml @@ -351,7 +351,7 @@ org.wso2.carbon.mdm org.wso2.carbon.device.mgt.mobile.impl - ${project.version} + ${carbon.mobile.device.mgt.version} @@ -411,7 +411,7 @@ org.wso2.carbon org.wso2.carbon.apimgt.core - ${apim.version} + ${carbon.api.mgt.version} org.wso2.carbon @@ -422,7 +422,7 @@ org.wso2.carbon org.wso2.carbon.apimgt.api - ${apim.version} + ${carbon.api.mgt.version} com.googlecode.json-simple.wso2 @@ -433,7 +433,7 @@ org.wso2.carbon org.wso2.carbon.apimgt.impl - ${apim.version} + ${carbon.api.mgt.version} org.wso2.carbon @@ -614,17 +614,13 @@ 1.0.0-SNAPSHOT [1.0.0, 2.0.0) - 4.3.0-SNAPSHOT - 1.5.4 1.3 - - - 0.9.0.ALPHA6 + 0.9.0 1.0.0 1.2.0 1.1.0 @@ -646,10 +642,6 @@ 7.0.52.wso2v5 7.0.34.wso2v2 - - - 4.3.0-SNAPSHOT - 1.0.0-SNAPSHOT @@ -662,9 +654,6 @@ 4.3.4 - - 4.3.0-SNAPSHOT - 4.3.1 @@ -680,9 +669,6 @@ 4.3.0 - - 4.3.0-SNAPSHOT - 1.0.0-SNAPSHOT @@ -745,7 +731,7 @@ maven-release-plugin clean install - true + false @@ -896,6 +882,11 @@ http://maven.wso2.org/nexus/service/local/staging/deploy/maven2/ + + nexus-service-releases + WSO2 Release Service Repository + http://maven.wso2.org/nexus/service/local/repositories/releases/content/ + diff --git a/product/modules/distribution/pom.xml b/product/modules/distribution/pom.xml index 18a8de3915..cadb599581 100644 --- a/product/modules/distribution/pom.xml +++ b/product/modules/distribution/pom.xml @@ -216,18 +216,18 @@ - - - + + + - + + dir="${tempdir}/wso2mdm-${carbon.mobile.device.mgt.version}/repository/components"> target/site - wso2mdm-${project.version}/docs + wso2mdm-${carbon.mobile.device.mgt.version}/docs 755 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules - ${pom.artifactId}-${project.version}/modules/ + ${pom.artifactId}-${carbon.mobile.device.mgt.version}/modules/ **/carbon/ **/jaggery-test/ @@ -114,7 +114,7 @@ src/repository/conf - wso2mdm-${project.version}/repository/conf + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf **/api-manager.xml **/security/ @@ -125,7 +125,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/ - wso2mdm-${project.version}/repository/conf/security/ + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/security/ **/entitlement.properties **/trusted-idp-config.xml @@ -135,14 +135,14 @@ src/repository/conf/identity/ - wso2mdm-${project.version}/repository/conf/identity/ + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/identity/ **/** src/repository/conf/datasources - wso2mdm-${project.version}/repository/conf/datasources + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/datasources **/master-datasources.xml @@ -151,7 +151,7 @@ src/repository/resources - wso2mdm-${project.version}/repository/resources + wso2mdm-${carbon.mobile.device.mgt.version}/repository/resources */** @@ -159,7 +159,7 @@ src/repository/conf/data-bridge - wso2mdm-${project.version}/repository/conf/data-bridge + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/data-bridge 755 @@ -167,7 +167,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes - wso2mdm-${project.version}/lib/runtimes/ + wso2mdm-${carbon.mobile.device.mgt.version}/lib/runtimes/ */** @@ -176,7 +176,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider - wso2mdm-${project.version}/dbscripts/service-provider + wso2mdm-${carbon.mobile.device.mgt.version}/dbscripts/service-provider */** @@ -187,7 +187,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity - wso2mdm-${project.version}/dbscripts/identity + wso2mdm-${carbon.mobile.device.mgt.version}/dbscripts/identity */** @@ -198,7 +198,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt - wso2mdm-${project.version}/dbscripts/apimgt + wso2mdm-${carbon.mobile.device.mgt.version}/dbscripts/apimgt */** @@ -208,21 +208,21 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules - wso2mdm-${project.version}/modules/ + wso2mdm-${carbon.mobile.device.mgt.version}/modules/ */** src/repository/modules/encode - wso2mdm-${project.version}/modules/encode + wso2mdm-${carbon.mobile.device.mgt.version}/modules/encode */** src/repository/modules/sso - wso2mdm-${project.version}/modules/sso + wso2mdm-${carbon.mobile.device.mgt.version}/modules/sso */** @@ -231,7 +231,7 @@ ../distribution/src/repository/dbscripts/cdm - wso2mdm-${project.version}/dbscripts/cdm + wso2mdm-${carbon.mobile.device.mgt.version}/dbscripts/cdm */** @@ -240,14 +240,14 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources - ${project.artifactId}-${project.version}/repository/resources + ${project.artifactId}-${carbon.mobile.device.mgt.version}/repository/resources src/repository/jaggeryapps - wso2mdm-${project.version}/repository/deployment/server/jaggeryapps + wso2mdm-${carbon.mobile.device.mgt.version}/repository/deployment/server/jaggeryapps 755 @@ -265,7 +265,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/publisher/ - wso2mdm-${project.version}/repository/deployment/server/jaggeryapps/publisher + wso2mdm-${carbon.mobile.device.mgt.version}/repository/deployment/server/jaggeryapps/publisher publisherLogo/** publisherTheme/** @@ -276,7 +276,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/store/ - wso2mdm-${project.version}/repository/deployment/server/jaggeryapps/store + wso2mdm-${carbon.mobile.device.mgt.version}/repository/deployment/server/jaggeryapps/store storeLogo/** storeSite/** @@ -289,13 +289,13 @@ - wso2mdm-${project.version}/lib/endorsed + wso2mdm-${carbon.mobile.device.mgt.version}/lib/endorsed javax.el:el-api:jar - wso2mdm-${project.version}/repository/deployment/client/modules + wso2mdm-${carbon.mobile.device.mgt.version}/repository/deployment/client/modules org.hibernate.wso2:hibernate:jar @@ -335,7 +335,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml - wso2cdm-${project.version}/repository/conf/tomcat + wso2cdm-${carbon.mobile.device.mgt.version}/repository/conf/tomcat true 644 @@ -343,57 +343,57 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml - wso2cdm-${project.version}/repository/conf/tomcat + wso2cdm-${carbon.mobile.device.mgt.version}/repository/conf/tomcat true 644 --> src/repository/conf/tomcat/context.xml - wso2mdm-${project.version}/repository/conf/tomcat + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/tomcat true 644 INSTALL.txt - wso2mdm-${project.version} + wso2mdm-${carbon.mobile.device.mgt.version} true 644 README.txt - wso2mdm-${project.version} + wso2mdm-${carbon.mobile.device.mgt.version} true 644 LICENSE.txt - wso2mdm-${project.version} + wso2mdm-${carbon.mobile.device.mgt.version} true 644 release-notes.html - wso2mdm-${project.version} + wso2mdm-${carbon.mobile.device.mgt.version} true 644 target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt - wso2mdm-${project.version}/bin/ + wso2mdm-${carbon.mobile.device.mgt.version}/bin/ true 644 target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt - wso2mdm-${project.version}/bin/ + wso2mdm-${carbon.mobile.device.mgt.version}/bin/ true 644 @@ -403,7 +403,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml - wso2mdm-${project.version}/repository/conf/etc + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/etc true 644 @@ -413,7 +413,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml - wso2mdm-${project.version}/repository/conf + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf true 644 @@ -423,7 +423,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml - wso2mdm-${project.version}/repository/conf/security + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/security true 644 @@ -434,43 +434,43 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml - wso2mdm-${project.version}/repository/conf + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf true 644 src/repository/conf/multitenancy/cloud-services-desc.xml - wso2mdm-${project.version}/repository/conf/multitenancy/ + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/multitenancy/ true src/repository/conf/application-authenticators.xml - wso2mdm-${project.version}/repository/conf/security/ + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/security/ true 644 target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README - wso2mdm-${project.version}/repository/conf/ + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/ true 644 src/repository/conf/identity.xml - wso2mdm-${project.version}/repository/conf + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf 644 src/repository/conf/security/sso-idp-config.xml - wso2mdm-${project.version}/repository/conf/security + wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/security 644 diff --git a/product/modules/distribution/src/assembly/dist.xml b/product/modules/distribution/src/assembly/dist.xml index beff318242..d946d2f305 100644 --- a/product/modules/distribution/src/assembly/dist.xml +++ b/product/modules/distribution/src/assembly/dist.xml @@ -26,7 +26,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components - wso2mdm-${project.version}/repository/components + wso2mdm-${carbon.mobile.device.mgt.version}/repository/components **/eclipse.ini **/*.lock diff --git a/product/modules/distribution/src/assembly/docs.xml b/product/modules/distribution/src/assembly/docs.xml index 51539b58bb..ee8addd399 100644 --- a/product/modules/distribution/src/assembly/docs.xml +++ b/product/modules/distribution/src/assembly/docs.xml @@ -25,11 +25,11 @@ target/site - wso2cdm-${project.version}-docs + wso2mdm-${carbon.mobile.device.mgt.version}-docs ../../modules/documentation/src/site/xdoc/user-core - wso2mobileserver-${project.version}-docs/user-core + wso2mobileserver-${carbon.mobile.device.mgt.version}-docs/user-core 755 user-mgt-actdir.xml diff --git a/product/modules/integration/tests-ui-integration/pom.xml b/product/modules/integration/tests-ui-integration/pom.xml index 093c703582..ef9ab50aa5 100644 --- a/product/modules/integration/tests-ui-integration/pom.xml +++ b/product/modules/integration/tests-ui-integration/pom.xml @@ -62,7 +62,7 @@ carbon.zip - ${basedir}/../../distribution/target/wso2emm-${project.version}.zip + ${basedir}/../../distribution/target/wso2mdm-${carbon.mobile.device.mgt.version}.zip @@ -130,9 +130,9 @@ - org.wso2.emm - wso2emm - ${project.version} + org.wso2.carbon.mdm + wso2mdm + ${carbon.mobile.device.mgt.version} zip true ${basedir}/target/tobeCopied/ @@ -192,7 +192,7 @@ - ${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/resources/security/ + ${basedir}/target/tobeCopied/wso2mdm-${carbon.mobile.device.mgt.version}/repository/resources/security/ **/*.jks @@ -213,7 +213,7 @@ - ${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/conf/axis2/ + ${basedir}/target/tobeCopied/wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/axis2/ **/*.xml @@ -234,7 +234,7 @@ - ${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/deployment/client/modules + ${basedir}/target/tobeCopied/wso2mdm-${carbon.mobile.device.mgt.version}/repository/deployment/client/modules **/*.mar @@ -250,8 +250,8 @@ - org.wso2.emm - org.wso2.emm.integration.ui.pages + org.wso2.carbon.mdm + org.wso2.carbon.mdm.integration.ui.pages org.wso2.carbon.automation diff --git a/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/pom.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/pom.xml index ce4d4fca88..9102f02679 100644 --- a/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/pom.xml +++ b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/pom.xml @@ -182,7 +182,7 @@ - Creating site for ${project.version}. + Creating site for ${carbon.mobile.device.mgt.version}. website diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index ccfca8738e..deb80b56c4 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -366,7 +366,6 @@ ${jaggery.extensions.test.version} - org.wso2.carbon.apimgt.core.feature.group