You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2018/07/27 10:04:24 UTC
[1/2] brooklyn-dist git commit: Update Brooklyn codebase to build the
newly donated UI
Repository: brooklyn-dist
Updated Branches:
refs/heads/master 45afdac0c -> 3f876c515
Update Brooklyn codebase to build the newly donated UI
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/6afca19f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/6afca19f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/6afca19f
Branch: refs/heads/master
Commit: 6afca19f484a76cb94394be0e86e9b703b064be8
Parents: 2962a16
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Thu Jul 26 12:58:58 2018 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Thu Jul 26 12:58:58 2018 +0100
----------------------------------------------------------------------
karaf/features/pom.xml | 11 +++++++++++
karaf/features/src/main/feature/feature.xml | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/6afca19f/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml
index dd5162c..cda26c1 100644
--- a/karaf/features/pom.xml
+++ b/karaf/features/pom.xml
@@ -33,6 +33,17 @@
<description>Defines Karaf features for Karaf runtime</description>
<packaging>feature</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui</groupId>
+ <artifactId>brooklyn-ui-features</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/6afca19f/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 2c58c76..ccae9dd 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -21,6 +21,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://karaf.apache.org/xmlns/features/v1.4.0">
+ <repository>mvn:${project.groupId}.ui/brooklyn-ui-features/${project.version}/xml/features</repository>
+
<feature name="brooklyn-standard-karaf" version="${project.version}" description="Karaf standard feature with RMI excluded">
<feature>wrap</feature>
<feature>aries-blueprint</feature>
@@ -100,7 +102,7 @@
<feature name="brooklyn-jsgui" version="${project.version}" description="Brooklyn REST JavaScript Web GUI">
<feature>brooklyn-jsgui-prereqs</feature>
- <bundle>mvn:org.apache.brooklyn/brooklyn-jsgui/${project.version}/war</bundle>
+ <feature>brooklyn-ui</feature>
</feature>
<feature name="brooklyn-boot" version="${project.version}" description="Bundles to start on boot">
[2/2] brooklyn-dist git commit: This closes #124
Posted by he...@apache.org.
This closes #124
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/3f876c51
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/3f876c51
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/3f876c51
Branch: refs/heads/master
Commit: 3f876c51578395dd658b82516c263814d58476c9
Parents: 45afdac 6afca19
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Jul 27 11:04:07 2018 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Jul 27 11:04:07 2018 +0100
----------------------------------------------------------------------
karaf/features/pom.xml | 11 +++++++++++
karaf/features/src/main/feature/feature.xml | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------