Misc of improvements to karaf project

- re-organize feature.xml - add missing API features installation tests - bump osgi and karaf versions - add new maven module `modern-itests` that will replace `itests` - add feature-labs.xml file - add drivers features - add allcompute and allblobstore feature - add FeatureLabsInstallationTest - add providers - bump karaf version in itests - fix karaf-maven-plugin - use sshj 0.20.0 - remove old itests; rename modern-itests to itests - add javax.ws.rs.api deps - split feature-labs into a separate module - remove resolver=(obr) from features as not used
jclouds · Mar 17, 2017 · fa11dcf · fa11dcf
1 parent 21149b0
commit fa11dcf
Show file tree

Hide file tree

Showing 38 changed files with 1,320 additions and 2,754 deletions.
diff --git a/bundles/jsch-agentproxy-jsch/pom.xml b/bundles/jsch-agentproxy-jsch/pom.xml
@@ -83,6 +83,7 @@ limitations under the License.
             <configuration>
               <!-- the RAT plugin complains if we use the default location and we don't want it in the SCM -->
               <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
               <artifactSet>
                 <includes>
                   <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jsch-agentproxy-jsch</include>

diff --git a/cache/pom.xml b/cache/pom.xml
@@ -56,7 +56,7 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
+      <artifactId>osgi.cmpn</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds</groupId>

diff --git a/chef/cache/pom.xml b/chef/cache/pom.xml
@@ -52,7 +52,7 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
+      <artifactId>osgi.cmpn</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds.karaf</groupId>

diff --git a/chef/commands/pom.xml b/chef/commands/pom.xml
@@ -101,7 +101,7 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
+      <artifactId>osgi.cmpn</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>

diff --git a/chef/services/pom.xml b/chef/services/pom.xml
@@ -70,7 +70,7 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
+      <artifactId>osgi.cmpn</artifactId>
     </dependency>
     <!-- Testing -->
     <dependency>

diff --git a/commands/pom.xml b/commands/pom.xml
@@ -124,7 +124,7 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds.driver</groupId>
-      <artifactId>jclouds-jsch</artifactId>
+      <artifactId>jclouds-slf4j</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds.driver</groupId>
@@ -136,7 +136,7 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
+      <artifactId>osgi.cmpn</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
@@ -154,5 +154,10 @@ limitations under the License.
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.jclouds.api</groupId>
+      <artifactId>ec2</artifactId>
+      <version>2.1.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java
@@ -25,9 +25,9 @@
 import org.jclouds.compute.RunNodesException;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.OsFamily;
+import org.jclouds.ec2.compute.options.EC2TemplateOptions;
 import org.jclouds.compute.domain.TemplateBuilder;
 import org.jclouds.compute.options.TemplateOptions;
-import org.jclouds.ec2.compute.options.EC2TemplateOptions;
 import org.jclouds.karaf.core.Constants;
 import org.jclouds.karaf.recipe.RecipeManager;
 import org.jclouds.karaf.recipe.RecipeManagerImpl;

diff --git a/commands/src/main/java/org/jclouds/karaf/commands/support/GenericCompleterSupport.java b/commands/src/main/java/org/jclouds/karaf/commands/support/GenericCompleterSupport.java
@@ -17,18 +17,19 @@
 
 package org.jclouds.karaf.commands.support;
 
-import com.google.common.collect.Multimap;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
 import org.apache.felix.service.command.CommandSession;
+import org.apache.karaf.shell.console.CommandSessionHolder;
 import org.apache.karaf.shell.console.Completer;
 import org.apache.karaf.shell.console.completer.ArgumentCompleter;
 import org.apache.karaf.shell.console.completer.StringsCompleter;
-import org.apache.karaf.shell.console.jline.CommandSessionHolder;
 import org.jclouds.karaf.cache.CacheProvider;
 import org.jclouds.karaf.cache.Cacheable;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
