Permalink
Browse files

Prepare for release: align dependencies with upcoming 4.5.0 release

git-svn-id: https://svn.apache.org/repos/asf/servicemix/utils/trunk@1403860 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 81c96e1 commit 3f7c4537e5e9157b9f682660ac5ecc641d4afd6b @gertv gertv committed Oct 30, 2012
Showing with 9 additions and 4 deletions.
  1. +3 −3 pom.xml
  2. +6 −1 src/main/java/org/apache/servicemix/executors/impl/FactoryFinder.java
View
@@ -34,10 +34,10 @@
<description>Various utility/helper classes and services for the ServiceMix containers and components</description>
<properties>
- <slf4j.version>1.6.1</slf4j.version>
+ <slf4j.version>1.6.6</slf4j.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <servicemix.specs.version>1.8.0</servicemix.specs.version>
+ <servicemix.specs.version>2.1.0</servicemix.specs.version>
</properties>
<scm>
@@ -257,7 +257,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.6</version>
+ <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -167,7 +167,12 @@ public Object run() {
try {
// If we are deployed into an OSGi environment, leverage it
- Class spiClass = org.apache.servicemix.specs.locator.OsgiLocator.locate(iFactoryId);
+ ClassLoader cl = FactoryFinder.class.getClassLoader();
+ if (cl == null) {
+ cl = ClassLoader.getSystemClassLoader();
+ }
+ Class factoryClass = cl.loadClass(iFactoryId);
+ Class spiClass = org.apache.servicemix.specs.locator.OsgiLocator.locate(factoryClass, iFactoryId);
if (spiClass != null) {
return spiClass.newInstance();
}

0 comments on commit 3f7c453

Please sign in to comment.