From 0061346d112da919d20fe52c51973c6f46ef6ec2 Mon Sep 17 00:00:00 2001
From: Andrew Phillips <andrewp@apache.org>
Date: Wed, 7 Sep 2016 00:25:05 -0400
Subject: [PATCH 1/4] Align the startup.properties file with Karaf 2.3.11

---
 .../src/main/filtered-resources/etc/startup.properties     | 7 ++++---
 project/pom.xml                                            | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/assembly/src/main/filtered-resources/etc/startup.properties b/assembly/src/main/filtered-resources/etc/startup.properties
index d7f990c..1b3fca7 100644
--- a/assembly/src/main/filtered-resources/etc/startup.properties
+++ b/assembly/src/main/filtered-resources/etc/startup.properties
@@ -39,11 +39,12 @@ org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.
 org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}/org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar=20
 org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}/org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar=20
 
-org/apache/karaf/shell/org.apache.karaf.shell.console/${karaf.version}/org.apache.karaf.shell.console-${karaf.version}.jar=29
+org/apache/karaf/shell/org.apache.karaf.shell.console/${karaf.version}/org.apache.karaf.shell.console-${karaf.version}.jar=25
+
 org/apache/karaf/shell/org.apache.karaf.shell.log/${karaf.version}/org.apache.karaf.shell.log-${karaf.version}.jar=30
 org/apache/karaf/shell/org.apache.karaf.shell.commands/${karaf.version}/org.apache.karaf.shell.commands-${karaf.version}.jar=30
 org/apache/karaf/shell/org.apache.karaf.shell.config/${karaf.version}/org.apache.karaf.shell.config-${karaf.version}.jar=30
-org/apache/karaf/jaas/org.apache.karaf.jaas.config/${karaf.version}/org.apache.karaf.jaas.config-${karaf.version}.jar=28
+org/apache/karaf/jaas/org.apache.karaf.jaas.config/${karaf.version}/org.apache.karaf.jaas.config-${karaf.version}.jar=30
 org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${karaf.version}/org.apache.karaf.jaas.modules-${karaf.version}.jar=30
-org/apache/karaf/features/org.apache.karaf.features.core/${karaf.version}/org.apache.karaf.features.core-${karaf.version}.jar=29
+org/apache/karaf/features/org.apache.karaf.features.core/${karaf.version}/org.apache.karaf.features.core-${karaf.version}.jar=30
 org/apache/karaf/features/org.apache.karaf.features.command/${karaf.version}/org.apache.karaf.features.command-${karaf.version}.jar=30
diff --git a/project/pom.xml b/project/pom.xml
index 5c6b704..b93a36e 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -66,7 +66,7 @@
 
   <properties>
     <!-- Karaf Version Dependencies -->
-    <karaf.version>2.3.9</karaf.version>
+    <karaf.version>2.3.11</karaf.version>
     <pax.url.version>1.3.7</pax.url.version>
     <pax.logging.version>1.7.4</pax.logging.version>
     <felix.configadmin.version>1.8.0</felix.configadmin.version>

From bc003de96a72d889203a0b043b03a7161f93d7cb Mon Sep 17 00:00:00 2001
From: Andrew Phillips <andrewp@apache.org>
Date: Wed, 7 Sep 2016 00:25:44 -0400
Subject: [PATCH 2/4] Remove a non-existent feature from the list of features
 to boot on startup

The ConfigAdmin service is automatically loaded already
---
 .../main/filtered-resources/etc/org.apache.karaf.features.cfg   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index d0f6270..728c2b2 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -16,4 +16,4 @@
 #
 featuresRepositories=mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features
 
-featuresBoot=config,jclouds-chef,jclouds-aws-ec2,jclouds-aws-s3
\ No newline at end of file
+featuresBoot=jclouds-chef,jclouds-aws-ec2,jclouds-aws-s3
\ No newline at end of file

From 7dba96d54e893b61716fcaa4d90557e98321ba05 Mon Sep 17 00:00:00 2001
From: Andrew Phillips <andrewp@apache.org>
Date: Wed, 7 Sep 2016 00:26:46 -0400
Subject: [PATCH 3/4] Tentatively remove Guava from the system deps for the
 distribution

