diff --git a/cache/src/main/java/org/jclouds/karaf/cache/utils/CacheUtils.java b/cache/src/main/java/org/jclouds/karaf/cache/utils/CacheUtils.java index 25d8c7d0..dd50c92a 100644 --- a/cache/src/main/java/org/jclouds/karaf/cache/utils/CacheUtils.java +++ b/cache/src/main/java/org/jclouds/karaf/cache/utils/CacheUtils.java @@ -69,7 +69,7 @@ public static ServiceTracker createServiceCacheTracker(final BundleContext c @Override public Object addingService(ServiceReference reference) { Object service = super.addingService(reference); - if (serviceToken.isAssignableFrom(service.getClass())) { + if (serviceToken.isSupertypeOf(service.getClass())) { cacheManager.bindService((T) service); } return service; @@ -77,7 +77,7 @@ public Object addingService(ServiceReference reference) { @Override public void removedService(ServiceReference reference, Object service) { - if (serviceToken.isAssignableFrom(service.getClass())) { + if (serviceToken.isSupertypeOf(service.getClass())) { cacheManager.unbindService((T) service); } super.removedService(reference, service); diff --git a/chef/services/src/main/java/org/jclouds/karaf/chef/services/Activator.java b/chef/services/src/main/java/org/jclouds/karaf/chef/services/Activator.java index 8dc0a02f..ecb50ff2 100644 --- a/chef/services/src/main/java/org/jclouds/karaf/chef/services/Activator.java +++ b/chef/services/src/main/java/org/jclouds/karaf/chef/services/Activator.java @@ -54,7 +54,7 @@ public void start(final BundleContext context) throws Exception { @Override public Object addingService(ServiceReference reference) { Object obj = super.addingService(reference); - if (CHEF_TOKEN.isAssignableFrom(obj.getClass())) { + if (CHEF_TOKEN.isSupertypeOf(obj.getClass())) { String serviceId = String.valueOf(reference.getProperty(Constants.SERVICE_ID)); registerRecipeProviderForService(context, serviceId, (ApiContext) obj); } diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobExistsCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobExistsCommand.java index 89f8f064..88bde9a1 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobExistsCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobExistsCommand.java @@ -19,22 +19,11 @@ package org.jclouds.karaf.commands.blobstore; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; - import org.apache.felix.gogo.commands.Argument; import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Option; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.KeyNotFoundException; -import com.google.common.base.Charsets; -import com.google.common.base.Strings; -import com.google.common.io.CharStreams; -import com.google.common.io.Files; -import com.google.common.io.InputSupplier; - @Command(scope = "jclouds", name = "blobstore-blob-exists", description = "Checks existence of blob on the blobstore") public class BlobExistsCommand extends BlobStoreCommandWithOptions { diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java index 938bf127..68b21a2e 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java @@ -29,14 +29,10 @@ import org.apache.felix.gogo.commands.CommandException; import org.apache.felix.gogo.commands.Option; import org.jclouds.blobstore.BlobStore; -import org.jclouds.blobstore.KeyNotFoundException; import com.google.common.base.Charsets; -import com.google.common.base.Strings; import com.google.common.io.CharStreams; -import com.google.common.io.Closeables; import com.google.common.io.Files; -import com.google.common.io.InputSupplier; @Command(scope = "jclouds", name = "blobstore-read", description = "Reads data from the blobstore") public class BlobReadCommand extends BlobStoreCommandWithOptions { diff --git a/feature-labs/pom.xml b/feature-labs/pom.xml index 4c1d2016..1026c3c8 100644 --- a/feature-labs/pom.xml +++ b/feature-labs/pom.xml @@ -103,7 +103,7 @@ limitations under the License. file:${project.build.directory}/feature/feature.xml org.apache.karaf.features:framework - 1.7 + 1.8 framework diff --git a/feature/pom.xml b/feature/pom.xml index 0c8ccb49..104d8a49 100644 --- a/feature/pom.xml +++ b/feature/pom.xml @@ -112,7 +112,7 @@ limitations under the License. file:${project.build.directory}/feature/feature.xml org.apache.karaf.features:framework - 1.7 + 1.8 framework diff --git a/feature/src/main/feature/feature.xml b/feature/src/main/feature/feature.xml index 86a8d5a7..b64f727a 100644 --- a/feature/src/main/feature/feature.xml +++ b/feature/src/main/feature/feature.xml @@ -72,6 +72,7 @@ limitations under the License. mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jersey-core/${jersey.bundle.version} mvn:com.google.code.gson/gson/${gson.version} mvn:org.apache.jclouds/jclouds-core/${jclouds.version} + osgi.ee;filter:="(&(osgi.ee=JavaSE)(!(version>=1.9)))" diff --git a/pom.xml b/pom.xml index 768cd0ab..40a59539 100644 --- a/pom.xml +++ b/pom.xml @@ -149,8 +149,8 @@ limitations under the License. maven-compiler-plugin ${maven-compiler-plugin.version} - 1.6 - 1.6 + ${jdk.version} + ${jdk.version} @@ -183,14 +183,14 @@ limitations under the License. - 1.7 + 1.8 1.0_5 1.51 3.0 1.8.0 2.4.4 2.5 - 18.0 + 21.0 10.0 3.0 4.3.4 @@ -212,7 +212,7 @@ limitations under the License. 4.8.2 1.0.7_1 1.0.7 - 4.0.9 + 4.2.0 20100527_1 3.5.9.Final 6.0.0