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 2020/07/22 12:13:44 UTC
[brooklyn-ui] 01/03: feature poms include the dependencies the
feature uses
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 1f04c9a8e795364bb42fdca822a676ecc73224a5
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Jun 2 09:42:41 2020 +0100
feature poms include the dependencies the feature uses
and tidy versions and exclusions for maven/osgi consistency
---
features/pom.xml | 22 +++++++++----
modularity-server/features/pom.xml | 20 ++++++++++++
ui-modules/features/pom.xml | 67 +++++++++++++++++++++++++++++++++++---
3 files changed, 98 insertions(+), 11 deletions(-)
diff --git a/features/pom.xml b/features/pom.xml
index 47f60cd..17e04ce 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -36,28 +36,38 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
- <version>${karaf.version}</version>
<type>kar</type>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>standard</artifactId>
- <classifier>features</classifier>
<version>${karaf.version}</version>
+ <classifier>features</classifier>
<type>xml</type>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-features</artifactId>
<version>${brooklyn.version}</version>
+ <classifier>features</classifier>
<type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modularity</groupId>
+ <artifactId>brooklyn-ui-modularity-features</artifactId>
+ <version>${brooklyn.ui.modularity.version}</version>
<classifier>features</classifier>
- <scope>provided</scope>
+ <type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modules</groupId>
+ <artifactId>brooklyn-ui-modules-features</artifactId>
+ <version>${brooklyn.ui.modules.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
</dependency>
</dependencies>
-
+
<build>
<resources>
<resource>
diff --git a/modularity-server/features/pom.xml b/modularity-server/features/pom.xml
index 245c708..95813d6 100644
--- a/modularity-server/features/pom.xml
+++ b/modularity-server/features/pom.xml
@@ -56,6 +56,26 @@
<classifier>features</classifier>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modularity</groupId>
+ <artifactId>brooklyn-ui-module-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modularity</groupId>
+ <artifactId>brooklyn-ui-module-registry</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modularity</groupId>
+ <artifactId>brooklyn-ui-metadata-registry</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modularity</groupId>
+ <artifactId>brooklyn-ui-external-modules</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/ui-modules/features/pom.xml b/ui-modules/features/pom.xml
index d1f2ef6..0545017 100644
--- a/ui-modules/features/pom.xml
+++ b/ui-modules/features/pom.xml
@@ -36,9 +36,7 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
- <version>${karaf.version}</version>
<type>kar</type>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
@@ -46,7 +44,6 @@
<classifier>features</classifier>
<version>${karaf.version}</version>
<type>xml</type>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.brooklyn</groupId>
@@ -54,7 +51,6 @@
<version>${brooklyn.version}</version>
<type>xml</type>
<classifier>features</classifier>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.brooklyn.ui.modularity</groupId>
@@ -62,7 +58,68 @@
<version>${brooklyn.ui.modularity.version}</version>
<type>xml</type>
<classifier>features</classifier>
- <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <!-- ensure this version, not karaf's version -->
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${cxf.javax.annotation-api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modules</groupId>
+ <artifactId>brooklyn-ui-home</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modules</groupId>
+ <artifactId>brooklyn-ui-logout</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modules</groupId>
+ <artifactId>brooklyn-ui-app-inspector</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modules</groupId>
+ <artifactId>brooklyn-ui-blueprint-composer</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modules</groupId>
+ <artifactId>brooklyn-ui-blueprint-importer</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modules</groupId>
+ <artifactId>brooklyn-ui-catalog</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modules</groupId>
+ <artifactId>brooklyn-ui-groovy-console</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modules</groupId>
+ <artifactId>brooklyn-ui-location-manager</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn.ui.modules</groupId>
+ <artifactId>brooklyn-ui-rest-api-docs</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
</dependency>
</dependencies>