Fixing dependencies found while doing a clean repo build
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/61ca8d40 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/61ca8d40 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/61ca8d40 Branch: refs/heads/master Commit: 61ca8d4044b50c65e56ebdde1344e646f975971d Parents: 517ffbf Author: Imesh Gunaratne <[email protected]> Authored: Fri Jan 16 18:17:45 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Jan 16 18:20:57 2015 +0530 ---------------------------------------------------------------------- .../pom.xml | 157 ++++++++++--------- .../pom.xml | 109 ++++++------- features/manager/pom.xml | 27 ++-- 3 files changed, 149 insertions(+), 144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/61ca8d40/features/manager/common/org.apache.stratos.common.server.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml index f368ea4..b9cfd42 100644 --- a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml +++ b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml @@ -17,7 +17,8 @@ # specific language governing permissions and limitations # under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.stratos</groupId> @@ -36,48 +37,48 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> - </dependency> - <!--dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.landing.page.deployer</artifactId> - <version>${project.version}</version> - </dependency--> + <version>${project.version}</version> + </dependency> + <!--dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.landing.page.deployer</artifactId> + <version>${project.version}</version> + </dependency--> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.activation</artifactId> - <version>${project.version}</version> + <version>${project.version}</version> </dependency> - <!--<dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.sample.installer</artifactId> - <version>${stratos.version}</version> - </dependency>--> + <!--<dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.sample.installer</artifactId> + <version>${stratos.version}</version> + </dependency>--> <!--<dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.tenant.activity</artifactId> - </dependency>--> -<!-- - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.dispatcher</artifactId> - <version>${project.version}</version> - </dependency> ---> + </dependency>--> + <!-- + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.tenant.dispatcher</artifactId> + <version>${project.version}</version> + </dependency> + --> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.redirector.servlet</artifactId> - <version>2.2.1</version> + <version>2.2.1</version> </dependency> <!--<dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.throttling.agent</artifactId> </dependency>--> - <!--dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.throttling.agent.stub</artifactId> - <version>${project.version}</version> - </dependency--> + <!--dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.throttling.agent.stub</artifactId> + <version>${project.version}</version> + </dependency--> <!--<dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.usage.agent</artifactId> @@ -90,12 +91,12 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.task</artifactId> - <version>${wso2carbon.version}</version> + <version>${wso2carbon.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.application.upload</artifactId> - <version>${wso2carbon.version}</version> + <version>${wso2carbon.version}</version> </dependency> <dependency> <groupId>org.apache.synapse</groupId> @@ -103,40 +104,39 @@ <version>${synapse.patch.version.212-wso2v2}</version> </dependency> - <!-- Tenant Mgmt --> + <!-- Tenant Mgmt --> <dependency> - <groupId>org.json.wso2</groupId> - <artifactId>json</artifactId> - <version>${json.patch.version.200-wso2v1}</version> + <groupId>org.json.wso2</groupId> + <artifactId>json</artifactId> + <version>${json.patch.version.200-wso2v1}</version> </dependency> - - <dependency> - <groupId>kaptcha.wso2</groupId> - <artifactId>kaptcha</artifactId> - <version>${kaptcha.patch.version.230-wso2v1}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.keystore.mgt</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.captcha.mgt</artifactId> - <version>${wso2carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.theme.mgt</artifactId> - <version>2.2.0</version> - </dependency> + <dependency> + <groupId>kaptcha.wso2</groupId> + <artifactId>kaptcha</artifactId> + <version>${kaptcha.patch.version.230-wso2v1}</version> + </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.keystore.mgt</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.captcha.mgt</artifactId> + <version>${wso2carbon.version}</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.theme.mgt</artifactId> + <version>2.2.0</version> + </dependency> </dependencies> <build> <plugins> - <plugin> + <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> <execution> @@ -152,11 +152,11 @@ <directory>resources</directory> <includes> <include>conf/cloud-services-desc.xml</include> - <include>conf/multitenancy-packages.xml</include> - <include>conf/identity.xml</include> - <include>conf/tenant-mgt.xml</include> - <include>conf/stratos.xml</include> - <include>conf/usage-throttling-agent-config.xml</include> + <include>conf/multitenancy-packages.xml</include> + <include>conf/identity.xml</include> + <include>conf/tenant-mgt.xml</include> + <include>conf/stratos.xml</include> + <include>conf/usage-throttling-agent-config.xml</include> <include>p2.inf</include> <include>build.properties</include> </includes> @@ -193,34 +193,35 @@ <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet:2.2.1</bundleDef> <bundleDef>org.apache.stratos:org.apache.stratos.activation:${project.version}</bundleDef> <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.sample.installer:${stratos.version}</bundleDef>--> -<!-- - <bundleDef>org.apache.stratos:org.apache.stratos.tenant.dispatcher</bundleDef> ---> + <!-- + <bundleDef>org.apache.stratos:org.apache.stratos.tenant.dispatcher</bundleDef> + --> <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.agent</bundleDef>--> - <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.agent.stub</bundleDef>--> + <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.agent.stub</bundleDef>--> <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.usage.agent</bundleDef>--> <bundleDef>org.wso2.carbon:org.wso2.carbon.stratos.landing.page.deployer</bundleDef> - <bundleDef>org.quartz-scheduler.wso2:quartz</bundleDef> + <bundleDef>org.quartz-scheduler.wso2:quartz</bundleDef> <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.activity</bundleDef>--> <bundleDef>org.wso2.carbon:org.wso2.carbon.task</bundleDef> <bundleDef>org.apache.synapse:synapse-tasks</bundleDef> - - + + <!-- Tenant Mgmt --> <bundleDef>org.json.wso2:json</bundleDef> - <bundleDef>kaptcha.wso2:kaptcha</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt</bundleDef> - <bundleDef>org.wso2.carbon:org.wso2.carbon.captcha.mgt</bundleDef> - <bundleDef>org.wso2.carbon:org.wso2.carbon.theme.mgt:2.2.0</bundleDef> + <bundleDef>kaptcha.wso2:kaptcha</bundleDef> + <bundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt</bundleDef> + <bundleDef>org.wso2.carbon:org.wso2.carbon.captcha.mgt</bundleDef> + <bundleDef>org.wso2.carbon:org.wso2.carbon.theme.mgt:2.2.0</bundleDef> <!-- End Tenant Mgmt --> - </bundles> <importBundles> <importBundleDef>org.wso2.carbon:org.wso2.carbon.application.upload</importBundleDef> </importBundles> <importFeatures> <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef> - <importFeatureDef>org.wso2.carbon.identity.authenticator.saml2.sso.server:${wso2carbon.version}</importFeatureDef> + <importFeatureDef> + org.wso2.carbon.identity.authenticator.saml2.sso.server:${wso2carbon.version} + </importFeatureDef> </importFeatures> </configuration> </execution> @@ -230,9 +231,9 @@ </build> <properties> - <synapse.patch.version.212-wso2v2>2.1.1-wso2v5</synapse.patch.version.212-wso2v2> - <json.patch.version.200-wso2v1>2.0.0.wso2v1</json.patch.version.200-wso2v1> - <kaptcha.patch.version.230-wso2v1>2.3.0.wso2v1</kaptcha.patch.version.230-wso2v1> - </properties> + <synapse.patch.version.212-wso2v2>2.1.1-wso2v5</synapse.patch.version.212-wso2v2> + <json.patch.version.200-wso2v1>2.0.0.wso2v1</json.patch.version.200-wso2v1> + <kaptcha.patch.version.230-wso2v1>2.3.0.wso2v1</kaptcha.patch.version.230-wso2v1> + </properties> </project> http://git-wip-us.apache.org/repos/asf/stratos/blob/61ca8d40/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml b/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml index 480c0c0..07d6305 100644 --- a/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml +++ b/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml @@ -17,7 +17,8 @@ # specific language governing permissions and limitations # under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.stratos</groupId> @@ -32,48 +33,48 @@ <url>http://apache.org</url> <description>This feature contains the bundles required for Front-end servlet functionality</description> - <dependencies> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.redirector.servlet.ui</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.sso.redirector.ui</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.google.analytics.ui</artifactId> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId> - <version>4.2.0</version> - </dependency> - <!-- Tenant Mgmt --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.tenant.mgt.ui</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.common.stub</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.theme.mgt.ui</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.theme.mgt.stub</artifactId> - <version>4.2.0</version> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.redirector.servlet.ui</artifactId> + <version>2.2.0</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.sso.redirector.ui</artifactId> + <version>2.2.0</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.google.analytics.ui</artifactId> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId> + <version>4.2.0</version> + </dependency> + <!-- Tenant Mgmt --> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.tenant.mgt.ui</artifactId> + <version>2.2.0</version> + </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.common.stub</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.theme.mgt.ui</artifactId> + <version>2.2.0</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.theme.mgt.stub</artifactId> + <version>4.2.0</version> + </dependency> + </dependencies> <build> <plugins> <plugin> @@ -93,25 +94,27 @@ <adviceFile> <properties> <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef> - <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef> + <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef> </properties> </adviceFile> <bundles> <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet.ui</bundleDef> - <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet.stub:4.2.0</bundleDef> + <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet.stub:4.2.0</bundleDef> <bundleDef>org.wso2.carbon:org.wso2.carbon.sso.redirector.ui</bundleDef> <bundleDef>org.wso2.carbon:org.wso2.carbon.google.analytics.ui</bundleDef> - - <!-- Tenant Mgmt--> - <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.ui</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.common.stub</bundleDef> - <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.stub</bundleDef> - <!-- Tenant Mgmt End--> - + + <!-- Tenant Mgmt--> + <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.ui</bundleDef> + <bundleDef>org.apache.stratos:org.apache.stratos.common.stub</bundleDef> + <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.stub</bundleDef> + <!-- Tenant Mgmt End--> + </bundles> <importFeatures> <importFeatureDef>org.wso2.carbon.core.ui:${wso2carbon.version}</importFeatureDef> - <importFeatureDef>org.wso2.carbon.identity.authenticator.saml2.sso.ui:${wso2carbon.version}</importFeatureDef> + <importFeatureDef> + org.wso2.carbon.identity.authenticator.saml2.sso.ui:${wso2carbon.version} + </importFeatureDef> </importFeatures> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/stratos/blob/61ca8d40/features/manager/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/pom.xml b/features/manager/pom.xml index c7a3557..fcaf93f 100644 --- a/features/manager/pom.xml +++ b/features/manager/pom.xml @@ -18,7 +18,8 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.stratos</groupId> @@ -35,11 +36,11 @@ <url>http://apache.org</url> <modules> - <module>stratos-mgt</module> + <module>stratos-mgt</module> <module>common</module> -<!-- - <module>tenant-mgt</module> ---> + <!-- + <module>tenant-mgt</module> + --> <module>gapp</module> <!--module>throttling</module--> <!--module>usage</module--> @@ -54,12 +55,12 @@ <properties> <stratos.version>2.1.0</stratos.version> - <synapse.version>2.1.0-wso2v6</synapse.version> + <synapse.version>2.1.0-wso2v6</synapse.version> <carbon.version>4.2.0</carbon.version> <quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version> - <carbon.p2.plugin.version>1.5</carbon.p2.plugin.version> + <carbon.p2.plugin.version>1.5</carbon.p2.plugin.version> </properties> - + <dependencyManagement> <dependencies> <dependency> @@ -77,17 +78,17 @@ <artifactId>org.wso2.carbon.redirector.servlet</artifactId> <version>2.2.1</version> </dependency> - <dependency> + <!-- dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.redirector.servlet.ui</artifactId> <version>2.2.0</version> - </dependency> + </dependency --> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> <version>${project.version}</version> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.stratos.landing.page.deployer</artifactId> <version>${stratos.version}</version> @@ -102,7 +103,7 @@ <artifactId>org.apache.stratos.tenant.activity</artifactId> <version>${project.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.throttling.agent.stub</artifactId> <version>${project.version}</version>
