Repository: incubator-stratos Updated Branches: refs/heads/master 4fe5081d2 -> 3dbbb0d95
Changed parent of carbon ui pom to stratos dependents to avoid referring carbon parent Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3da0f758 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3da0f758 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3da0f758 Branch: refs/heads/master Commit: 3da0f75802d5e4e06b1b8ab0d0af2bfc4889952b Parents: 4fe5081 Author: Imesh Gunaratne <[email protected]> Authored: Tue Apr 22 17:23:11 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Apr 22 17:23:11 2014 +0530 ---------------------------------------------------------------------- dependencies/org.wso2.carbon.ui/pom.xml | 48 ++++++++++++++++------------ 1 file changed, 27 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3da0f758/dependencies/org.wso2.carbon.ui/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/org.wso2.carbon.ui/pom.xml b/dependencies/org.wso2.carbon.ui/pom.xml index d3688b6..800ddfa 100644 --- a/dependencies/org.wso2.carbon.ui/pom.xml +++ b/dependencies/org.wso2.carbon.ui/pom.xml @@ -18,9 +18,10 @@ <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.wso2.carbon</groupId> - <artifactId>carbon-kernel</artifactId> - <version>4.2.0</version> + <groupId>org.apache.stratos</groupId> + <artifactId>stratos-dependents</artifactId> + <version>4.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -45,36 +46,21 @@ </repository> </repositories> - <distributionManagement> - <repository> - <id>apache.releases.https</id> - <name>Apache Release Distribution Repository</name> - <url>https://repository.apache.org/service/local/staging/deploy/maven2</url> - </repository> - <snapshotRepository> - <id>apache.snapshots.https</id> - <name>${distMgmtSnapshotsName}</name> - <url>${distMgmtSnapshotsUrl}</url> - </snapshotRepository> - </distributionManagement> - - <properties> - <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName> - <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl> - </properties> - <dependencies> <dependency> <groupId>org.eclipse.osgi</groupId> <artifactId>org.eclipse.osgi</artifactId> + <version>${version.equinox.osgi}</version> </dependency> <dependency> <groupId>org.eclipse.osgi</groupId> <artifactId>org.eclipse.osgi.services</artifactId> + <version>${version.equinox.osgi.services}</version> </dependency> <dependency> <groupId>org.apache.ws.commons.axiom.wso2</groupId> <artifactId>axiom</artifactId> + <version>${orbit.version.axiom}</version> </dependency> <dependency> <groupId>org.apache.tiles.wso2</groupId> @@ -144,10 +130,12 @@ <dependency> <groupId>org.apache.axis2.wso2</groupId> <artifactId>axis2</artifactId> + <version>${version.axis2.json}</version> </dependency> <dependency> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.http.servlet</artifactId> + <version>${version.equinox.http.servlet}</version> <exclusions> <exclusion> <groupId>javax.servlet</groupId> @@ -172,6 +160,7 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.core.commons.stub</artifactId> + <version>${carbon.platform.version}</version> </dependency> <dependency> <groupId>javax.servlet.jsp.jstl.wso2</groupId> @@ -199,6 +188,23 @@ </dependency> </dependencies> + <properties> + <carbon.platform.version>4.2.0</carbon.platform.version> + <version.equinox.jasper>2.2.2.v201205150955</version.equinox.jasper> + <version.equinox.javax.servlet>3.0.0.v201112011016</version.equinox.javax.servlet> + <version.equinox.http.servlet>1.1.300.v20120522-1841</version.equinox.http.servlet> + <version.equinox.javax.servlet.jsp>2.2.0.v201112011158</version.equinox.javax.servlet.jsp> + <orbit.version.jstl>1.2.1.wso2v2</orbit.version.jstl> + <imp.pkg.version.axis2>[1.6.1.wso2v1, 1.7.0)</imp.pkg.version.axis2> + <imp.pkg.version.axiom>[1.2.11.wso2v4, 1.3.0)</imp.pkg.version.axiom> + <imp.pkg.version.javax.servlet>[2.6.0, 3.0.0)</imp.pkg.version.javax.servlet> + <imp.pkg.version.javax.servlet.jsp>[2.2.0, 2.3.0)</imp.pkg.version.javax.servlet.jsp> + <version.equinox.osgi>3.8.1.v20120830-144521</version.equinox.osgi> + <version.equinox.osgi.services>3.3.100.v20120522-1822</version.equinox.osgi.services> + <orbit.version.axiom>1.2.11.wso2v4</orbit.version.axiom> + <version.axis2.json>1.6.1.wso2v10</version.axis2.json> + </properties> + <build> <plugins> <plugin>
