You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2013/05/06 12:09:06 UTC
svn commit: r1479510 - in /felix/trunk/ipojo/runtime/core-it/src/it:
ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/
ipojo-core-service-dependency-policies/src/test/java/org/apache/felix/...
Author: clement
Date: Mon May 6 10:09:05 2013
New Revision: 1479510
URL: http://svn.apache.org/r1479510
Log:
Reduce the version of the event admin used in test to avoid issues on KF
Modified:
felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java
felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-policies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java
felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-proxies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java
Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java?rev=1479510&r1=1479509&r2=1479510&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java (original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java Mon May 6 10:09:05 2013
@@ -50,7 +50,8 @@ public class Common extends BaseTest {
public CompositeOption eventadmin() {
return new DefaultCompositeOption(
- mavenBundle("org.apache.felix", "org.apache.felix.eventadmin", "1.3.0"),
+ // Use an old version of the event admin to avoid import package issues on KF
+ mavenBundle("org.apache.felix", "org.apache.felix.eventadmin", "1.2.10"),
mavenBundle("org.apache.felix", "org.apache.felix.ipojo.handler.eventadmin",
"1.8.0").versionAsInProject());
}
Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-policies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-policies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java?rev=1479510&r1=1479509&r2=1479510&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-policies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java (original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-policies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java Mon May 6 10:09:05 2013
@@ -50,7 +50,8 @@ public class Common extends BaseTest {
public CompositeOption eventadmin() {
return new DefaultCompositeOption(
- mavenBundle("org.apache.felix", "org.apache.felix.eventadmin", "1.3.0"),
+ // Use an old version of the event admin to avoid import package issues on KF
+ mavenBundle("org.apache.felix", "org.apache.felix.eventadmin", "1.2.10"),
mavenBundle("org.apache.felix", "org.apache.felix.ipojo.handler.eventadmin",
"1.8.0").versionAsInProject());
}
Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-proxies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-proxies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java?rev=1479510&r1=1479509&r2=1479510&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-proxies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java (original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-proxies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/Common.java Mon May 6 10:09:05 2013
@@ -50,7 +50,8 @@ public class Common extends BaseTest {
public CompositeOption eventadmin() {
return new DefaultCompositeOption(
- mavenBundle("org.apache.felix", "org.apache.felix.eventadmin", "1.3.0"),
+ // Use an old version of the event admin to avoid import package issues on KF
+ mavenBundle("org.apache.felix", "org.apache.felix.eventadmin", "1.2.10"),
mavenBundle("org.apache.felix", "org.apache.felix.ipojo.handler.eventadmin",
"1.8.0").versionAsInProject());
}