Author: [email protected]
Date: Wed Aug 10 12:26:04 2011
New Revision: 1306
Log:
[AMDATUOPENSOCIAL-82] Fixed test failure by overruling core version in the pom
of the integration test
Modified:
trunk/amdatu-opensocial/test-integration/base/src/main/java/org/amdatu/opensocial/test/integration/base/OpenSocialFixture.java
trunk/amdatu-opensocial/test-integration/pom.xml
trunk/amdatu-opensocial/test-integration/tests/pom.xml
Modified:
trunk/amdatu-opensocial/test-integration/base/src/main/java/org/amdatu/opensocial/test/integration/base/OpenSocialFixture.java
==============================================================================
---
trunk/amdatu-opensocial/test-integration/base/src/main/java/org/amdatu/opensocial/test/integration/base/OpenSocialFixture.java
(original)
+++
trunk/amdatu-opensocial/test-integration/base/src/main/java/org/amdatu/opensocial/test/integration/base/OpenSocialFixture.java
Wed Aug 10 12:26:04 2011
@@ -17,7 +17,6 @@
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import java.util.Properties;
@@ -32,10 +31,10 @@
public static final String PORTNR = "8080";
public Option provision() {
- System.setProperty("jaxp.debug", "true");
+ // System.setProperty("jaxp.debug", "true");
//System.setProperty("javax.xml.parsers.DocumentBuilderFactory",
"org.apache.crimson.jaxp.DocumentBuilderFactoryImpl");
return composite(
- systemProperty("jaxp.debug").value("true"),
+ //systemProperty("jaxp.debug").value("true"),
// Add sun.misc and com.sun.management to system packages
//systemProperty("javax.xml.parsers.DocumentBuilderFactory").value("org.apache.crimson.jaxp.DocumentBuilderFactoryImpl"),
Modified: trunk/amdatu-opensocial/test-integration/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/test-integration/pom.xml (original)
+++ trunk/amdatu-opensocial/test-integration/pom.xml Wed Aug 10 12:26:04 2011
@@ -30,7 +30,7 @@
<properties>
<org.amdatu.core.version>0.2.1-SNAPSHOT</org.amdatu.core.version>
<org.amdatu.web.version>0.2.1-SNAPSHOT</org.amdatu.web.version>
- <org.amdatu.auth.version>0.2.0-SNAPSHOT</org.amdatu.auth.version>
+ <org.amdatu.auth.version>0.2.0-RC1</org.amdatu.auth.version>
<org.apache.felix.http.version>2.2.0</org.apache.felix.http.version>
</properties>
@@ -41,6 +41,20 @@
<dependencyManagement>
<dependencies>
+ <!-- FIXME: this is a temporary dependency, needed to overrule the
default
+ dependency with the 0.2.0 version of this artifact. Since 0.2.0 does
+ not yet contain the integration test framework, this integration
test
+ depends on 0.2.1-SNAPSHOT instead. This depedency should be removed
as
+ soon as the core dependecies in the integration test are in line
with
+ the core dependencies version defined in the amdatu-opensocial root
pom-->
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.config.templates</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+
<!--
Amdatu core and web itest base is crosscutting to both the base and
tests
module. This brings in the all dependencies required to work with
Modified: trunk/amdatu-opensocial/test-integration/tests/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/test-integration/tests/pom.xml (original)
+++ trunk/amdatu-opensocial/test-integration/tests/pom.xml Wed Aug 10
12:26:04 2011
@@ -80,6 +80,10 @@
<scope>test</scope>
<type>bundle</type>
</dependency>
+
+ <!--
+ Amdatu Auth bundles to be be used by the tests.
+ -->
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.oauth.api</artifactId>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
