Author: ptahchiev Date: Sun Jan 18 08:03:15 2009 New Revision: 735481 URL: http://svn.apache.org/viewvc?rev=735481&view=rev Log: classifier added to the ivy resolver and also some dependencies added as provided.
Modified: jakarta/cactus/trunk/samples/ivysettings.xml jakarta/cactus/trunk/samples/pom.xml Modified: jakarta/cactus/trunk/samples/ivysettings.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ivysettings.xml?rev=735481&r1=735480&r2=735481&view=diff ============================================================================== --- jakarta/cactus/trunk/samples/ivysettings.xml (original) +++ jakarta/cactus/trunk/samples/ivysettings.xml Sun Jan 18 08:03:15 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <settings defaultResolver="local-maven2"> - <property name="local-maven2-pattern" value="file:${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision].[ext]" + <property name="local-maven2-pattern" value="file:${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]" override="true" /> <resolvers> <url name="local-maven2" m2compatible="true"> Modified: jakarta/cactus/trunk/samples/pom.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/pom.xml?rev=735481&r1=735480&r2=735481&view=diff ============================================================================== --- jakarta/cactus/trunk/samples/pom.xml (original) +++ jakarta/cactus/trunk/samples/pom.xml Sun Jan 18 08:03:15 2009 @@ -33,92 +33,110 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cactus</groupId> <artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId> <version>${version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.6.2</version> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>jsp-api</artifactId> <version>2.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>httpunit</groupId> <artifactId>httpunit</artifactId> <version>1.6</version> + <scope>provided</scope> </dependency> <dependency> <groupId>net.sourceforge.htmlunit</groupId> <artifactId>htmlunit</artifactId> <version>1.14</version> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>1.1.2</version> + <scope>provided</scope> </dependency> <dependency> <groupId>taglibs</groupId> <artifactId>standard</artifactId> <version>1.1.2</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.ivy</groupId> <artifactId>ivy</artifactId> <version>2.0.0-beta1</version> + <scope>provided</scope> </dependency> <!-- Required by HtmlUnit --> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>1.4</version> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>2.3</version> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> <version>3.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>1.3</version> + <scope>provided</scope> </dependency> <dependency> <groupId>tomcat</groupId> <artifactId>jasper-runtime</artifactId> <version>5.5.9</version> + <scope>provided</scope> </dependency> <dependency> <groupId>tomcat</groupId> <artifactId>jasper-compiler</artifactId> <version>5.5.9</version> + <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.2</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.ivy</groupId> <artifactId>ivy</artifactId> <version>2.0.0-beta1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>ant</groupId> <artifactId>ant-junit</artifactId> <version>1.6.5</version> + <scope>provided</scope> </dependency> </dependencies> <profiles> --------------------------------------------------------------------- To unsubscribe, e-mail: cactus-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: cactus-dev-h...@jakarta.apache.org