Author: [email protected]
Date: Mon Feb 21 16:47:01 2011
New Revision: 804
Log:
AMDATU-138 moving pax exam versions to subproject
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 Mon Feb 21 16:47:01 2011
@@ -13,6 +13,10 @@
<name>Amdatu Integration Tests</name>
<description>This bundle contains integration tests for the
project</description>
+ <properties>
+ <pax.exam.version>1.2.3</pax.exam.version>
+ </properties>
+
<dependencies>
<!-- Test scope dependencies -->
@@ -344,6 +348,20 @@
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>maven-paxexam-plugin</artifactId>
+ <version>1.2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -355,11 +373,9 @@
</instructions>
</configuration>
</plugin>
-
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
- <version>1.2.0</version>
<executions>
<execution>
<phase>integration-test</phase>
@@ -383,12 +399,10 @@
</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>
- <version>2.6</version>
<executions>
<execution>
<id>run-integration-test</id>
@@ -408,7 +422,6 @@
<skip>true</skip>
</configuration>
</plugin>
-
</plugins>
</build>
</project>
Modified: branches/0.2/pom.xml
==============================================================================
--- branches/0.2/pom.xml (original)
+++ branches/0.2/pom.xml Mon Feb 21 16:47:01 2011
@@ -97,7 +97,6 @@
<org.apache.felix.http.version>2.0.4</org.apache.felix.http.version>
<pax.swissbox.version>1.3.0</pax.swissbox.version>
<pax.useradmin.version>0.0.1-SNAPSHOT</pax.useradmin.version>
- <pax.exam.version>1.2.3</pax.exam.version>
<org.apache.sling.commons.mime.version>2.1.4</org.apache.sling.commons.mime.version>
<org.apache.sling.commons.osgi.version>2.0.6</org.apache.sling.commons.osgi.version>
<org.apache.felix.dependencymanager.version>3.0.0-SNAPSHOT</org.apache.felix.dependencymanager.version>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
