You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/07/12 10:44:14 UTC
[1/2] brooklyn-server git commit: brooklyn-server karaf: don’t depend on library
Repository: brooklyn-server
Updated Branches:
refs/heads/master d5462fbbf -> ae4a3a1eb
brooklyn-server karaf: don\u2019t depend on library
Don\u2019t depend on bundles that are in brooklyn-library when building
brooklyn-server: they won\u2019t be available yet.
Long-term solution is to move all of this into brooklyn-dist, and
then we can re-enable these.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/47a02dfc
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/47a02dfc
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/47a02dfc
Branch: refs/heads/master
Commit: 47a02dfcf67f57bb1c057edfaf6dcbe29edcddf1
Parents: 34c2899
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jul 12 01:05:56 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Jul 12 11:34:43 2016 +0100
----------------------------------------------------------------------
karaf/apache-brooklyn/pom.xml | 1 -
karaf/features/src/main/feature/feature.xml | 12 ++++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/47a02dfc/karaf/apache-brooklyn/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml
index d1d23be..16f1509 100755
--- a/karaf/apache-brooklyn/pom.xml
+++ b/karaf/apache-brooklyn/pom.xml
@@ -128,7 +128,6 @@
<bootFeature>brooklyn-jsgui</bootFeature>
<bootFeature>brooklyn-rest-resources</bootFeature>
<bootFeature>brooklyn-commands</bootFeature>
- <bootFeature>brooklyn-commands</bootFeature>
</bootFeatures>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/47a02dfc/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 147cecc..c4eefc5 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -336,11 +336,16 @@
<bundle>mvn:org.apache.brooklyn/brooklyn-test-framework/${project.version}</bundle>
</feature>
- <!-- Don't load all bundles out of the box in the long run. Let users cherry pick what they need. -->
- <feature name="brooklyn-software-all" version="${project.version}" description="Brooklyn All Software Entities">
+ <feature name="brooklyn-server-software-all" version="${project.version}" description="Brooklyn All Core Entities">
<feature>brooklyn-software-base</feature>
<feature>brooklyn-jmxmp-agent</feature>
<feature>brooklyn-jmxrmi-agent</feature>
+ <feature>brooklyn-test-framework</feature>
+ </feature>
+
+ <!-- TODO Not including this in the init features; need to move this to brooklyn-dist first! -->
+ <!-- TODO Don't load all bundles out of the box in the long run. Let users cherry pick what they need. -->
+ <feature name="brooklyn-library-all" version="${project.version}" description="Brooklyn All Library Entities">
<feature>brooklyn-software-network</feature>
<feature>brooklyn-software-cm</feature>
<feature>brooklyn-software-osgi</feature>
@@ -349,12 +354,11 @@
<feature>brooklyn-software-messaging</feature>
<feature>brooklyn-software-nosql</feature>
<feature>brooklyn-software-monitoring</feature>
- <feature>brooklyn-test-framework</feature>
</feature>
<feature name="brooklyn-osgi-launcher" version="${project.version}" description="Brooklyn init">
<feature>brooklyn-core</feature>
- <feature>brooklyn-software-all</feature>
+ <feature>brooklyn-server-software-all</feature>
<feature>brooklyn-locations-jclouds</feature>
<bundle>mvn:org.apache.brooklyn/brooklyn-launcher-common/${project.version}</bundle>
<bundle start-level="90">mvn:org.apache.brooklyn/brooklyn-karaf-init/${project.version}</bundle>
[2/2] brooklyn-server git commit: Closes #248
Posted by sv...@apache.org.
Closes #248
brooklyn-server karaf: don\u2019t depend on library
Don\u2019t depend on bundles that are in brooklyn-library when building
brooklyn-server: they won\u2019t be available yet.
Long-term solution is to move all of this into brooklyn-dist, and
then we can re-enable these.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ae4a3a1e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ae4a3a1e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ae4a3a1e
Branch: refs/heads/master
Commit: ae4a3a1ebb259d622960fdc38295edcf144860ae
Parents: d5462fb 47a02df
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Jul 12 13:43:08 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Jul 12 13:43:08 2016 +0300
----------------------------------------------------------------------
karaf/apache-brooklyn/pom.xml | 1 -
karaf/features/src/main/feature/feature.xml | 12 ++++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------