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-dist.git

commit 8738ba0514a2ab297320a8f365f1357d163d0089
Author: Alex Heneveld <[email protected]>
AuthorDate: Thu Nov 11 09:38:21 2021 +0000

    rejig all's pom so that dependents get better ordering of dependencies
    
    in particular prefer util-common's javax.annotation from jakarta,
    over findbugs via guava
---
 all/pom.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index 42c624f..0f9d3ff 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -43,10 +43,15 @@
              maven projects see the same versions we include via osgi, at 
least that is the intention! -->
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>org.apache.brooklyn</groupId>
+            <artifactId>brooklyn-utils-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.brooklyn</groupId>
+            <artifactId>brooklyn-core</artifactId>
+            <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.brooklyn</groupId>
             <artifactId>brooklyn-launcher</artifactId>
@@ -64,7 +69,6 @@
             <artifactId>camp-server</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.brooklyn</groupId>
             <artifactId>brooklyn-policy</artifactId>

Reply via email to