Author: imario Date: Sun Nov 12 11:30:48 2006 New Revision: 474019 URL: http://svn.apache.org/viewvc?view=rev&rev=474019 Log: made tests work with maven 2, well, mostly, surefire do not honor suite() and thus it wont work either see http://jira.codehaus.org/browse/MSUREFIRE-131, anyway, we now can maven2 build without suppressing our tests
Modified: jakarta/commons/proper/vfs/trunk/core/pom.xml jakarta/commons/proper/vfs/trunk/sandbox/pom.xml Modified: jakarta/commons/proper/vfs/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/core/pom.xml?view=diff&rev=474019&r1=474018&r2=474019 ============================================================================== --- jakarta/commons/proper/vfs/trunk/core/pom.xml (original) +++ jakarta/commons/proper/vfs/trunk/core/pom.xml Sun Nov 12 11:30:48 2006 @@ -17,141 +17,184 @@ --> <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"> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> - <name>core</name> - <groupId>org.apache.commons</groupId> - <artifactId>commons-vfs</artifactId> - <version>1.0-RC8-SNAPSHOT</version> - <description>VFS is a Virtual File System library.</description> - - <parent> - <groupId>org.apache.commons</groupId> - <artifactId>commons-vfs-project</artifactId> - <version>1.0-RC8-SNAPSHOT</version> - </parent> - - - <organization> - <name>Apache Software Foundation</name> - <url>http://www.apache.org/</url> - </organization> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - - <dependencies> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.2</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>1.4.1</version> - <optional>true</optional> - </dependency> - <!--TODO:Revert to [compress] if/when released - <dependency> - <groupId>commons-compress</groupId> - <artifactId>commons-compress</artifactId> - <version>SNAPSHOT</version> - <optional>true</optional> - </dependency--> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>2.0.2</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - <version>0.1.23</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.0.b2</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - <version>2.0.8</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/java</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/main/test-data</directory> - </testResource> - </testResources> - - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.3</target> - <source>1.3</source> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- Tests shouldn't be skipped but we haven't converted that part to m2 yet - and in addition some tests are failing even with the m1 build. --> - <skip>true</skip> - </configuration> - </plugin> - </plugins> + <name>core</name> + <groupId>org.apache.commons</groupId> + <artifactId>commons-vfs</artifactId> + <version>1.0-RC8-SNAPSHOT</version> + <description>VFS is a Virtual File System library.</description> + + <parent> + <groupId>org.apache.commons</groupId> + <artifactId>commons-vfs-project</artifactId> + <version>1.0-RC8-SNAPSHOT</version> + </parent> + + + <organization> + <name>Apache Software Foundation</name> + <url>http://www.apache.org/</url> + </organization> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + + <dependencies> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.2</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>1.4.1</version> + <optional>true</optional> + </dependency> + <!--TODO:Revert to [compress] if/when released + <dependency> + <groupId>commons-compress</groupId> + <artifactId>commons-compress</artifactId> + <version>SNAPSHOT</version> + <optional>true</optional> + </dependency--> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.0</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>2.0.2</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + <version>0.1.23</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>oro</groupId> + <artifactId>oro</artifactId> + <version>2.0.8</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/java</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + <!-- + <testResources> + <testResource> + <directory>src/test/test-data</directory> + <includes> + <include>**/test.*,**/nested.*</include> + </includes> + </testResource> + </testResources> + --> + + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <target>1.3</target> + <source>1.3</source> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <configuration> + <tasks> + <echo message="Setup test-data environment" /> + <delete dir="${project.build.outputDirectory}/../test-data"/> + <copy todir="${project.build.outputDirectory}/../test-data"> + <fileset dir="src/test/test-data"> + <include name="**/*" /> + </fileset> + </copy> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <!-- surfire do not honor suite(), see MSUREFIRE-131 why our tests wont work with maven 2 --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>test.basedir</name> + <value>target/test-data</value> + </property> + </systemProperties> + </configuration> + </plugin> - </build> + </plugins> + + </build> </project> Modified: jakarta/commons/proper/vfs/trunk/sandbox/pom.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/sandbox/pom.xml?view=diff&rev=474019&r1=474018&r2=474019 ============================================================================== --- jakarta/commons/proper/vfs/trunk/sandbox/pom.xml (original) +++ jakarta/commons/proper/vfs/trunk/sandbox/pom.xml Sun Nov 12 11:30:48 2006 @@ -77,7 +77,19 @@ <version>1.4</version> <optional>true</optional> </dependency> - + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-vfs</artifactId> + <version>1.0-RC8-SNAPSHOT</version> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> </dependencies> <build> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]