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 2021/04/06 16:48:05 UTC
[brooklyn-ui] branch master updated (b39c235 -> 83123be)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git.
from b39c235 Merge pull request #194 from algairim/smart-156
new 06843f6 further fix to service-component record generation
new 99e0feb include versions for the ui modules, to facilitate their being overridden
new 83123be Merge branch 'master' of https://gitbox.apache.org/repos/asf/brooklyn-ui
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
modularity-server/external-modules/pom.xml | 7 +++++++
modularity-server/metadata-registry/pom.xml | 7 +++++++
ui-modules/features/src/main/feature/feature.xml | 20 ++++++++++----------
3 files changed, 24 insertions(+), 10 deletions(-)
[brooklyn-ui] 01/03: further fix to service-component record
generation
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 06843f620dca5b4801ea23318d1c23f0de322109
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Apr 6 16:57:32 2021 +0100
further fix to service-component record generation
---
modularity-server/external-modules/pom.xml | 7 +++++++
modularity-server/metadata-registry/pom.xml | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/modularity-server/external-modules/pom.xml b/modularity-server/external-modules/pom.xml
index a6e359d..fc23600 100644
--- a/modularity-server/external-modules/pom.xml
+++ b/modularity-server/external-modules/pom.xml
@@ -101,6 +101,13 @@
<configuration>
<exportScr>true</exportScr>
<instructions>
+
+ <!-- exportScr and below from https://felix.apache.org/documentation/faqs/apache-felix-bundle-plugin-faq.html -->
+ <!-- Enable processing of OSGI DS component annotations -->
+ <_dsannotations>*</_dsannotations>
+ <!-- Enable processing of OSGI metatype annotations -->
+ <_metatypeannotations>*</_metatypeannotations>
+
<Import-Package>
org.slf4j,
*
diff --git a/modularity-server/metadata-registry/pom.xml b/modularity-server/metadata-registry/pom.xml
index bdb7284..ce62d4a 100644
--- a/modularity-server/metadata-registry/pom.xml
+++ b/modularity-server/metadata-registry/pom.xml
@@ -113,6 +113,13 @@
<configuration>
<exportScr>true</exportScr>
<instructions>
+
+ <!-- exportScr and below from https://felix.apache.org/documentation/faqs/apache-felix-bundle-plugin-faq.html -->
+ <!-- Enable processing of OSGI DS component annotations -->
+ <_dsannotations>*</_dsannotations>
+ <!-- Enable processing of OSGI metatype annotations -->
+ <_metatypeannotations>*</_metatypeannotations>
+
<Import-Package>
javax.ws.rs,
javax.servlet,
[brooklyn-ui] 02/03: include versions for the ui modules,
to facilitate their being overridden
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 99e0feb8930bb9d552f0e5df23349d294303edd9
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Apr 6 16:57:43 2021 +0100
include versions for the ui modules, to facilitate their being overridden
---
ui-modules/features/src/main/feature/feature.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/ui-modules/features/src/main/feature/feature.xml b/ui-modules/features/src/main/feature/feature.xml
index bed9aff..b31136f 100644
--- a/ui-modules/features/src/main/feature/feature.xml
+++ b/ui-modules/features/src/main/feature/feature.xml
@@ -26,20 +26,20 @@
-->
<feature name="brooklyn-ui-modules" version="${project.version}">
- <feature>brooklyn-ui-home</feature>
- <feature>brooklyn-ui-logout</feature>
+ <feature version="${project.version}">brooklyn-ui-home</feature>
+ <feature version="${project.version}">brooklyn-ui-logout</feature>
- <feature>brooklyn-ui-app-inspector</feature>
- <feature>brooklyn-ui-blueprint-composer</feature>
- <feature>brooklyn-ui-blueprint-importer</feature>
- <feature>brooklyn-ui-catalog</feature>
- <feature>brooklyn-ui-groovy-console</feature>
- <feature>brooklyn-ui-location-manager</feature>
- <feature>brooklyn-ui-rest-api-docs</feature>
+ <feature version="${project.version}">brooklyn-ui-app-inspector</feature>
+ <feature version="${project.version}">brooklyn-ui-blueprint-composer</feature>
+ <feature version="${project.version}">brooklyn-ui-blueprint-importer</feature>
+ <feature version="${project.version}">brooklyn-ui-catalog</feature>
+ <feature version="${project.version}">brooklyn-ui-groovy-console</feature>
+ <feature version="${project.version}">brooklyn-ui-location-manager</feature>
+ <feature version="${project.version}">brooklyn-ui-rest-api-docs</feature>
</feature>
<feature name="brooklyn-ui-home" version="${project.version}">
- <feature dependency="true">brooklyn-ui-moularity</feature>
+ <feature dependency="true">brooklyn-ui-modularity</feature>
<bundle>mvn:${project.groupId}/brooklyn-ui-home/${project.version}/war</bundle>
</feature>
[brooklyn-ui] 03/03: Merge branch 'master' of
https://gitbox.apache.org/repos/asf/brooklyn-ui
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 83123befd565fdd0a85c521c81a89061ea1f5117
Merge: 99e0feb b39c235
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Apr 6 17:47:44 2021 +0100
Merge branch 'master' of https://gitbox.apache.org/repos/asf/brooklyn-ui
ui-modules/catalog/package.json | 2 +-
ui-modules/utils/quick-launch/quick-launch.html | 8 ++++----
ui-modules/utils/quick-launch/quick-launch.js | 7 ++++++-
3 files changed, 11 insertions(+), 6 deletions(-)