You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2012/05/08 03:11:17 UTC
svn commit: r1335315 - in /camel/trunk/components/camel-test-blueprint:
pom.xml
src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
Author: dkulp
Date: Tue May 8 01:11:16 2012
New Revision: 1335315
URL: http://svn.apache.org/viewvc?rev=1335315&view=rev
Log:
Make sure we pick up the version of osgi-core that contains the
ServiceReference class we need.
Modified:
camel/trunk/components/camel-test-blueprint/pom.xml
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
Modified: camel/trunk/components/camel-test-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/pom.xml?rev=1335315&r1=1335314&r2=1335315&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-test-blueprint/pom.xml Tue May 8 01:11:16 2012
@@ -36,7 +36,12 @@
</properties>
<dependencies>
-
+ <dependency>
+ <!-- Make sure we use the version of osgi.core that we specify for compiling -->
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
@@ -78,6 +83,16 @@
<groupId>com.googlecode.pojosr</groupId>
<artifactId>de.kalpatec.pojosr.framework</artifactId>
<version>${pojosr-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
@@ -102,6 +117,14 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.foundation</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java?rev=1335315&r1=1335314&r2=1335315&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java (original)
+++ camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java Tue May 8 01:11:16 2012
@@ -157,11 +157,11 @@ public final class CamelBlueprintHelper
Dictionary<?, ?> dic = bundleContext.getBundle().getHeaders();
System.err.println("Test bundle headers: " + explode(dic));
- for (ServiceReference<?> ref : asCollection(bundleContext.getAllServiceReferences(null, null))) {
+ for (ServiceReference ref : asCollection(bundleContext.getAllServiceReferences(null, null))) {
System.err.println("ServiceReference: " + ref);
}
- for (ServiceReference<?> ref : asCollection(bundleContext.getAllServiceReferences(null, flt))) {
+ for (ServiceReference ref : asCollection(bundleContext.getAllServiceReferences(null, flt))) {
System.err.println("Filtered ServiceReference: " + ref);
}
@@ -194,8 +194,8 @@ public final class CamelBlueprintHelper
/**
* Provides an iterable collection of references, even if the original array is <code>null</code>.
*/
- private static Collection<ServiceReference<?>> asCollection(ServiceReference<?>[] references) {
- return references == null ? new ArrayList<ServiceReference<?>>(0) : Arrays.asList(references);
+ private static Collection<ServiceReference> asCollection(ServiceReference[] references) {
+ return references == null ? new ArrayList<ServiceReference>(0) : Arrays.asList(references);
}
private static TinyBundle createTestBundle(String name, String version, String descriptors) throws FileNotFoundException, MalformedURLException {