Author: keith Date: Tue Mar 10 21:35:48 2009 New Revision: 32013 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=32013
Log: Changing carbon version to 1.5.1 Modified: trunk/mashup/java/modules/distribution/pom.xml trunk/mashup/java/pom.xml Modified: trunk/mashup/java/modules/distribution/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/distribution/pom.xml?rev=32013&r1=32012&r2=32013&view=diff ============================================================================== --- trunk/mashup/java/modules/distribution/pom.xml (original) +++ trunk/mashup/java/modules/distribution/pom.xml Tue Mar 10 21:35:48 2009 @@ -18,19 +18,19 @@ <dependency> <groupId>org.wso2.mashup</groupId> <artifactId>org.wso2.mashup.styles</artifactId> - <version>${pom.version}</version> + <version>${mashup.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.jsservices</artifactId> - <version>${carbon.version}</version> + <version>${mashup.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.mashup-utils</artifactId> - <version>${pom.version}</version> + <version>${mashup.version}</version> </dependency> <dependency> @@ -42,19 +42,19 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.javascript.hostobjects.session</artifactId> - <version>${carbon.version}</version> + <version>${mashup.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.javascript.hostobjects.request</artifactId> - <version>${carbon.version}</version> + <version>${mashup.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.javascript.hostobjects.system</artifactId> - <version>${carbon.version}</version> + <version>${mashup.version}</version> </dependency> <dependency> @@ -489,7 +489,7 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.axis2.jibx</artifactId> - <version>1.4.1-wso2</version> + <version>${axis2.version}</version> </dependency> <dependency> @@ -502,13 +502,13 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.axis2.jaxbri</artifactId> - <version>1.4.1-wso2</version> + <version>${axis2.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.axis2.json</artifactId> - <version>1.4.1-wso2</version> + <version>${axis2.json.version}</version> </dependency> <dependency> @@ -540,7 +540,7 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.eventing.savan</artifactId> - <version>${carbon.version}</version> + <version>${savan.version}</version> </dependency> <dependency> @@ -601,7 +601,7 @@ <artifactItem> <groupId>org.wso2.carbon</groupId> <artifactId>wso2carbon</artifactId> - <version>SNAPSHOT</version> + <version>${carbon.version}</version> <type>zip</type> <overWrite>true</overWrite> <outputDirectory>target</outputDirectory> @@ -609,7 +609,7 @@ <artifactItem> <groupId>org.wso2.carbon</groupId> <artifactId>wso2carbon</artifactId> - <version>SNAPSHOT</version> + <version>${carbon.version}</version> <type>zip</type> <overWrite>true</overWrite> <classifier>sources</classifier> Modified: trunk/mashup/java/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/pom.xml?rev=32013&r1=32012&r2=32013&view=diff ============================================================================== --- trunk/mashup/java/pom.xml (original) +++ trunk/mashup/java/pom.xml Tue Mar 10 21:35:48 2009 @@ -1,6 +1,13 @@ <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";> + 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-parent</artifactId> + <version>1.5.1</version> + </parent> + <modelVersion>4.0.0</modelVersion> <groupId>org.wso2.mashup</groupId> <artifactId>mashup-parent</artifactId> @@ -23,118 +30,6 @@ <module>modules/distribution</module> </modules> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.core</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.ui</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.core</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.mgt.ui.search</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.ui.search</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.mgt.ui.resources</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.ui.resources</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.ui.common</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>1.0.3</version> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>1.0.0</version> - </dependency> - - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.equinox.http.servlet</artifactId> - <version>2.2.2</version> - </dependency> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.equinox.http.helper</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.equinox.jsp.jasper</artifactId> - <version>1.0.1.R33x_v20070816</version> - </dependency> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>javax.servlet.jsp</artifactId> - <version>2.0.0.v200706191603</version> - </dependency> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>org.apache.jasper</artifactId> - <version>5.5.17.v200706111724</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet-api.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.swt</groupId> - <artifactId>org.eclipse.swt</artifactId> - <version>${eclipse.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.swt</groupId> - <artifactId>org.eclipse.swt.win32.win32.x86</artifactId> - <version>${eclipse.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jface</groupId> - <artifactId>org.eclipse.jface</artifactId> - <version>${eclipse.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <scm> <connection>scm:svn:https://wso2.org/repos/wso2/trunk/mashup/java</connection> <developerConnection>scm:svn:https://wso2.org/repos/wso2/trunk/mashup/java</developerConnection> @@ -218,11 +113,12 @@ </issueManagement> <properties> - <carbon.version>SNAPSHOT</carbon.version> - <axiom-e4x.version>SNAPSHOT</axiom-e4x.version> - <eclipse.version>3.2.0</eclipse.version> - <servlet-api.version>2.4</servlet-api.version> - <synapse.version>1.2.wso2v1</synapse.version> + <carbon.version>1.5.1</carbon.version> + <axis2.json.version>1.4.1-wso2</axis2.json.version> + <axiom-e4x.version>SNAPSHOT</axiom-e4x.version> + <mashup.version>SNAPSHOT</mashup.version> + <synapse.version>1.2.wso2v2</synapse.version> + <savan.version>1.0wso2v2</savan.version> </properties> <mailingLists> _______________________________________________ Mashup-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
