Use AutoService to generate service loader metadata

apis/elasticstack/pom.xml

@@ -39,13 +39,9 @@
     <test.elasticstack.credential>FIXME_CREDENTIAL</test.elasticstack.credential>
     <test.elasticstack.template>imageId=38df0986-4d85-4b76-b502-3878ffc80161,loginUser=toor</test.elasticstack.template>
     <jclouds.osgi.export>org.jclouds.elasticstack*;version="${project.version}"</jclouds.osgi.export>
-    <jclouds.osgi.import>
-      org.jclouds.compute.internal;version="${project.version}",
-      org.jclouds.rest.internal;version="${project.version}",
-      org.jclouds*;version="${project.version}",
-      *
-    </jclouds.osgi.import>
+    <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds</groupId>
@@ -90,7 +86,13 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>com.google.auto.service</groupId>
+      <artifactId>auto-service</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
+
   <profiles>
     <profile>
       <id>live</id>

apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java

@@ -22,17 +22,20 @@ import static org.jclouds.reflect.Reflection2.typeToken;
 import java.net.URI;
 import java.util.Properties;
 
+import org.jclouds.apis.ApiMetadata;
 import org.jclouds.compute.ComputeServiceContext;
 import org.jclouds.elasticstack.compute.config.ElasticStackComputeServiceContextModule;
 import org.jclouds.elasticstack.config.ElasticStackHttpApiModule;
 import org.jclouds.rest.internal.BaseHttpApiMetadata;
 
+import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Module;
 
 /**
  * Implementation of {@link ApiMetadata} for the ElasticStack API
  */
+@AutoService(ApiMetadata.class)
 public class ElasticStackApiMetadata extends BaseHttpApiMetadata<ElasticStackApi> {
 
    @Override

apis/elasticstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata

@@ -1 +0,0 @@
-org.jclouds.elasticstack.ElasticStackApiMetadata