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 3fc4816388..8c713d3697 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 @@ -21,13 +21,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> device-mgt - org.wso2.carbon + org.wso2.carbon.mdm 2.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.mdm org.wso2.carbon.device.mgt.mobile.impl 2.0.0-SNAPSHOT bundle @@ -97,7 +97,7 @@ org.wso2.carbon.logging - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.device.mgt.common diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml index 342dfbfc54..0d12ee7e9a 100644 --- a/components/device-mgt/pom.xml +++ b/components/device-mgt/pom.xml @@ -22,14 +22,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.carbon + org.wso2.carbon.mdm wso2mdm-parent 2.0.0-SNAPSHOT ../../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.mdm device-mgt 2.0.0-SNAPSHOT pom diff --git a/components/key-mgt/org.wso2.carbon.key.mgt.handler.valve/pom.xml b/components/key-mgt/org.wso2.carbon.key.mgt.handler.valve/pom.xml index b53ef4bba9..cf4496324b 100644 --- a/components/key-mgt/org.wso2.carbon.key.mgt.handler.valve/pom.xml +++ b/components/key-mgt/org.wso2.carbon.key.mgt.handler.valve/pom.xml @@ -20,14 +20,14 @@ - org.wso2.carbon + org.wso2.carbon.mdm key-mgt 2.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.mdm org.wso2.carbon.key.mgt.handler.valve 2.0.0-SNAPSHOT bundle diff --git a/components/key-mgt/pom.xml b/components/key-mgt/pom.xml index 2ffc219ae5..06123abe11 100644 --- a/components/key-mgt/pom.xml +++ b/components/key-mgt/pom.xml @@ -22,14 +22,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.carbon + org.wso2.carbon.mdm wso2mdm-parent 2.0.0-SNAPSHOT ../../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.mdm key-mgt 2.0.0-SNAPSHOT pom diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml index 0ef1dd711e..4945d0bff4 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.wso2.carbon + org.wso2.carbon.mdm device-mgt-feature 2.0.0-SNAPSHOT ../pom.xml @@ -37,11 +37,11 @@ - org.wso2.carbon + org.wso2.carbon.mdm org.wso2.carbon.device.mgt.mobile.impl - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.device.mgt.common diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml index b120629c32..1d436fab8f 100644 --- a/features/device-mgt/pom.xml +++ b/features/device-mgt/pom.xml @@ -22,14 +22,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.carbon + org.wso2.carbon.mdm wso2mdm-parent 2.0.0-SNAPSHOT ../../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.mdm device-mgt-feature 2.0.0-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index 7f6cf9ecb4..dadf6b5184 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.wso2.carbon + org.wso2.carbon.mdm wso2mdm-parent pom 2.0.0-SNAPSHOT @@ -44,6 +44,10 @@ + + + + org.wso2.carbon.automation org.wso2.carbon.automation.engine @@ -57,23 +61,27 @@ test - org.wso2.carbon - org.wso2.carbon.integration.common.extensions - ${stub.version} + org.wso2.carbon.automation + org.wso2.carbon.automation.extensions + ${test.framework.version} test - org.wso2.carbon.automation - org.wso2.carbon.automation.extensions + org.wso2.carbon + org.wso2.carbon.integration.common.extensions ${test.framework.version} test + org.wso2.carbon org.wso2.carbon.integration.common.admin.client - ${stub.version} + ${test.automation.stub.version} test + + + org.wso2.carbon org.wso2.carbon.user.core @@ -109,64 +117,6 @@ - - org.wso2.carbon - org.wso2.carbon.device.mgt.core - ${cdm.core.version} - - - org.wso2.carbon - org.wso2.carbon.device.mgt.common - ${cdm.core.version} - - - - org.wso2.carbon - org.wso2.carbon.device.mgt.mobile.impl - ${project.version} - - - - org.wso2.carbon - org.wso2.carbon.policy.mgt.common - ${cdm.core.version} - - - org.wso2.carbon - org.wso2.carbon.policy.mgt.core - ${cdm.core.version} - - - - - org.eclipse.osgi - org.eclipse.osgi - ${eclipse.osgi.version} - - - org.eclipse.equinox - org.eclipse.equinox.common - ${eclipse.equinox.common.version} - - - org.testng - testng - ${testng.version} - - - junit - junit - - - org.beanshell - bsh - - - org.yaml - snakeyaml - - - org.wso2.carbon org.wso2.carbon.utils @@ -295,16 +245,109 @@ org.wso2.carbon.ndatasource.rdbms ${carbon.kernel.version} + + org.wso2.carbon + org.wso2.carbon.tomcat.ext + ${carbon.kernel.version} + + + org.wso2.carbon + org.wso2.carbon.tomcat + ${carbon.kernel.version} + + + + + + + org.wso2.carbon.cdm + org.wso2.carbon.device.mgt.core + ${cdm.core.version} + + + org.wso2.carbon.cdm + org.wso2.carbon.device.mgt.common + ${cdm.core.version} + + + org.wso2.carbon + org.wso2.carbon.policy.mgt.common + ${cdm.core.version} + + + org.wso2.carbon + org.wso2.carbon.policy.mgt.core + ${cdm.core.version} + + + + + + + org.wso2.carbon.mdm + org.wso2.carbon.device.mgt.mobile.impl + ${project.version} + + + + + + org.eclipse.osgi + org.eclipse.osgi + ${eclipse.osgi.version} + + + org.eclipse.equinox + org.eclipse.equinox.common + ${eclipse.equinox.common.version} + + + org.testng + testng + ${testng.version} + + + junit + junit + + + org.beanshell + bsh + + + org.yaml + snakeyaml + + + org.eclipse.osgi org.eclipse.osgi.services 3.3.100.v20120522-1822 + + + + com.h2database.wso2 h2-database-engine - ${orbit.version.h2.engine} + ${orbit.h2.engine.version} + + + org.apache.tomcat.wso2 + tomcat + ${orbit.tomcat.version} + + org.apache.tomcat.wso2 + jdbc-pool + ${orbit.tomcat.jdbc.pooling.version} + + + + + org.wso2.carbon org.wso2.carbon.apimgt.core @@ -438,26 +481,70 @@ + + + - org.apache.tomcat.wso2 - tomcat - ${orbit.version.tomcat} + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} - org.wso2.carbon - org.wso2.carbon.tomcat.ext - ${carbon.kernel.version} + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} - org.wso2.carbon - org.wso2.carbon.tomcat - ${carbon.kernel.version} + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} - org.apache.tomcat.wso2 - jdbc-pool - ${tomcat.jdbc.pooling.version} + org.codehaus.jackson + jackson-jaxrs + ${jackson.version} + + + javax.ws.rs + jsr311-api + ${javax.ws.rs.version} + provided + + + + + + org.apache.wss4j + wss4j-ws-security-common + 2.0.0 + + + org.bouncycastle + bcpkix-jdk15on + 1.49 + + + org.bouncycastle + bcprov-jdk15on + 1.49 + + + org.codehaus.plexus + plexus-utils + 3.0.21 + + + com.madgag.spongycastle + pkix + 1.51.0.0 + + + org.apache.cxf + cxf-rt-ws-security + 2.6.1 + + @@ -472,39 +559,252 @@ [1.0.0, 2.0.0) - 6.1.1 - 4.3.0-SNAPSHOT + + 1.5.4 + + 1.3 - [1.6.1.wso2v11, 1.7.0) - 1.0.0.Final - 1.5.4 - 2.0.0-SNAPSHOT + + + 0.9.0-SNAPSHOT - 1.1.0 - 1.0.0 - 1.0.0 - 1.1.0-SNAPSHOT - 1.1.0-SNAPSHOT - 1.1.0 + 1.1.0 + 1.0.0 + 1.0.0 + 1.1.0-SNAPSHOT + 1.1.0-SNAPSHOT + 1.1.0 + 4.3.1 6.8 - 4.3.0-SNAPSHOT + 4.3.0-SNAPSHOT 1.1.0 3.6.100.v20120522-1841 3.8.1.v20120830-144521 - 1.2.140.wso2v3 + + + 1.2.140.wso2v3 + 7.0.52.wso2v5 + 7.0.34.wso2v2 + + + 4.3.0-SNAPSHOT - 7.0.52.wso2v5 - 7.0.34.wso2v2 + + + 1.0.0-SNAPSHOT + + + 2.6.1 + 1.9.0 + 1.1.1 + + + https://github.com/wso2/product-mdm.git + scm:git:https://github.com/wso2/product-mdm.git + scm:git:https://github.com/wso2/product-mdm.git + HEAD + + + + + + + org.apache.maven.wagon + wagon-ssh + 2.1 + + + + + + org.jvnet.maven.incrementalbuild + incremental-build-plugin + 1.3 + + + + incremental-build + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.1 + + UTF-8 + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-release-plugin + + clean install + true + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + + + org.apache.felix + maven-scr-plugin + 1.7.2 + + + generate-scr-scrdescriptor + + scr + + + + + + org.apache.felix + maven-bundle-plugin + 2.3.5 + true + + NONE + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + verify + + jar-no-fork + + + + + + maven-assembly-plugin + 2.2-beta-2 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.4 + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + + + + + + wso2.releases + WSO2 internal Repository + http://maven.wso2.org/nexus/content/repositories/releases/ + + true + daily + ignore + + + + + wso2.snapshots + Apache Snapshot Repository + http://maven.wso2.org/nexus/content/repositories/snapshots/ + + true + daily + + + false + + + + wso2-nexus + WSO2 internal Repository + http://maven.wso2.org/nexus/content/groups/wso2-public/ + + true + daily + ignore + + + + + + + + + wso2-nexus + WSO2 internal Repository + http://maven.wso2.org/nexus/content/groups/wso2-public/ + + true + daily + ignore + + + + + wso2.releases + WSO2 internal Repository + http://maven.wso2.org/nexus/content/repositories/releases/ + + true + daily + ignore + + + + + wso2.snapshots + WSO2 Snapshot Repository + http://maven.wso2.org/nexus/content/repositories/snapshots/ + + true + daily + + + false + + + + + nexus-releases + WSO2 Release Distribution Repository + http://maven.wso2.org/nexus/service/local/staging/deploy/maven2/ + + + diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml index 2d58915833..3349333bd3 100644 --- a/product/modules/distribution/src/assembly/bin.xml +++ b/product/modules/distribution/src/assembly/bin.xml @@ -326,7 +326,7 @@ 755 - ../tools/mdm-android-agent-archetype/readme.txt + ../tools/mdm-android-agent-archetype/README.txt wso2mdm-${pom.version}/repository/tools 755 diff --git a/product/modules/mobileservices/agents/android/jax-rs/pom.xml b/product/modules/mobileservices/agents/android/jax-rs/pom.xml index 808416943a..d9e56e6962 100644 --- a/product/modules/mobileservices/agents/android/jax-rs/pom.xml +++ b/product/modules/mobileservices/agents/android/jax-rs/pom.xml @@ -124,11 +124,6 @@ org.apache.cxf cxf-rt-transports-http - - junit - junit - test - javax.ws.rs jsr311-api @@ -141,22 +136,24 @@ org.wso2.carbon - org.wso2.carbon.device.mgt.common + org.wso2.carbon.logging provided - org.wso2.carbon - org.wso2.carbon.device.mgt.core - provided + org.codehaus.jackson + jackson-jaxrs + + - org.wso2.carbon - org.wso2.carbon.logging + org.wso2.carbon.cdm + org.wso2.carbon.device.mgt.common provided - org.codehaus.jackson - jackson-jaxrs + org.wso2.carbon.cdm + org.wso2.carbon.device.mgt.core + provided diff --git a/product/modules/mobileservices/agents/windows/jax-rs/pom.xml b/product/modules/mobileservices/agents/windows/jax-rs/pom.xml index 1f54fe8210..955ce8d422 100644 --- a/product/modules/mobileservices/agents/windows/jax-rs/pom.xml +++ b/product/modules/mobileservices/agents/windows/jax-rs/pom.xml @@ -124,11 +124,6 @@ org.apache.cxf cxf-rt-transports-http - - junit - junit - test - javax.ws.rs jsr311-api @@ -139,16 +134,7 @@ org.wso2.carbon.utils provided - - org.wso2.carbon - org.wso2.carbon.device.mgt.common - provided - - - org.wso2.carbon - org.wso2.carbon.device.mgt.core - provided - + org.wso2.carbon org.wso2.carbon.logging @@ -157,36 +143,41 @@ org.apache.wss4j wss4j-ws-security-common - 2.0.0 org.bouncycastle bcpkix-jdk15on - 1.49 org.bouncycastle bcprov-jdk15on - 1.49 org.codehaus.plexus plexus-utils - 3.0.21 com.madgag.spongycastle pkix - 1.51.0.0 org.apache.cxf cxf-rt-ws-security - 2.6.1 org.codehaus.jackson jackson-jaxrs + + org.wso2.carbon.cdm + org.wso2.carbon.device.mgt.common + provided + + + org.wso2.carbon.cdm + org.wso2.carbon.device.mgt.core + provided + + diff --git a/product/modules/mobileservices/pom.xml b/product/modules/mobileservices/pom.xml index 5d7b134e41..0916e9005f 100644 --- a/product/modules/mobileservices/pom.xml +++ b/product/modules/mobileservices/pom.xml @@ -17,46 +17,4 @@ agents/windows/jax-rs agents/android/jax-rs - - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - org.apache.cxf - cxf-rt-transports-http - ${cxf.version} - - - junit - junit - test - ${junit.version} - - - org.codehaus.jackson - jackson-jaxrs - ${jackson.version} - - - javax.ws.rs - jsr311-api - ${javax.ws.rs.version} - provided - - - - - 2.6.1 - 4.8.2 - 1.9.0 - 1.1.1 - \ No newline at end of file diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index c21c737512..d75ed686a7 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -119,22 +119,22 @@ org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version} - org.jaggeryjs.modules:carbon.feature:${carbon.feature.version} + org.jaggeryjs.modules:carbon.feature:${jaggery.carbon.module.version} - org.jaggeryjs.modules:process.feature:${process.feature.version} + org.jaggeryjs.modules:process.feature:${jaggery.process.module.version} - org.jaggeryjs.modules:uuid.feature:${uuid.feature.version} + org.jaggeryjs.modules:uuid.feature:${jaggery.uuid.module.version} - org.jaggeryjs.modules:sso.feature:${sso.feature.version} + org.jaggeryjs.modules:sso.feature:${jaggery.sso.feature.version} - org.jaggeryjs.modules:i18n.feature:${sso.feature.version} + org.jaggeryjs.modules:i18n.feature:${jaggery.i18n.feature.version} - org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version} + org.jaggeryjs.modules:jaggery-test.feature:${jaggery.test.feature.version} org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.platform.version} @@ -357,27 +357,27 @@ org.jaggeryjs.modules.carbon.feature.group - ${carbon.feature.version} + ${jaggery.carbon.module.version} org.jaggeryjs.modules.process.feature.group - ${process.feature.version} + ${jaggery.process.module.version} org.jaggeryjs.modules.uuid.feature.group - ${uuid.feature.version} + ${jaggery.uuid.module.version} org.jaggeryjs.modules.sso.feature.group - ${sso.feature.version} + ${jaggery.sso.feature.version} org.jaggeryjs.modules.i18n.feature.group - ${i18n.feature.version} + ${jaggery.i18n.feature.version} org.jaggeryjs.modules.jaggery-test.feature.group - ${jaggery-test.feature.version} + ${jaggery.test.feature.version} org.wso2.carbon.transport.mgt.feature.group diff --git a/product/modules/rest-api/pom.xml b/product/modules/rest-api/pom.xml index 354dbdb2d9..a0571b9972 100644 --- a/product/modules/rest-api/pom.xml +++ b/product/modules/rest-api/pom.xml @@ -1,159 +1,159 @@ - - org.wso2.mdmserver - wso2mdmserver-product - 2.0.0-SNAPSHOT - ../../pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + org.wso2.mdmserver + wso2mdmserver-product + 2.0.0-SNAPSHOT + ../../pom.xml + - 4.0.0 - org.wso2.carbon - wso2cdm-api - war - 1.0.0-SNAPSHOT - WSO2 CDM REST API - http://maven.apache.org + 4.0.0 + org.wso2.carbon + wso2cdm-api + war + 1.0.0-SNAPSHOT + WSO2 CDM REST API + http://maven.apache.org - - - - maven-compiler-plugin - - 1.5 - 1.5 - - 2.3.2 - - - maven-war-plugin - 2.2 - - WEB-INF/lib/*cxf*.jar - ${project.artifactId} - - - - - - - - deploy - - compile + - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - compile - - run - + + maven-compiler-plugin + + 1.5 + 1.5 + + 2.3.2 + + + maven-war-plugin + 2.2 - - - - - - - + WEB-INF/lib/*cxf*.jar + ${project.artifactId} - - - + - - + - - client - - test - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - test - - java - - - - - - - - + + + deploy + + compile + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + compile + + run + + + + + + + + + + + + + + + + + + + client + + test + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + test + + java + + + + + + + + - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - org.apache.cxf - cxf-rt-transports-http - ${cxf.version} - - - junit - junit - test - ${junit.version} - - - commons-httpclient - commons-httpclient - 3.1 - provided - - - javax.ws.rs - jsr311-api - 1.1.1 - provided - - - org.wso2.carbon - org.wso2.carbon.utils - provided - - - org.wso2.carbon - org.wso2.carbon.device.mgt.common - provided - - - org.wso2.carbon - org.wso2.carbon.device.mgt.core - provided - - - org.wso2.carbon - org.wso2.carbon.logging - provided - - - org.codehaus.jackson - jackson-jaxrs - 1.9.0 - - - - 2.6.1 - 4.8.2 - + + + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + + + junit + junit + test + ${junit.version} + + + commons-httpclient + commons-httpclient + 3.1 + provided + + + javax.ws.rs + jsr311-api + 1.1.1 + provided + + + org.wso2.carbon + org.wso2.carbon.utils + provided + + + org.wso2.carbon + org.wso2.carbon.logging + provided + + + org.codehaus.jackson + jackson-jaxrs + 1.9.0 + + + org.wso2.carbon.cdm + org.wso2.carbon.device.mgt.common + provided + + + org.wso2.carbon.cdm + org.wso2.carbon.device.mgt.core + provided + + + + 2.6.1 + 4.8.2 + \ No newline at end of file diff --git a/product/modules/tools/mdm-android-agent-archetype/readme.txt b/product/modules/tools/mdm-android-agent-archetype/README.txt similarity index 100% rename from product/modules/tools/mdm-android-agent-archetype/readme.txt rename to product/modules/tools/mdm-android-agent-archetype/README.txt diff --git a/product/pom.xml b/product/pom.xml index 4ca27abfab..06f91aea15 100644 --- a/product/pom.xml +++ b/product/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.carbon + org.wso2.carbon.mdm wso2mdm-parent 2.0.0-SNAPSHOT ../pom.xml