Repository: brooklyn-dist
Updated Branches:
  refs/heads/master a93a3a36c -> 3f0944c1f


[DO NOT COMMIT] fix dependencies for brooklyn-all

- depends on https://github.com/apache/brooklyn-server/pull/830


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/ecc05ab6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/ecc05ab6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/ecc05ab6

Branch: refs/heads/master
Commit: ecc05ab66c3de82303b14e3c1ba9e8cd91e4842d
Parents: a93a3a3
Author: andreaturli <andrea.tu...@gmail.com>
Authored: Mon Mar 26 10:49:50 2018 +0200
Committer: andreaturli <andrea.tu...@gmail.com>
Committed: Mon Mar 26 10:49:50 2018 +0200

----------------------------------------------------------------------
 all/pom.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ecc05ab6/all/pom.xml
----------------------------------------------------------------------
diff --git a/all/pom.xml b/all/pom.xml
index de1166e..6679083 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -51,6 +51,13 @@
             <groupId>org.apache.brooklyn</groupId>
             <artifactId>brooklyn-locations-jclouds</artifactId>
             <version>${project.version}</version>
+            <!-- io.fabric8:kubernetes-client and jclouds require different 
versions -->
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okio</groupId>
+                    <artifactId>okio</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.brooklyn</groupId>
@@ -127,11 +134,43 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!-- bring in all jclouds-supported cloud providers -->
-        <dependency>
-            <groupId>${jclouds.groupId}</groupId>
-            <artifactId>jclouds-allcompute</artifactId>
-        </dependency>
     </dependencies>
 
+    <build>
+        <!-- Required by microbean-helm - see 
https://github.com/grpc/grpc-java/blob/master/SECURITY.md#openssl-statically-linked-netty-tcnative-boringssl-static
 -->
+        <extensions>
+            <!-- Use os-maven-plugin to initialize the "os.detected" 
properties -->
+            <extension>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+                <version>1.5.0.Final</version>
+            </extension>
+        </extensions>
+        <plugins>
+            <!-- Use Ant to configure the appropriate "tcnative.classifier" 
property -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <exportAntProperties>true</exportAntProperties>
+                            <target>
+                                <condition property="tcnative.classifier"
+                                           
value="${os.detected.classifier}-fedora"
+                                           else="${os.detected.classifier}">
+                                    <isset 
property="os.detected.release.fedora"/>
+                                </condition>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Reply via email to