There are no files matching the filter anyway, so this already be a no-op
in practice. But not quite sure - needs more testing
---
 assembly/src/main/assembly/unix.xml | 4 ++--
 assembly/src/main/assembly/win.xml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assembly/src/main/assembly/unix.xml b/assembly/src/main/assembly/unix.xml
index 0de1193..64f1dce 100644
--- a/assembly/src/main/assembly/unix.xml
+++ b/assembly/src/main/assembly/unix.xml
@@ -137,13 +137,13 @@
             </includes>
             <useTransitiveDependencies>false</useTransitiveDependencies>
         </dependencySet>
-        <dependencySet>
+        <!--dependencySet>
 	    <outputDirectory>/system/com/google/guava/guava/${guava.version}/</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
                 <include>com.google:guava</include>
             </includes>
-        </dependencySet>
+        </dependencySet-->
         <dependencySet>
             <outputDirectory>/system/org/apache/jclouds/cli/jclouds-cli-runner/${project.version}/</outputDirectory>
             <fileMode>0644</fileMode>
diff --git a/assembly/src/main/assembly/win.xml b/assembly/src/main/assembly/win.xml
index bbbdc02..b3e7923 100644
--- a/assembly/src/main/assembly/win.xml
+++ b/assembly/src/main/assembly/win.xml
@@ -135,13 +135,13 @@
             </includes>
             <useTransitiveDependencies>false</useTransitiveDependencies>
         </dependencySet>
-        <dependencySet>
+        <!--dependencySet>
 	    <outputDirectory>/system/com/google/guava/guava/${guava.version}/</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
                 <include>com.google:guava</include>
             </includes>
-        </dependencySet>
+        </dependencySet-->
         <dependencySet>
             <outputDirectory>/system/org/apache/jclouds/cli/jclouds-cli-runner/${project.version}/</outputDirectory>
             <fileMode>0644</fileMode>

From 2b205e2e202e272bdb44696868d10456c16ed2ba Mon Sep 17 00:00:00 2001
From: Andrew Phillips <andrewp@apache.org>
Date: Thu, 8 Sep 2016 02:55:02 -0400
Subject: [PATCH 4/4] Remove Guava from system deps

Follow-on to 7dba96d5. Things seem to work fine without this (thanks to @nacx for testing!)
---
 assembly/src/main/assembly/unix.xml | 7 -------
 assembly/src/main/assembly/win.xml  | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/assembly/src/main/assembly/unix.xml b/assembly/src/main/assembly/unix.xml
index 64f1dce..095fe62 100644
--- a/assembly/src/main/assembly/unix.xml
+++ b/assembly/src/main/assembly/unix.xml
@@ -137,13 +137,6 @@
             </includes>
             <useTransitiveDependencies>false</useTransitiveDependencies>
         </dependencySet>
-        <!--dependencySet>
-	    <outputDirectory>/system/com/google/guava/guava/${guava.version}/</outputDirectory>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>com.google:guava</include>
-            </includes>
-        </dependencySet-->
         <dependencySet>
             <outputDirectory>/system/org/apache/jclouds/cli/jclouds-cli-runner/${project.version}/</outputDirectory>
             <fileMode>0644</fileMode>
diff --git a/assembly/src/main/assembly/win.xml b/assembly/src/main/assembly/win.xml
index b3e7923..88053f2 100644
--- a/assembly/src/main/assembly/win.xml
+++ b/assembly/src/main/assembly/win.xml
@@ -135,13 +135,6 @@
             </includes>
             <useTransitiveDependencies>false</useTransitiveDependencies>
         </dependencySet>
-        <!--dependencySet>
-	    <outputDirectory>/system/com/google/guava/guava/${guava.version}/</outputDirectory>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>com.google:guava</include>
-            </includes>
-        </dependencySet-->
         <dependencySet>
             <outputDirectory>/system/org/apache/jclouds/cli/jclouds-cli-runner/${project.version}/</outputDirectory>
             <fileMode>0644</fileMode>