Author: keith Date: Thu May 14 21:32:58 2009 New Revision: 35819 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=35819
Log: Fixing dependancy versions and also getting rid of the carbon sources pack dependancy Modified: trunk/mashup/java/modules/distribution/bin.xml trunk/mashup/java/modules/distribution/pom.xml trunk/mashup/java/modules/integration/pom.xml trunk/mashup/java/modules/styles/pom.xml trunk/mashup/java/pom.xml Modified: trunk/mashup/java/modules/distribution/bin.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/distribution/bin.xml?rev=35819&r1=35818&r2=35819&view=diff ============================================================================== --- trunk/mashup/java/modules/distribution/bin.xml (original) +++ trunk/mashup/java/modules/distribution/bin.xml Thu May 14 21:32:58 2009 @@ -181,7 +181,7 @@ <outputDirectory>wso2mashup-${pom.version}/resources/security</outputDirectory> <filtered>false</filtered> </file> - <file> + <!--file> <source>target/sources/wso2-carbon-components-${carbon.version}-src/org.wso2.carbon.transport.jms-sources-java-source/src/main/resources/jms-transports.xml</source> <outputDirectory>wso2mashup-${pom.version}/conf/</outputDirectory> <filtered>true</filtered> @@ -192,6 +192,6 @@ <outputDirectory>wso2mashup-${pom.version}/conf/</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> - </file> + </file--> </files> </assembly> Modified: trunk/mashup/java/modules/distribution/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/distribution/pom.xml?rev=35819&r1=35818&r2=35819&view=diff ============================================================================== --- trunk/mashup/java/modules/distribution/pom.xml (original) +++ trunk/mashup/java/modules/distribution/pom.xml Thu May 14 21:32:58 2009 @@ -5,7 +5,7 @@ <parent> <groupId>org.wso2.mashup</groupId> <artifactId>mashup-parent</artifactId> - <version>SNAPSHOT</version> + <version>1.6.0.SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -312,18 +312,12 @@ <version>${carbon.version}</version> </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.abdera</artifactId> - <version>0.4.0</version> - </dependency> - <!-- TODO all other Carbon --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.authenticator</artifactId> - <version>0.7</version> + <dependency> + <groupId>org.wso2.commons.wso2</groupId> + <artifactId>authenticator</artifactId> + <version>${authenticator.version}</version> </dependency> @@ -396,7 +390,7 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.logging.ext</artifactId> - <version>SNAPSHOT</version> + <version>${carbon.version}</version> </dependency> --> <dependency> @@ -654,7 +648,7 @@ <dependency> <groupId>rhino.wso2</groupId> <artifactId>js</artifactId> - <version>1.6R7-wso2v1</version> + <version>${rhino.version}</version> </dependency> <!-- Module dependencies --> @@ -674,7 +668,7 @@ <dependency> <groupId>org.apache.ws.savan.wso2</groupId> <artifactId>savan-core</artifactId> - <version>1.0-wso2v1</version> + <version>${savan.version}</version> </dependency> <dependency> @@ -705,13 +699,13 @@ <dependency> <groupId>org.apache.axis.wso2</groupId> <artifactId>axis</artifactId> - <version>1.4-wso2v1</version> + <version>${axis.version}</version> </dependency> <dependency> <groupId>org.springframework.ws.wso2</groupId> <artifactId>spring.framework</artifactId> - <version>2.5.1-wso2v1</version> + <version>${spring.version}</version> </dependency> </dependencies> @@ -739,16 +733,7 @@ <type>zip</type> <overWrite>true</overWrite> <outputDirectory>target</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.wso2.carbon</groupId> - <artifactId>wso2carbon</artifactId> - <version>${carbon.version}</version> - <type>zip</type> - <overWrite>true</overWrite> - <classifier>sources</classifier> - <outputDirectory>target/sources</outputDirectory> - </artifactItem> + </artifactItem> </artifactItems> </configuration> </execution> Modified: trunk/mashup/java/modules/integration/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/integration/pom.xml?rev=35819&r1=35818&r2=35819&view=diff ============================================================================== --- trunk/mashup/java/modules/integration/pom.xml (original) +++ trunk/mashup/java/modules/integration/pom.xml Thu May 14 21:32:58 2009 @@ -5,7 +5,7 @@ <parent> <groupId>org.wso2.mashup</groupId> <artifactId>mashup-parent</artifactId> - <version>SNAPSHOT</version> + <version>1.6.0.SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/mashup/java/modules/styles/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/styles/pom.xml?rev=35819&r1=35818&r2=35819&view=diff ============================================================================== --- trunk/mashup/java/modules/styles/pom.xml (original) +++ trunk/mashup/java/modules/styles/pom.xml Thu May 14 21:32:58 2009 @@ -5,7 +5,7 @@ <parent> <groupId>org.wso2.mashup</groupId> <artifactId>mashup-parent</artifactId> - <version>SNAPSHOT</version> + <version>1.6.0.SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/mashup/java/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/pom.xml?rev=35819&r1=35818&r2=35819&view=diff ============================================================================== --- trunk/mashup/java/pom.xml (original) +++ trunk/mashup/java/pom.xml Thu May 14 21:32:58 2009 @@ -12,7 +12,7 @@ <groupId>org.wso2.mashup</groupId> <artifactId>mashup-parent</artifactId> <packaging>pom</packaging> - <version>SNAPSHOT</version> + <version>1.6.0.SNAPSHOT</version> <name>WSO2 Mashup Server</name> <url>http://wso2.org/projects/mashup</url> <description>WSO2 Mashup Server</description> @@ -115,25 +115,32 @@ <properties> <carbon.version>1.6.0.SNAPSHOT</carbon.version> - <axis2.json.version>1.5-wso2v1</axis2.json.version> + <axis2.json.version>1.5.0.wso2v1</axis2.json.version> <axiom-e4x.version>SNAPSHOT</axiom-e4x.version> - <mashup.version>SNAPSHOT</mashup.version> + <mashup.version>1.6.0.SNAPSHOT</mashup.version> <synapse.version>1.2.wso2v2</synapse.version> - <quartz.version>1.6.0-wso2v1</quartz.version> + <quartz.version>1.6.0.wso2v1</quartz.version> <httpunit.version>1.6.1</httpunit.version> <tidy.version>SNAPSHOT</tidy.version> - <rome.version>0.9-wso2v1</rome.version> - <jdom.version>1.0-wso2v1</jdom.version> - <abdera.version>0.4.0-wso2v1</abdera.version> - <webharvest.version>1.0-wso2v1</webharvest.version> - <htmlcleaner.version>1.55-wso2v1</htmlcleaner.version> - <bsh.version>1.3.0-wso2v1</bsh.version> - <saxon.version>8.7-wso2v1</saxon.version> - <jml.version>1.0b3-wso2v1</jml.version> - <cindy.version>2.4.4-wso2v1</cindy.version> - <socks.version>1.01-wso2v1</socks.version> - <joscar.version>2007.11.10-wso2v1</joscar.version> - <smack.version>3.0.4-wso2v1</smack.version> + <rome.version>0.9.0.wso2v1</rome.version> + <jdom.version>1.0.0.wso2v1</jdom.version> + <abdera.version>0.4.0.wso2v1</abdera.version> + <webharvest.version>1.0.0.wso2v1</webharvest.version> + <htmlcleaner.version>1.55.0.wso2v1</htmlcleaner.version> + <bsh.version>1.3.0.wso2v1</bsh.version> + <saxon.version>8.7.0.wso2v1</saxon.version> + <jml.version>1.0.0.b3-wso2v1</jml.version> + <cindy.version>2.4.4.wso2v1</cindy.version> + <socks.version>1.01.0.wso2v1</socks.version> + <joscar.version>2007.11.10.wso2v1</joscar.version> + <smack.version>3.0.4.wso2v1</smack.version> + + <authenticator.version>0.7.0.wso2v1</authenticator.version> + <savan.version>1.0.0.wso2v2</savan.version> + <axis.version>1.4.0.wso2v1</axis.version> + <spring.version>2.5.1.wso2v1</spring.version> + <maven.version>2.0-alpha-4</maven.version> + <rhino.version>1.6.0.R7-wso2v1</rhino.version> </properties> <mailingLists> _______________________________________________ Mashup-dev mailing list Mashup-dev@wso2.org https://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
