diff --git a/assembly/src/main/assembly/unix.xml b/assembly/src/main/assembly/unix.xml index 0de1193..095fe62 100644 --- a/assembly/src/main/assembly/unix.xml +++ b/assembly/src/main/assembly/unix.xml @@ -137,13 +137,6 @@ false - - /system/com/google/guava/guava/${guava.version}/ - 0644 - - com.google:guava - - /system/org/apache/jclouds/cli/jclouds-cli-runner/${project.version}/ 0644 diff --git a/assembly/src/main/assembly/win.xml b/assembly/src/main/assembly/win.xml index bbbdc02..88053f2 100644 --- a/assembly/src/main/assembly/win.xml +++ b/assembly/src/main/assembly/win.xml @@ -135,13 +135,6 @@ false - - /system/com/google/guava/guava/${guava.version}/ - 0644 - - com.google:guava - - /system/org/apache/jclouds/cli/jclouds-cli-runner/${project.version}/ 0644 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 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 @@ - 2.3.9 + 2.3.11 1.3.7 1.7.4 1.8.0