Author: sumedha Date: Fri Jun 6 08:29:20 2008 New Revision: 18086 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18086
Log: Removing carbon & felix dependencies from WSAS 2.3.Added axis2-kernel & axis-adb dependencies Modified: branches/wsas/java/2.3/data-service-solution/modules/core/pom.xml branches/wsas/java/2.3/data-service-solution/modules/distribution/pom.xml branches/wsas/java/2.3/data-service-solution/modules/www/pom.xml branches/wsas/java/2.3/data-service-solution/pom.xml Modified: branches/wsas/java/2.3/data-service-solution/modules/core/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/data-service-solution/modules/core/pom.xml?rev=18086&r1=18085&r2=18086&view=diff ============================================================================== --- branches/wsas/java/2.3/data-service-solution/modules/core/pom.xml (original) +++ branches/wsas/java/2.3/data-service-solution/modules/core/pom.xml Fri Jun 6 08:29:20 2008 @@ -23,7 +23,7 @@ </repositories> <dependencies> - + <!-- <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> @@ -51,7 +51,18 @@ <version>1.0.0</version> <scope>provided</scope> </dependency> - + --> + <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-kernel</artifactId> + </dependency> + <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-adb</artifactId> + </dependency> + + <!-- Removing unwanted dependencies for wsas 2.3 release --> + <!-- <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.core</artifactId> @@ -61,7 +72,7 @@ <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.service</artifactId> </dependency> - + --> <dependency> <groupId>au.com.bytecode.opencsv</groupId> <artifactId>opencsv</artifactId> Modified: branches/wsas/java/2.3/data-service-solution/modules/distribution/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/data-service-solution/modules/distribution/pom.xml?rev=18086&r1=18085&r2=18086&view=diff ============================================================================== --- branches/wsas/java/2.3/data-service-solution/modules/distribution/pom.xml (original) +++ branches/wsas/java/2.3/data-service-solution/modules/distribution/pom.xml Fri Jun 6 08:29:20 2008 @@ -16,30 +16,35 @@ <description>WSO2 Data Services Distribution</description> <dependencies> - + <!-- <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>wso2carbon</artifactId> <version>SNAPSHOT</version> <type>zip</type> </dependency> - + --> <dependency> <groupId>org.wso2.dataservice</groupId> <artifactId>org.wso2.ws.dataservice</artifactId> <version>${pom.version}</version> </dependency> - + + <!-- commented to remove carbon dependency from wsas2.3 release --> + <!-- <dependency> <groupId>org.wso2.dataservice</groupId> <artifactId>org.wso2.solutions.ds.ui</artifactId> <version>${pom.version}</version> </dependency> + --> </dependencies> <build> <plugins> + <!-- commented to remove carbon dependency from wsas2.3 release --> + <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> @@ -67,7 +72,7 @@ </execution> </executions> </plugin> - + --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> Modified: branches/wsas/java/2.3/data-service-solution/modules/www/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/data-service-solution/modules/www/pom.xml?rev=18086&r1=18085&r2=18086&view=diff ============================================================================== --- branches/wsas/java/2.3/data-service-solution/modules/www/pom.xml (original) +++ branches/wsas/java/2.3/data-service-solution/modules/www/pom.xml Fri Jun 6 08:29:20 2008 @@ -16,7 +16,7 @@ <description>WSO2 Data Services Web</description> <dependencies> - +<!-- <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.core</artifactId> @@ -26,6 +26,7 @@ <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.component</artifactId> </dependency> + --> <dependency> <groupId>org.apache.felix</groupId> Modified: branches/wsas/java/2.3/data-service-solution/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/data-service-solution/pom.xml?rev=18086&r1=18085&r2=18086&view=diff ============================================================================== --- branches/wsas/java/2.3/data-service-solution/pom.xml (original) +++ branches/wsas/java/2.3/data-service-solution/pom.xml Fri Jun 6 08:29:20 2008 @@ -21,7 +21,10 @@ <modules> <module>modules/core</module> <module>modules/ide</module> + <!-- + if this module is included,carbon dependency cannot be removed. <module>modules/www</module> + --> <module>modules/distribution</module> </modules> @@ -50,8 +53,19 @@ <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> <version>${commons.pool.version}</version> - </dependency> - + </dependency> + <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-kernel</artifactId> + <version>${axis2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-adb</artifactId> + <version>${axis2.version}</version> + </dependency> + <!-- Removing unwanted dependencies for wsas 2.3 release --> + <!-- <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.core</artifactId> @@ -69,7 +83,6 @@ <artifactId>org.wso2.carbon.registry.service</artifactId> <version>SNAPSHOT</version> </dependency> - <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> @@ -129,6 +142,7 @@ <artifactId>servlet-api</artifactId> <version>2.4</version> </dependency> + --> </dependencies> </dependencyManagement> @@ -256,5 +270,6 @@ <commons.pool.version>1.3</commons.pool.version> <carbon.version>SNAPSHOT</carbon.version> <ds.solution.version>0.1alpha</ds.solution.version> + <axis2.version>1.4.01</axis2.version> </properties> </project> _______________________________________________ Wsas-java-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
