Author: [email protected] Date: Thu Feb 24 10:44:31 2011 New Revision: 835
Log: AMDATU-138 moved tests to itest profile cause of AMDATU-120 Modified: branches/0.2/integration-tests/pom.xml branches/0.2/pom.xml Modified: branches/0.2/integration-tests/pom.xml ============================================================================== --- branches/0.2/integration-tests/pom.xml (original) +++ branches/0.2/integration-tests/pom.xml Thu Feb 24 10:44:31 2011 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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";> +<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";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.amdatu</groupId> @@ -373,54 +374,70 @@ </configuration> </plugin> <plugin> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>maven-paxexam-plugin</artifactId> - <executions> - <execution> - <phase>integration-test</phase> - <id>generate-config</id> - <goals> - <goal>generate-config</goal> - </goals> - </execution> - <execution> - <phase>integration-test</phase> - <id>generate-depends-file</id> - <goals> - <goal>generate-depends-file</goal> - </goals> - </execution> - </executions> - <configuration> - <options> - <platform>felix</platform> - <version>${org.apache.felix.main.version}</version> - </options> - </configuration> - </plugin> - <!-- Enable the surefire plugin only in the integration-test phase such that we can use Pax Exam for integration testing --> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>run-integration-test</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <systemPropertyVariables> - <java.io.tmpdir>./target/temp/paxexam</java.io.tmpdir> - </systemPropertyVariables> - <skip>false</skip> - </configuration> - </execution> - </executions> <configuration> <skip>true</skip> </configuration> </plugin> </plugins> </build> + <profiles> + <profile> + <id>itest</id> + <build> + <defaultGoal>install</defaultGoal> + <plugins> + <plugin> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>maven-paxexam-plugin</artifactId> + <executions> + <execution> + <phase>integration-test</phase> + <id>generate-config</id> + <goals> + <goal>generate-config</goal> + </goals> + </execution> + <execution> + <phase>integration-test</phase> + <id>generate-depends-file</id> + <goals> + <goal>generate-depends-file</goal> + </goals> + </execution> + </executions> + <configuration> + <options> + <platform>felix</platform> + <version>${org.apache.felix.main.version}</version> + </options> + </configuration> + </plugin> + <!-- Enable the surefire plugin only in the integration-test phase such that we can use Pax Exam for integration testing --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>run-integration-test</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <systemPropertyVariables> + </systemPropertyVariables> + <skip>false</skip> + </configuration> + </execution> + </executions> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: branches/0.2/pom.xml ============================================================================== --- branches/0.2/pom.xml (original) +++ branches/0.2/pom.xml Thu Feb 24 10:44:31 2011 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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";> +<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";> <modelVersion>4.0.0</modelVersion> <groupId>org.amdatu</groupId> <artifactId>amdatu</artifactId> @@ -488,6 +489,7 @@ </modules> <build> + <defaultGoal>test</defaultGoal> <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName> @@ -713,8 +715,15 @@ <profiles> <profile> + <id>itest</id> + <build> + <defaultGoal>install</defaultGoal> + </build> + </profile> + <profile> <id>deploy</id> <build> + <defaultGoal>deploy</defaultGoal> <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
