Browse Source

added something to even be able to run the tests.

the maven-surefire-plugin has the bad idea to set a system property called basedir.
I have patched it locally to accept not to do it with a boolean omitbasedir.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@466937 13f79535-47bb-0310-9956-ffa450edef68
master
Antoine Levy-Lambert 18 years ago
parent
commit
c7fe726fec
1 changed files with 71 additions and 9 deletions
  1. +71
    -9
      src/etc/poms/ant/pom.xml

+ 71
- 9
src/etc/poms/ant/pom.xml View File

@@ -54,8 +54,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration>
</configuration>
<configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
@@ -70,9 +69,9 @@
<tasks> <tasks>
<tstamp/> <tstamp/>
<mkdir dir="${project.build.directory}"/> <mkdir dir="${project.build.directory}"/>
<touch file="${project.build.directory}/.build.timestamp.properties" />
<echo file="${project.build.directory}/.build.timestamp.properties" append="false"
message="TODAY=${TODAY}" />
<touch file="${project.build.directory}/.build.timestamp.properties"/>
<echo file="${project.build.directory}/.build.timestamp.properties" append="false"
message="TODAY=${TODAY}"/>
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
@@ -84,13 +83,13 @@
</goals> </goals>
<configuration> <configuration>
<tasks> <tasks>
<delete file="${project.build.directory}/.build.timestamp.properties" />
<delete file="${project.build.directory}/.build.timestamp.properties"/>
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
@@ -112,11 +111,59 @@
<exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude> <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
<exclude>org/apache/tools/ant/launch/**</exclude> <exclude>org/apache/tools/ant/launch/**</exclude>
</excludes> </excludes>
<testExcludes>
<exclude>org/apache/tools/ant/taskdefs/optional/**</exclude>
<exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
<exclude>org/apache/tools/ant/types/optional/**</exclude>
<exclude>org/apache/tools/ant/types/resolver/**</exclude>
<exclude>org/apache/tools/ant/util/depend/**</exclude>
<exclude>org/apache/tools/ant/util/optional/**</exclude>
<exclude>org/apache/tools/ant/util/Script*</exclude>
<exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
<exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
<exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
<exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
<exclude>org/apache/tools/ant/util/regexp/Jdk14Regexp*</exclude>
<exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
<exclude>org/apache/tools/ant/launch/**</exclude>
<exclude>org/apache/tools/ant/taskdefs/StyleTest*</exclude>
</testExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<omitBasedir>true</omitBasedir>
<systemProperties>
<property>
<name>ant.home</name>
<value>${env.ANT_HOME}</value>
</property>
<property>
<name>build.tests</name>
<value>../../../../target/ant/testcases</value>
</property>
<property>
<name>build.tests.value</name>
<value>../../../../target/ant/testcases</value>
</property>
<property>
<name>offline</name>
<value>true</value>
</property>
<property>
<name>root</name>
<value>../../../..</value>
</property>
</systemProperties>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
</plugins> </plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../../../src/main</directory> <directory>../../../../src/main</directory>
@@ -145,6 +192,21 @@
</includes> </includes>
</resource> </resource>
</resources> </resources>
<testResources>
<testResource>
<directory>../../../../src/etc/testcases</directory>
<filtering>true</filtering>
</testResource>
<testResource>
<directory>../../../../src/main</directory>
<filtering>true</filtering>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
</testResources>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
<outputDirectory>../../../../target/ant/classes</outputDirectory> <outputDirectory>../../../../target/ant/classes</outputDirectory>
<testOutputDirectory>../../../../target/ant/testcases</testOutputDirectory> <testOutputDirectory>../../../../target/ant/testcases</testOutputDirectory>
<directory>../../../../target/ant</directory> <directory>../../../../target/ant</directory>


Loading…
Cancel
Save