Author: [email protected]
Date: Mon Feb 21 16:13:59 2011
New Revision: 803
Log:
AMDATU-306 Alligning felix version to 3.0.2 as Pax Exam does not support higher
Modified:
branches/0.2/integration-tests/pom.xml
branches/0.2/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
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:13:59 2011
@@ -357,21 +357,6 @@
</plugin>
<plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>depends-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <id>generate-depends-file</id>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
<version>1.2.0</version>
@@ -383,10 +368,18 @@
<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>${target-framework}</platform>
+ <platform>felix</platform>
+ <version>${org.apache.felix.main.version}</version>
</options>
</configuration>
</plugin>
Modified:
branches/0.2/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
==============================================================================
---
branches/0.2/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
(original)
+++
branches/0.2/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
Mon Feb 21 16:13:59 2011
@@ -17,6 +17,7 @@
package org.amdatu.test.integration.base;
import static org.ops4j.pax.exam.CoreOptions.bundle;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.frameworks;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@@ -82,9 +83,6 @@
options(
mavenConfiguration(),
- // Run test in a Felix container
- frameworks(felix()),
-
// Setting this system property unfortunately is necessary
with the current Cassandra implementation
systemProperty("org.osgi.framework.system.packages.extra").value("sun.misc,com.sun.management"),
Modified: branches/0.2/pom.xml
==============================================================================
--- branches/0.2/pom.xml (original)
+++ branches/0.2/pom.xml Mon Feb 21 16:13:59 2011
@@ -88,7 +88,7 @@
Version numbers of dependent libraries
-->
<javax.servlet.version>2.5</javax.servlet.version>
- <org.apache.felix.main.version>3.0.8</org.apache.felix.main.version>
+ <org.apache.felix.main.version>3.0.2</org.apache.felix.main.version>
<org.osgi.version>4.2.0</org.osgi.version>
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
<org.apache.felix.log.version>1.0.0</org.apache.felix.log.version>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
