From 3070488adfbc3f96673be607902cb1ca89075476 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Tue, 24 Mar 2015 18:28:56 +0530 Subject: [PATCH] Fixing Pom issues --- .../org.wso2.carbon.device.mgt.core/pom.xml | 8 + .../pom.xml | 24 +- components/key-mgt/pom.xml | 4 +- .../org.wso2.carbon.policy.mgt.common/pom.xml | 4 + .../pom.xml | 16 +- pom.xml | 339 ++++++++++++++++-- 6 files changed, 354 insertions(+), 41 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 8f281832ed..32dc928532 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 @@ -110,6 +110,10 @@ org.eclipse.osgi org.eclipse.osgi + + org.eclipse.osgi + org.eclipse.osgi.services + org.wso2.carbon.devicemgt org.wso2.carbon.device.mgt.common @@ -187,6 +191,10 @@ org.wso2.carbon.apimgt org.wso2.carbon.apimgt.impl + + org.apache.axis2.wso2 + axis2 + 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 55393b1f8b..00994d2d1a 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 @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt key-mgt - 0.9.0-SNAPSHOT + 0.9.2-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.key.mgt.handler.valve - 0.9.0-SNAPSHOT + 0.9.2-SNAPSHOT bundle WSO2 Carbon - Key Management Handler Valve WSO2 Carbon - Key Management Handler Valve @@ -62,11 +62,15 @@ tomcat - org.wso2.carbon + org.apache.tomcat.wso2 + tomcat-servlet-api + + + org.wso2.carbon.apimgt org.wso2.carbon.apimgt.core - org.wso2.carbon + org.wso2.carbon.apimgt org.wso2.carbon.apimgt.impl @@ -77,6 +81,18 @@ org.wso2.carbon org.wso2.carbon.tomcat.ext + + org.apache.ws.commons.axiom.wso2 + axiom + + + org.wso2.carbon.identity + org.wso2.carbon.identity.base + + + org.wso2.carbon.identity + org.wso2.carbon.identity.core + diff --git a/components/key-mgt/pom.xml b/components/key-mgt/pom.xml index ad116a5a04..ec6d9094e6 100644 --- a/components/key-mgt/pom.xml +++ b/components/key-mgt/pom.xml @@ -24,14 +24,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 0.9.0-SNAPSHOT + 0.9.2-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt key-mgt - 0.9.0-SNAPSHOT + 0.9.2-SNAPSHOT pom WSO2 Carbon - Device Management Component http://wso2.org diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml index 1685a5b72a..6684c3f4a5 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml @@ -84,6 +84,10 @@ org.testng testng + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.common + org.wso2.carbon.devicemgt org.wso2.carbon.device.mgt.core diff --git a/components/user-mgt/org.wso2.carbon.device.mgt.user.core/pom.xml b/components/user-mgt/org.wso2.carbon.device.mgt.user.core/pom.xml index d7fdee7ade..df5431c666 100644 --- a/components/user-mgt/org.wso2.carbon.device.mgt.user.core/pom.xml +++ b/components/user-mgt/org.wso2.carbon.device.mgt.user.core/pom.xml @@ -72,6 +72,14 @@ + + org.eclipse.osgi + org.eclipse.osgi + + + org.eclipse.osgi + org.eclipse.osgi.services + org.wso2.carbon.devicemgt org.wso2.carbon.device.mgt.user.common @@ -84,10 +92,6 @@ org.wso2.carbon org.wso2.carbon.logging - - org.eclipse.osgi - org.eclipse.osgi - org.wso2.carbon.devicemgt org.wso2.carbon.device.mgt.common @@ -100,10 +104,6 @@ org.wso2.carbon org.wso2.carbon.core - - org.wso2.carbon - org.wso2.carbon.user.core - org.wso2.carbon org.wso2.carbon.user.api diff --git a/pom.xml b/pom.xml index 52d24f291b..0f70a3b211 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ components/device-mgt components/policy-mgt components/user-mgt + components/key-mgt features/device-mgt features/policy-mgt features/user-mgt @@ -51,6 +52,72 @@ org.wso2.carbon.devicemgt org.wso2.carbon.device.mgt.core ${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.common + + + org.wso2.carbon + org.wso2.carbon.utils + + + org.wso2.carbon + org.wso2.carbon.base + + + org.wso2.carbon + org.wso2.carbon.core + + + org.wso2.carbon + org.wso2.carbon.user.core + + + org.wso2.carbon + org.wso2.carbon.user.api + + + org.wso2.carbon + org.wso2.carbon.registry.api + + + org.wso2.carbon + org.wso2.carbon.registry.core + + + org.apache.tomcat.wso2 + jdbc-pool + + + org.wso2.carbon.governance + org.wso2.carbon.governance.api + + + org.apache.axis2.transport + axis2-transport-mail + + + org.apache.ws.commons.axiom + axiom-api + + + org.apache.ws.commons.axiom + axiom-impl + + + org.apache.ws.commons.axiom.wso2 + axiom + + + org.wso2.carbon.apimgt + org.wso2.carbon.apimgt.api + + + org.wso2.carbon.apimgt + org.wso2.carbon.apimgt.impl + + org.wso2.carbon.devicemgt @@ -87,11 +154,6 @@ org.wso2.carbon.device.mgt.user.common ${carbon.device.mgt.version} - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.mgt.user.common - ${carbon.device.mgt.version} - @@ -104,11 +166,83 @@ org.wso2.carbon org.wso2.carbon.registry.core ${carbon.kernel.version} + + + commons-io.wso2 + commons-io + + + net.sourceforge.findbugs + annotations + + + org.eclipse.osgi + org.eclipse.osgi.services + + + org.apache.ws.commons.schema.wso2 + XmlSchema + + + org.wso2.carbon + javax.cache.wso2 + + + org.wso2.carbon + org.wso2.carbon.registry.xboot + + + org.wso2.securevault + org.wso2.securevault + + + org.compass-project.wso2 + compass + + + org.apache.abdera.wso2 + abdera + + + org.wso2.carbon + org.wso2.carbon.ndatasource.rdbms + + + org.apache.poi.wso2 + poi-scratchpad + + + commons-httpclient.wso2 + commons-httpclient + + + commons-pool.wso2 + commons-pool + + org.wso2.carbon org.wso2.carbon.base ${carbon.kernel.version} + + + org.wso2.carbon + org.wso2.carbon.queuing + + + org.wso2.carbon + org.wso2.carbon.securevault + + + org.eclipse.equinox + javax.servlet + + + org.wso2.securevault + org.wso2.securevault + + org.wso2.carbon.governance @@ -156,7 +290,7 @@ axiom-impl - org.wso2.carbon.governance + org.wso2.carbon.registry org.wso2.carbon.registry.extensions @@ -380,16 +514,29 @@ ${orbit.version.h2.engine} - - org.apache.tomcat.wso2 - jdbc-pool - ${tomcat.jdbc.pooling.version} - - org.apache.axis2.transport axis2-transport-mail ${axis2-transports.version} + + + javax.mail + mail + + + org.apache.axis2 + axis2-transport-base + + + org.apache.axis2 + axis2-kernel + + + + + org.apache.axis2.wso2 + axis2 + ${axis2.orbit.version} @@ -450,19 +597,19 @@ org.wso2.carbon.governance.api - org.wso2.carbon + org.wso2.carbon.registry org.wso2.carbon.registry.ws.client - org.wso2.carbon + org.wso2.carbon.identity org.wso2.carbon.identity.core - org.wso2.carbon + org.wso2.carbon.identity org.wso2.carbon.identity.oauth - org.wso2.carbon + org.wso2.carbon.apimgt org.wso2.carbon.apimgt.keymgt.client @@ -470,7 +617,7 @@ poi-ooxml - org.wso2.carbon + org.wso2.carbon.mediation org.wso2.carbon.rest.api.stub @@ -482,19 +629,19 @@ h2-database-engine - org.wso2.carbon + org.wso2.carbon.apimgt org.wso2.carbon.apimgt.handlers.security.stub - org.wso2.carbon + org.wso2.carbon.commons org.wso2.carbon.user.mgt.stub - org.wso2.carbon + org.wso2.carbon.commons org.wso2.carbon.um.ws.api - org.wso2.carbon + org.wso2.carbon.mediation org.wso2.carbon.mediation.dependency.mgt @@ -502,7 +649,7 @@ gson - org.wso2.carbon + org.wso2.carbon.mediation org.wso2.carbon.mediation.registry @@ -510,23 +657,23 @@ httpmime - org.wso2.carbon + org.wso2.carbon.commons org.wso2.carbon.event.core - org.wso2.carbon + org.wso2.carbon.mediation org.wso2.carbon.sequences.stub - org.wso2.carbon + org.wso2.carbon.mediation org.wso2.carbon.mediation.security.stub - org.wso2.carbon + org.wso2.carbon.registry org.wso2.carbon.registry.indexing - org.wso2.carbon + org.wso2.carbon.apimgt org.wso2.carbon.apimgt.keymgt.stub @@ -541,10 +688,141 @@ org.apache.bsf bsf-all + + org.wso2.carbon.registry + org.wso2.carbon.registry.ws.client + + + + + org.wso2.carbon.apimgt + org.wso2.carbon.apimgt.core + ${carbon.api.mgt.version} + + + org.wso2.carbon + org.wso2.carbon.core + + + org.wso2.carbon.apimgt + org.wso2.carbon.apimgt.keymgt.stub + + + org.wso2.carbon.apimgt + org.wso2.carbon.apimgt.usage.publisher + + + org.wso2.carbon.apimgt + org.wso2.carbon.apimgt.gateway + + + org.wso2.carbon.commons + org.wso2.carbon.databridge.agent.thrift + + + org.wso2.carbon.multitenancy + org.wso2.carbon.tenant.usage.agent + + + org.wso2.carbon.apimgt + org.wso2.carbon.ganalytics.publisher + + + org.wso2.carbon.apimgt + org.wso2.carbon.throttle.core + + + + org.apache.tomcat.wso2 + tomcat + ${orbit.version.tomcat} + + + org.apache.tomcat + tomcat-dbcp + + + org.apache.tomcat + tomcat-jasper + + + org.apache.tomcat + tomcat-websocket-api + + + org.apache.tomcat.embed + tomcat-embed-core + + + org.apache.tomcat.embed + tomcat-embed-jasper + + + org.apache.tomcat.embed + tomcat-embed-websocket + + + + + org.wso2.carbon + org.wso2.carbon.tomcat.ext + ${carbon.kernel.version} + + + org.eclipse.equinox + org.eclipse.equinox.common + + + org.eclipse.equinox + org.eclipse.equinox.http.servlet + + + org.eclipse.equinox + javax.servlet + + + org.apache.tomcat.ha.wso2 + tomcat-catalina-ha + + + org.wso2.carbon + org.wso2.carbon.tomcat + + + org.wso2.carbon + org.wso2.carbon.user.core + + + + + org.apache.tomcat.wso2 + jdbc-pool + ${tomcat.jdbc.pooling.version} + + + org.apache.tomcat.wso2 + tomcat-servlet-api + ${orbit.version.tomcat.servlet.api} + + + + + + org.wso2.carbon.identity + org.wso2.carbon.identity.base + ${carbon.identity.version} + + + org.wso2.carbon.identity + org.wso2.carbon.identity.core + ${carbon.identity.version} + + + @@ -740,7 +1018,11 @@ 4.3.0 1.5.4 1.3 + + [1.6.1.wso2v11, 1.7.0) + 1.6.1.wso2v11 + 1.0.0.Final 1.5.4 @@ -762,7 +1044,10 @@ 3.8.1.v20120830-144521 1.2.140.wso2v3 + + 7.0.52.wso2v5 + 7.0.52.wso2v1 7.0.34.wso2v2