You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by as...@apache.org on 2012/02/29 11:12:43 UTC
svn commit: r1295053 - in /whirr/trunk: ./ core/ platforms/karaf/
platforms/karaf/itests/
platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/
services/cassandra/ services/chef/ services/elasticsearch/
services/ganglia/ services/hadoop/ s...
Author: asavu
Date: Wed Feb 29 10:12:43 2012
New Revision: 1295053
URL: http://svn.apache.org/viewvc?rev=1295053&view=rev
Log:
WHIRR-536. Using SNAPSHOT versions of jclouds breaks OSGi support (Ioannis Canellos, Andrei Savu)
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/core/pom.xml
whirr/trunk/platforms/karaf/itests/pom.xml
whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrKarafTestSupport.java
whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrServicesTest.java
whirr/trunk/platforms/karaf/pom.xml
whirr/trunk/pom.xml
whirr/trunk/services/cassandra/pom.xml
whirr/trunk/services/chef/pom.xml
whirr/trunk/services/elasticsearch/pom.xml
whirr/trunk/services/ganglia/pom.xml
whirr/trunk/services/hadoop/pom.xml
whirr/trunk/services/hama/pom.xml
whirr/trunk/services/hbase/pom.xml
whirr/trunk/services/mahout/pom.xml
whirr/trunk/services/puppet/pom.xml
whirr/trunk/services/voldemort/pom.xml
whirr/trunk/services/zookeeper/pom.xml
Modified: whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Wed Feb 29 10:12:43 2012
@@ -68,6 +68,9 @@ Trunk (unreleased changes)
WHIRR-524. Change confusing 'Starting cluster' message (Frank Scholten via asavu)
+ WHIRR-536. Using SNAPSHOT versions of jclouds breaks OSGi
+ support (Ioannis Canellos, Andrei Savu)
+
Release 0.7.1 - 2012-02-23
IMPROVEMENTS
Modified: whirr/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/core/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/core/pom.xml (original)
+++ whirr/trunk/core/pom.xml Wed Feb 29 10:12:43 2012
@@ -33,7 +33,7 @@
org.apache.commons.configuration*;version="[1.6,2)",
*
</osgi.import>
- <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.version}"</osgi.fragment.host>
+ <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.osgi.version.clean}"</osgi.fragment.host>
<osgi.export>
org.apache.whirr*;version="${project.version}"
</osgi.export>
Modified: whirr/trunk/platforms/karaf/itests/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/platforms/karaf/itests/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/platforms/karaf/itests/pom.xml (original)
+++ whirr/trunk/platforms/karaf/itests/pom.xml Wed Feb 29 10:12:43 2012
@@ -71,13 +71,6 @@
</dependency>
<dependency>
- <groupId>org.apache.whirr</groupId>
- <artifactId>whirr-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-mvn</artifactId>
</dependency>
Modified: whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrKarafTestSupport.java
URL: http://svn.apache.org/viewvc/whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrKarafTestSupport.java?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrKarafTestSupport.java (original)
+++ whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrKarafTestSupport.java Wed Feb 29 10:12:43 2012
@@ -241,26 +241,30 @@ public class WhirrKarafTestSupport {
protected <T> T getOsgiService(Class<T> type) {
return getOsgiService(type, null, SERVICE_TIMEOUT);
}
-
+
protected <T> T getOsgiService(Class<T> type, String filter, long timeout) {
+ return type.cast(getOsgiService(type.getName(), filter, timeout));
+ }
+
+ protected Object getOsgiService(String className, String filter, long timeout) {
ServiceTracker tracker = null;
try {
String flt;
if (filter != null) {
if (filter.startsWith("(")) {
- flt = "(&(" + Constants.OBJECTCLASS + "=" + type.getName() + ")" + filter + ")";
+ flt = "(&(" + Constants.OBJECTCLASS + "=" + className + ")" + filter + ")";
} else {
- flt = "(&(" + Constants.OBJECTCLASS + "=" + type.getName() + ")(" + filter + "))";
+ flt = "(&(" + Constants.OBJECTCLASS + "=" + className + ")(" + filter + "))";
}
} else {
- flt = "(" + Constants.OBJECTCLASS + "=" + type.getName() + ")";
+ flt = "(" + Constants.OBJECTCLASS + "=" + className + ")";
}
Filter osgiFilter = FrameworkUtil.createFilter(flt);
tracker = new ServiceTracker(bundleContext, osgiFilter, null);
tracker.open(true);
// Note that the tracker is not closed to keep the reference
// This is buggy, as the service reference may change i think
- Object svc = type.cast(tracker.waitForService(timeout));
+ Object svc = tracker.waitForService(timeout);
if (svc == null) {
Dictionary dic = bundleContext.getBundle().getHeaders();
System.err.println("Test bundle headers: " + explode(dic));
@@ -275,11 +279,14 @@ public class WhirrKarafTestSupport {
throw new RuntimeException("Gave up waiting for service " + flt);
}
- return type.cast(svc);
+ return svc;
+
} catch (InvalidSyntaxException e) {
throw new IllegalArgumentException("Invalid filter", e);
+
} catch (InterruptedException e) {
throw new RuntimeException(e);
+
} finally {
if (tracker != null) {
tracker.close();
Modified: whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrServicesTest.java
URL: http://svn.apache.org/viewvc/whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrServicesTest.java?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrServicesTest.java (original)
+++ whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrServicesTest.java Wed Feb 29 10:12:43 2012
@@ -19,9 +19,6 @@
package org.apache.whirr.karaf.itest;
-import org.apache.whirr.ClusterController;
-import org.apache.whirr.service.ClusterActionHandler;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
@@ -31,8 +28,6 @@ import org.ops4j.pax.exam.junit.ExamReac
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-import java.util.Map;
-
import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
@@ -61,36 +56,31 @@ public class WhirrServicesTest extends W
System.err.println(executeCommand("osgi:list"));
//Test that services properly register to OSGi service registry.
- ClusterController clusterController = getOsgiService(ClusterController.class, "(name=default)", SERVICE_TIMEOUT);
- Map<String, ClusterActionHandler> actionHandlerMap = clusterController.getHandlerMapFactory().create();
- Assert.assertNotNull(clusterController);
-
- testService(actionHandlerMap, "cassandra");
- testService(actionHandlerMap, "chef");
- testService(actionHandlerMap, "elasticsearch");
- testService(actionHandlerMap, "ganglia-monitor", "ganglia-metad");
- testService(actionHandlerMap, "hadoop-namenode", "hadoop-datanode", "hadoop-jobtracker", "hadoop-tasktracker");
- testService(actionHandlerMap, "hama-master", "hama-groomserver");
- testService(actionHandlerMap, "hbase-master", "hbase-regionserver", "hbase-restserver", "hbase-avroserver", "hbase-thriftserver");
- testService(actionHandlerMap, "puppet-install");
- testService(actionHandlerMap, "mahout-client");
- //testService(actionHandlerMap,"voldemort");
- testService(actionHandlerMap, "zookeeper");
+ getOsgiService("org.apache.whirr.ClusterController", "(name=default)", SERVICE_TIMEOUT);
+
+ testService("cassandra");
+ testService("chef");
+ testService("elasticsearch");
+ testService("ganglia-monitor", "ganglia-metad");
+ testService("hadoop-namenode", "hadoop-datanode", "hadoop-jobtracker", "hadoop-tasktracker");
+ testService("hama-master", "hama-groomserver");
+ testService("hbase-master", "hbase-regionserver", "hbase-restserver", "hbase-avroserver", "hbase-thriftserver");
+ testService("puppet-install");
+ testService("mahout-client");
+ //testService("voldemort");
+ testService("zookeeper");
}
/**
- * Tests that the {@link ClusterActionHandler} service has been properly exported.
+ * Tests that the ClusterActionHandler service has been properly exported.
*
- * @param roleNames
+ * @param roleNames the name of the roles to retrieve
*/
- public void testService(Map actionHandlerMap, String... roleNames) throws InterruptedException {
+ public void testService(String... roleNames) {
for (String roleName : roleNames) {
- ClusterActionHandler clusterActionHandler = getOsgiService(ClusterActionHandler.class,
- String.format("(name=%s)", roleName), SERVICE_TIMEOUT);
- Assert.assertNotNull(clusterActionHandler);
- Assert.assertEquals(clusterActionHandler.getRole(), roleName);
- Assert.assertTrue(actionHandlerMap.containsKey(roleName));
+ getOsgiService("org.apache.whirr.service.ClusterActionHandler",
+ String.format("(name=%s)", roleName), SERVICE_TIMEOUT);
}
}
@@ -98,6 +88,6 @@ public class WhirrServicesTest extends W
@Configuration
public Option[] config() {
return new Option[]{
- whirrDistributionConfiguration(), keepRuntimeFolder(), logLevel(LogLevelOption.LogLevel.ERROR)};
+ whirrDistributionConfiguration(), keepRuntimeFolder(), logLevel(LogLevelOption.LogLevel.ERROR)};
}
}
Modified: whirr/trunk/platforms/karaf/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/platforms/karaf/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/platforms/karaf/pom.xml (original)
+++ whirr/trunk/platforms/karaf/pom.xml Wed Feb 29 10:12:43 2012
@@ -34,8 +34,8 @@
<properties>
<karaf.version>2.2.5</karaf.version>
<osgi.version>4.2.0</osgi.version>
- <pax.exam.version>2.3.0.M1</pax.exam.version>
- <pax.exam.karaf.version>0.4.0</pax.exam.karaf.version>
+ <pax.exam.version>2.3.1</pax.exam.version>
+ <pax.exam.karaf.version>0.5.1</pax.exam.karaf.version>
<pax.url.version>1.3.5</pax.url.version>
</properties>
Modified: whirr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/pom.xml (original)
+++ whirr/trunk/pom.xml Wed Feb 29 10:12:43 2012
@@ -458,7 +458,89 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>create-prop</id>
+ <phase>initialize</phase>
+ <configuration>
+ <target>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath"/>
+ <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp"/>
+ <property name="whirr.mv" value="${project.version}"/>
+ <property name="jclouds.mv" value="${jclouds.version}"/>
+ <echo message="Whirr Maven version: ${whirr.mv}"/>
+ <echo message="Jclouds Maven version: ${jclouds.mv}"/>
+ <propertyregex property="whirr.ov.p1" input="${whirr.mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0"/>
+ <propertyregex property="whirr.ov.p2" input="${whirr.mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0"/>
+ <propertyregex property="whirr.ov.p3" input="${whirr.mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\3" defaultValue=".0"/>
+ <propertyregex property="whirr.ov.p4" input="${whirr.mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\4" defaultValue=""/>
+ <propertyregex property="whirr.ov.p1a" input="${whirr.ov.p1}" regexp="(.+)" replace="\1" defaultValue="0"/>
+ <propertyregex property="whirr.ov.p2a" input="${whirr.ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0"/>
+ <propertyregex property="whirr.ov.p3a" input="${whirr.ov.p3}" regexp="(\..+)" replace="\1" defaultValue=".0"/>
+ <propertyregex property="whirr.ov.p4a" input="${whirr.ov.p4}" regexp="(\..+)" replace="\1" defaultValue=""/>
+ <property name="whirr.ov" value="${whirr.ov.p1a}${whirr.ov.p2a}${whirr.ov.p3a}${whirr.ov.p4a}"/>
+ <propertyregex property="jclouds.ov.p1" input="${jclouds.mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0"/>
+ <propertyregex property="jclouds.ov.p2" input="${jclouds.mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0"/>
+ <propertyregex property="jclouds.ov.p3" input="${jclouds.mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\3" defaultValue=".0"/>
+ <propertyregex property="jclouds.ov.p4" input="${jclouds.mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\4" defaultValue=""/>
+ <propertyregex property="jclouds.ov.p1a" input="${jclouds.ov.p1}" regexp="(.+)" replace="\1" defaultValue="0"/>
+ <propertyregex property="jclouds.ov.p2a" input="${jclouds.ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0"/>
+ <propertyregex property="jclouds.ov.p3a" input="${jclouds.ov.p3}" regexp="(\..+)" replace="\1" defaultValue=".0"/>
+ <propertyregex property="jclouds.ov.p4a" input="${jclouds.ov.p4}" regexp="(\..+)" replace="\1" defaultValue=""/>
+ <property name="jclouds.ov" value="${jclouds.ov.p1a}${jclouds.ov.p2a}${jclouds.ov.p3a}${jclouds.ov.p4a}"/>
+ <echo message="Whirr OSGi version: ${whirr.ov}"/>
+ <echo message="Jclouds OSGi version: ${jclouds.ov}"/>
+ <mkdir dir="target"/>
+ <echo file="target/whirr.osgi.version.txt">
+ whirr.osgi.version.clean = ${whirr.ov}
+ jclouds.osgi.version.clean = ${jclouds.ov}
+ </echo>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>target/whirr.osgi.version.txt</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
Modified: whirr/trunk/services/cassandra/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/cassandra/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/services/cassandra/pom.xml (original)
+++ whirr/trunk/services/cassandra/pom.xml Wed Feb 29 10:12:43 2012
@@ -37,7 +37,7 @@
<osgi.export>
org.apache.whirr.service.cassandra*;version="${project.version}"
</osgi.export>
- <osgi.fragment.host>jclouds-scriptbuilder</osgi.fragment.host>
+ <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.osgi.version.clean}"</osgi.fragment.host>
</properties>
<dependencies>
<dependency>
Modified: whirr/trunk/services/chef/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/chef/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/services/chef/pom.xml (original)
+++ whirr/trunk/services/chef/pom.xml Wed Feb 29 10:12:43 2012
@@ -35,7 +35,7 @@
<osgi.export>
org.apache.whirr.service.chef*;version="${project.version}"
</osgi.export>
- <osgi.fragment.host>jclouds-scriptbuilder</osgi.fragment.host>
+ <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.osgi.version.clean}"</osgi.fragment.host>
</properties>
<dependencies>
<dependency>
Modified: whirr/trunk/services/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/elasticsearch/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/services/elasticsearch/pom.xml (original)
+++ whirr/trunk/services/elasticsearch/pom.xml Wed Feb 29 10:12:43 2012
@@ -37,7 +37,7 @@
<osgi.export>
org.apache.whirr.service.elasticsearch*;version="${project.version}"
</osgi.export>
- <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.version}"</osgi.fragment.host>
+ <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.osgi.version.clean}"</osgi.fragment.host>
</properties>
<dependencies>
<dependency>
Modified: whirr/trunk/services/ganglia/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/ganglia/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/services/ganglia/pom.xml (original)
+++ whirr/trunk/services/ganglia/pom.xml Wed Feb 29 10:12:43 2012
@@ -36,7 +36,7 @@
<osgi.export>
org.apache.whirr.service.ganglia*;version="${project.version}"
</osgi.export>
- <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.version}"</osgi.fragment.host>
+ <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.osgi.version.clean}"</osgi.fragment.host>
</properties>
<dependencies>
<dependency>
Modified: whirr/trunk/services/hadoop/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hadoop/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/services/hadoop/pom.xml (original)
+++ whirr/trunk/services/hadoop/pom.xml Wed Feb 29 10:12:43 2012
@@ -37,7 +37,7 @@
<osgi.export>
org.apache.whirr.service.hadoop*;version="${project.version}"
</osgi.export>
- <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.version}"</osgi.fragment.host>
+ <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.osgi.version.clean}"</osgi.fragment.host>
</properties>
<dependencies>
<dependency>
Modified: whirr/trunk/services/hama/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hama/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/services/hama/pom.xml (original)
+++ whirr/trunk/services/hama/pom.xml Wed Feb 29 10:12:43 2012
@@ -37,7 +37,7 @@
<osgi.export>
org.apache.whirr.service.hama*;version="${project.version}"
</osgi.export>
- <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.version}"</osgi.fragment.host>
+ <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.osgi.version.clean}"</osgi.fragment.host>
</properties>
<dependencies>
<dependency>
Modified: whirr/trunk/services/hbase/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hbase/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/services/hbase/pom.xml (original)
+++ whirr/trunk/services/hbase/pom.xml Wed Feb 29 10:12:43 2012
@@ -37,7 +37,7 @@
<osgi.export>
org.apache.whirr.service.hbase*;version="${project.version}"
</osgi.export>
- <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.version}"</osgi.fragment.host>
+ <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.osgi.version.clean}"</osgi.fragment.host>
</properties>
<dependencies>
<dependency>
Modified: whirr/trunk/services/mahout/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/mahout/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/services/mahout/pom.xml (original)
+++ whirr/trunk/services/mahout/pom.xml Wed Feb 29 10:12:43 2012
@@ -36,7 +36,7 @@
<osgi.export>
org.apache.whirr.service.mahout*;version="${project.version}"
</osgi.export>
- <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.version}"</osgi.fragment.host>
+ <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.osgi.version.clean}"</osgi.fragment.host>
</properties>
<dependencies>
<dependency>
Modified: whirr/trunk/services/puppet/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/puppet/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/services/puppet/pom.xml (original)
+++ whirr/trunk/services/puppet/pom.xml Wed Feb 29 10:12:43 2012
@@ -35,7 +35,7 @@
<osgi.export>
org.apache.whirr.service.puppet*;version="${project.version}"
</osgi.export>
- <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.version}"</osgi.fragment.host>
+ <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.osgi.version.clean}"</osgi.fragment.host>
</properties>
<dependencies>
<dependency>
Modified: whirr/trunk/services/voldemort/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/voldemort/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/services/voldemort/pom.xml (original)
+++ whirr/trunk/services/voldemort/pom.xml Wed Feb 29 10:12:43 2012
@@ -37,7 +37,7 @@
<osgi.export>
org.apache.whirr.service.voldemort*;version="${project.version}"
</osgi.export>
- <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.version}"</osgi.fragment.host>
+ <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.osgi.version.clean}"</osgi.fragment.host>
</properties>
<dependencies>
<dependency>
Modified: whirr/trunk/services/zookeeper/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/zookeeper/pom.xml?rev=1295053&r1=1295052&r2=1295053&view=diff
==============================================================================
--- whirr/trunk/services/zookeeper/pom.xml (original)
+++ whirr/trunk/services/zookeeper/pom.xml Wed Feb 29 10:12:43 2012
@@ -37,7 +37,7 @@
<osgi.export>
org.apache.whirr.service.zookeeper*;version="${project.version}"
</osgi.export>
- <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.version}"</osgi.fragment.host>
+ <osgi.fragment.host>jclouds-scriptbuilder;bundle-version="${jclouds.osgi.version.clean}"</osgi.fragment.host>
</properties>
<dependencies>
<dependency>