Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56A83180E2 for ; Mon, 26 Oct 2015 23:58:27 +0000 (UTC) Received: (qmail 74009 invoked by uid 500); 26 Oct 2015 23:58:27 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 73986 invoked by uid 500); 26 Oct 2015 23:58:27 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 73977 invoked by uid 99); 26 Oct 2015 23:58:27 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Oct 2015 23:58:27 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id C72CCC0720 for ; Mon, 26 Oct 2015 23:58:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.77 X-Spam-Level: * X-Spam-Status: No, score=1.77 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id LLLAFwi4MX_c for ; Mon, 26 Oct 2015 23:58:24 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 7AAB820F10 for ; Mon, 26 Oct 2015 23:58:21 +0000 (UTC) Received: (qmail 73810 invoked by uid 99); 26 Oct 2015 23:58:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Oct 2015 23:58:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 98EB0E08EA; Mon, 26 Oct 2015 23:58:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hadrian@apache.org To: commits@brooklyn.incubator.apache.org Date: Mon, 26 Oct 2015 23:58:27 -0000 Message-Id: In-Reply-To: <69cde071059b45df94c4b57aa73adcb4@git.apache.org> References: <69cde071059b45df94c4b57aa73adcb4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/12] incubator-brooklyn git commit: [BROOKLYN-183] Completed brooklyn-core as karaf feature [BROOKLYN-183] Completed brooklyn-core as karaf feature * also split brooklyn-* bundles into different standalone features * clean up bundle dependencies Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dadf87ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dadf87ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dadf87ac Branch: refs/heads/master Commit: dadf87ac6ec765244573f0edb4ab8d0d66a9a52a Parents: 04bb1f2 Author: Ciprian Ciubotariu Authored: Sat Oct 10 23:43:19 2015 +0300 Committer: Ciprian Ciubotariu Committed: Sun Oct 25 01:04:51 2015 +0300 ---------------------------------------------------------------------- karaf/features/src/main/feature/feature.xml | 45 +++++++++++++++++--- .../features/src/main/history/dependencies.xml | 24 +++++++++++ 2 files changed, 64 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dadf87ac/karaf/features/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index d308bce..c6cfed6 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -22,15 +22,37 @@ mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features - + + mvn:org.apache.brooklyn/brooklyn-utils-common/${project.version} + mvn:org.apache.brooklyn/brooklyn-logback-includes/${project.version} + + mvn:com.google.guava/guava/${guava.version} + mvn:org.codehaus.groovy/groovy-all/${groovy.version} + mvn:commons-io/commons-io/${commons-io.version} + mvn:org.slf4j/jul-to-slf4j/${slf4j.version} + mvn:org.yaml/snakeyaml/${snakeyaml.version} + + mvn:ch.qos.logback/logback-classic/${logback.version} + mvn:ch.qos.logback/logback-core/${logback.version} + + + + brooklyn-utils-common + mvn:org.apache.brooklyn/brooklyn-utils-common/${project.version} + + + + brooklyn-utils-common + mvn:org.apache.brooklyn/brooklyn-api/${project.version} + + + brooklyn-api + mvn:org.apache.brooklyn/brooklyn-core/${project.version} - mvn:org.apache.brooklyn/brooklyn-api/${project.version} - mvn:org.apache.brooklyn/brooklyn-utils-common/${project.version} + mvn:org.apache.brooklyn/brooklyn-rt-osgi/${project.version} mvn:org.apache.brooklyn/brooklyn-utils-groovy/${project.version} - mvn:org.apache.brooklyn/brooklyn-logback-includes/${project.version} - mvn:com.google.guava/guava/${guava.version} mvn:com.google.code.gson/gson/${gson.version} mvn:com.jayway.jsonpath/json-path/${jsonPath.version} mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version} @@ -39,11 +61,24 @@ mvn:net.minidev/json-smart/${jsonSmart.version} mvn:net.minidev/asm/${minidev.asm.version} mvn:com.thoughtworks.xstream/xstream/${xstream.version} + mvn:org.freemarker/freemarker/${freemarker.version} + mvn:net.schmizz/sshj/${sshj.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/1.1.3_2 + mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version} + mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version} + mvn:commons-codec/commons-codec/${commons-codec.version} + mvn:org.apache.commons/commons-lang3/${commons-lang3.version} + mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient.version} + mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version} + mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version} + mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version} + mvn:org.codehaus.jackson/jackson-jaxrs/${jackson.version} wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc wrap:mvn:com.maxmind.geoip2/geoip2/${maxmind.version} wrap:mvn:xpp3/xpp3_min/1.1.4c + wrap:mvn:org.reflections/reflections/${reflections.version} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dadf87ac/karaf/features/src/main/history/dependencies.xml ---------------------------------------------------------------------- diff --git a/karaf/features/src/main/history/dependencies.xml b/karaf/features/src/main/history/dependencies.xml index d90b75f..a77e8ad 100644 --- a/karaf/features/src/main/history/dependencies.xml +++ b/karaf/features/src/main/history/dependencies.xml @@ -1,6 +1,11 @@ + brooklyn-api + brooklyn-utils-common + brooklyn-utils-common + mvn:ch.qos.logback/logback-classic/1.0.7 + mvn:ch.qos.logback/logback-core/1.0.7 mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.2 mvn:com.fasterxml.jackson.core/jackson-core/2.4.2 mvn:com.fasterxml.jackson.core/jackson-databind/2.4.2 @@ -8,16 +13,35 @@ mvn:com.google.guava/guava/17.0 mvn:com.jayway.jsonpath/json-path/2.0.0 mvn:com.thoughtworks.xstream/xstream/1.4.7 + mvn:commons-codec/commons-codec/1.9 + mvn:commons-io/commons-io/2.4 mvn:net.minidev/asm/1.0.2 mvn:net.minidev/json-smart/2.1.1 + mvn:net.schmizz/sshj/0.8.1 mvn:org.apache.brooklyn/brooklyn-api/0.9.0-SNAPSHOT mvn:org.apache.brooklyn/brooklyn-commands/0.9.0-SNAPSHOT mvn:org.apache.brooklyn/brooklyn-core/0.9.0-SNAPSHOT mvn:org.apache.brooklyn/brooklyn-logback-includes/0.9.0-SNAPSHOT + mvn:org.apache.brooklyn/brooklyn-rt-osgi/0.9.0-SNAPSHOT + mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT mvn:org.apache.brooklyn/brooklyn-utils-groovy/0.9.0-SNAPSHOT + mvn:org.apache.commons/commons-lang3/3.1 + mvn:org.apache.httpcomponents/httpclient-osgi/4.4.1 + mvn:org.apache.httpcomponents/httpcore-osgi/4.4.1 + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/1.1.3_2 + mvn:org.bouncycastle/bcpkix-jdk15on/1.49 + mvn:org.bouncycastle/bcprov-ext-jdk15on/1.49 + mvn:org.codehaus.groovy/groovy-all/2.3.4 + mvn:org.codehaus.jackson/jackson-core-asl/1.9.13 + mvn:org.codehaus.jackson/jackson-jaxrs/1.9.13 + mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13 + mvn:org.freemarker/freemarker/2.3.22 + mvn:org.slf4j/jul-to-slf4j/1.6.6 + mvn:org.yaml/snakeyaml/1.11 wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc wrap:mvn:com.maxmind.geoip2/geoip2/0.8.1 + wrap:mvn:org.reflections/reflections/0.9.9-RC1 wrap:mvn:xpp3/xpp3_min/1.1.4c