You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2017/05/12 13:23:36 UTC
[3/4] jclouds-cli git commit: Fix karaf assembly
Fix karaf assembly
Project: http://git-wip-us.apache.org/repos/asf/jclouds-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-cli/commit/22d50322
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-cli/tree/22d50322
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-cli/diff/22d50322
Branch: refs/heads/master
Commit: 22d503224fe30221d8f51d4f6052646cef82a354
Parents: a793d4f
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri May 12 11:50:50 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri May 12 11:50:50 2017 +0200
----------------------------------------------------------------------
assembly/pom.xml | 2 ++
.../etc/org.apache.karaf.features.cfg | 8 ++++--
.../filtered-resources/etc/startup.properties | 29 ++------------------
project/pom.xml | 22 +++++++--------
4 files changed, 22 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/22d50322/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 6b4ce7e..f5708e5 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -179,7 +179,9 @@
</descriptors>
<features>
<feature>config</feature>
+ <feature>log</feature>
<feature>shell-compat</feature>
+ <feature>wrap</feature>
<feature>jclouds</feature>
<feature>jclouds-commands</feature>
<feature>jclouds-compute</feature>
http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/22d50322/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
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 728c2b2..5d084c1 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
@@ -14,6 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-featuresRepositories=mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features
+featuresRepositories=\
+ mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features, \
+ mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features
-featuresBoot=jclouds-chef,jclouds-aws-ec2,jclouds-aws-s3
\ No newline at end of file
+featuresBoot=\
+ shell-compat,config,log,\
+ jclouds-chef,jclouds-aws-ec2,jclouds-aws-s3
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/22d50322/assembly/src/main/filtered-resources/etc/startup.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/etc/startup.properties b/assembly/src/main/filtered-resources/etc/startup.properties
index 1b3fca7..48d0d36 100644
--- a/assembly/src/main/filtered-resources/etc/startup.properties
+++ b/assembly/src/main/filtered-resources/etc/startup.properties
@@ -17,34 +17,11 @@
#
################################################################################
-#
-# Startup core services like logging
-#
-org/ops4j/pax/url/pax-url-mvn/${pax.url.version}/pax-url-mvn-${pax.url.version}.jar=5
-org/ops4j/pax/url/pax-url-wrap/${pax.url.version}/pax-url-wrap-${pax.url.version}.jar=5
org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar=8
org/ops4j/pax/logging/pax-logging-service/${pax.logging.version}/pax-logging-service-${pax.logging.version}.jar=8
org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.version}/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar=11
+org/ops4j/pax/url/pax-url-aether/${pax.url.version}/pax-url-aether-${pax.url.version}.jar=5
+org/ops4j/pax/url/pax-url-wrap/${pax.url.version}/pax-url-wrap-${pax.url.version}-uber.jar=5
+mvn\:org.apache.karaf.features/org.apache.karaf.features.core/${karaf.version} = 15
-
-#
-# The rest of the services..
-#
-org/ow2/asm/asm-all/${asm.version}/asm-all-${asm.version}.jar=20
-org/apache/aries/org.apache.aries.util/${aries.util.version}/org.apache.aries.util-${aries.util.version}.jar=20
-org/apache/aries/proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}/org.apache.aries.proxy.api-${aries.proxy.api.version}.jar=20
-org/apache/aries/proxy/org.apache.aries.proxy.impl/${aries.proxy.version}/org.apache.aries.proxy.impl-${aries.proxy.version}.jar=20
-org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}/org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar=20
-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=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=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=30
-org/apache/karaf/features/org.apache.karaf.features.command/${karaf.version}/org.apache.karaf.features.command-${karaf.version}.jar=30
http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/22d50322/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 0693eb5..dd8f3c1 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -67,18 +67,18 @@
<properties>
<!-- Karaf Version Dependencies -->
<karaf.version>4.0.9</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>
- <aries.util.version>1.1.0</aries.util.version>
- <aries.proxy.version>1.0.2</aries.proxy.version>
- <aries.proxy.api.version>1.0.0</aries.proxy.api.version>
- <aries.blueprint.api.version>1.0.0</aries.blueprint.api.version>
- <aries.blueprint.core.version>1.4.0</aries.blueprint.core.version>
- <aries.blueprint.cm.version>1.0.3</aries.blueprint.cm.version>
+ <pax.url.version>2.5.2</pax.url.version>
+ <pax.logging.version>1.8.5</pax.logging.version>
+ <felix.configadmin.version>1.8.14</felix.configadmin.version>
+ <aries.util.version>1.1.1</aries.util.version>
+ <aries.proxy.version>1.0.5</aries.proxy.version>
+ <aries.proxy.api.version>1.0.1</aries.proxy.api.version>
+ <aries.blueprint.api.version>1.0.1</aries.blueprint.api.version>
+ <aries.blueprint.core.version>1.7.1</aries.blueprint.core.version>
+ <aries.blueprint.cm.version>1.0.9</aries.blueprint.cm.version>
<aries.jmx.version>1.1.1</aries.jmx.version>
- <asm.version>4.1</asm.version>
- <felix.fileinstall.version>3.4.2</felix.fileinstall.version>
+ <asm.version>5.0.4</asm.version>
+ <felix.fileinstall.version>3.5.8</felix.fileinstall.version>
<jclouds.karaf.version>${project.parent.version}</jclouds.karaf.version>
<jclouds.version>${project.parent.version}</jclouds.version>
<log4j.version>1.2.17</log4j.version>