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:12:26 UTC
[brooklyn-server] 03/05: 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-server.git
commit 0e34c4dd541d7020cd3c06f3c9eb49173a65c889
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Jun 2 09:38:05 2020 +0100
feature poms include the dependencies the feature uses
and tidy versions and exclusions for maven/osgi consistency
---
karaf/features/pom.xml | 22 ++++++++++++++++++++++
launcher/pom.xml | 12 ++++++------
locations/container/pom.xml | 10 ++++++++++
parent/pom.xml | 14 ++++++++++++++
4 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml
index 34da460..0bac569 100755
--- a/karaf/features/pom.xml
+++ b/karaf/features/pom.xml
@@ -115,5 +115,27 @@
</pluginManagement>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-launcher</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-locations-container</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-rest-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/launcher/pom.xml b/launcher/pom.xml
index 20707e1..f86936c 100644
--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@@ -73,7 +73,12 @@
</dependency>
<dependency>
<groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-software-base</artifactId>
+ <artifactId>brooklyn-software-winrm</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-locations-jclouds</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -171,11 +176,6 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-locations-jclouds</artifactId>
- <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/locations/container/pom.xml b/locations/container/pom.xml
index 2a4021b..e7f9211 100644
--- a/locations/container/pom.xml
+++ b/locations/container/pom.xml
@@ -51,8 +51,18 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <!-- needed for above, but wanted at the same version of jackson we use elsewhere in brooklyn -->
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
<!--
Expect Brooklyn to exclude this, and to choose its own jclouds-docker version.
diff --git a/parent/pom.xml b/parent/pom.xml
index ff53114..98e65f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -144,6 +144,19 @@
<artifactId>org.osgi.compendium</artifactId>
<version>${felix-osgi-compendium.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <type>kar</type>
+ <version>${karaf.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- ensure the later cxf version is pulled in instead -->
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- END karaf version overrides -->
<dependency>
@@ -1121,6 +1134,7 @@
<!-- files not requiring licence -->
<exclude>ignored/**</exclude>
<exclude>LICENSE.md</exclude>
+ <exclude>DEPENDENCIES</exclude>
<exclude>.mvn/jvm.config</exclude>
<exclude>**/src/main/license/**</exclude>
<exclude>**/src/test/license/**</exclude>