+import com.google.common.collect.Multimap;
 
 public abstract class GenericCompleterSupport<T,K> implements Completer, Cacheable<T> {
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -18,10 +18,9 @@ limitations under the License.
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>jclouds-karaf</artifactId>
     <groupId>org.apache.jclouds</groupId>
+    <artifactId>jclouds-karaf</artifactId>
     <version>2.1.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -49,7 +48,7 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
+      <artifactId>osgi.cmpn</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>

diff --git a/feature-labs/pom.xml b/feature-labs/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.jclouds</groupId>
+        <artifactId>jclouds-karaf</artifactId>
+        <version>2.1.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <groupId>org.apache.jclouds.karaf</groupId>
+    <artifactId>jclouds-karaf-labs</artifactId>
+    <packaging>feature</packaging>
+    <name>jclouds :: Karaf :: Feature Labs</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <version>${karaf.version}</version>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/feature-labs/src/main/feature/feature.xml b/feature-labs/src/main/feature/feature.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<features name="jclouds-labs-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
+    <repository>mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds.version}/xml/features</repository>
+
+    <!-- JCLOUDS-LABS -->
+    <feature name='jclouds-azurecompute-arm' description='Components to access Azure Compute ARM' version='${project.version}'>
+        <feature version='${project.version}'>jclouds-compute</feature>
+        <feature version='${project.version}'>jclouds-azureblob</feature>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/oauth/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${okio.bundle.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okhttp.bundle.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-okhttp/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs/azurecompute-arm/${jclouds.version}</bundle>
+    </feature>
+
+    <feature name='jclouds-b2' description='Backblaze B2' version='${project.version}'>
+        <feature version='${project.version}'>jclouds-blobstore</feature>
+        <bundle>mvn:org.apache.jclouds.labs/b2/${jclouds.version}</bundle>
+    </feature>
+
+    <feature name='jclouds-cloudsigma2-hnl' description='CloudSigma v2 Honolulu' version='${project.version}'>
+        <feature version='${project.version}'>jclouds-compute</feature>
+        <bundle dependency='true'>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs/cloudsigma2-hnl/${jclouds.version}</bundle>
+    </feature>
+
+    <feature name='jclouds-cloudsigma2-lvs' description='CloudSigma v2 Las Vegas' version='${project.version}'>
+        <feature version='${project.version}'>jclouds-compute</feature>
+        <bundle dependency='true'>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs/cloudsigma2-lvs/${jclouds.version}</bundle>
+    </feature>
+
+    <feature name='jclouds-cloudsigma2-sjc' description='CloudSigma v2 San Jose' version='${project.version}'>
+        <feature version='${project.version}'>jclouds-compute</feature>
+        <bundle dependency='true'>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs/cloudsigma2-sjc/${jclouds.version}</bundle>
+    </feature>
+
+    <feature name='jclouds-cloudsigma2-wdc' description='CloudSigma v2 Washington DC' version='${project.version}'>
+        <feature version='${project.version}'>jclouds-compute</feature>
+        <bundle dependency='true'>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs/cloudsigma2-wdc/${jclouds.version}</bundle>
+    </feature>
+
+    <feature name='jclouds-cloudsigma2-zrh' description='CloudSigma v2 Zurich' version='${project.version}'>
+        <feature version='${project.version}'>jclouds-compute</feature>
+        <bundle dependency='true'>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs/cloudsigma2-zrh/${jclouds.version}</bundle>
+    </feature>
+
+    <feature name='jclouds-google-cloud-storage' description='Google Cloud Storage' version='${project.version}'>
+        <feature version='${project.version}'>jclouds-blobstore</feature>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/oauth/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/googlecloud/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs/google-cloud-storage/${jclouds.version}</bundle>
+    </feature>
+
+    <feature name='jclouds-packet' description='Packet' version='${project.version}'>
+        <feature version='${project.version}'>jclouds-compute</feature>
+        <bundle>mvn:org.apache.jclouds.labs/packet/${jclouds.version}</bundle>
+    </feature>
+
+    <feature name='jclouds-vagrant' description='Components to access Vagrant' version='${project.version}'>
+        <feature version='${project.version}'>jclouds-compute</feature>
+        <bundle dependency='true'>mvn:name.neykov/vagrant-java-bindings/${vagrant-java-bindings.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs/vagrant/${jclouds.version}</bundle>
+    </feature>
+
+</features>
diff --git a/feature-labs/src/main/resources/.gitignore b/feature-labs/src/main/resources/.gitignore