Skip to content

Commit ecc05ab

Browse files
committed
[DO NOT COMMIT] fix dependencies for brooklyn-all
- depends on apache/brooklyn-server#830
1 parent a93a3a3 commit ecc05ab

File tree

1 file changed

+44
-5
lines changed

1 file changed

+44
-5
lines changed

all/pom.xml

+44-5
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@
5151
<groupId>org.apache.brooklyn</groupId>
5252
<artifactId>brooklyn-locations-jclouds</artifactId>
5353
<version>${project.version}</version>
54+
<!-- io.fabric8:kubernetes-client and jclouds require different versions -->
55+
<exclusions>
56+
<exclusion>
57+
<groupId>com.squareup.okio</groupId>
58+
<artifactId>okio</artifactId>
59+
</exclusion>
60+
</exclusions>
5461
</dependency>
5562
<dependency>
5663
<groupId>org.apache.brooklyn</groupId>
@@ -127,11 +134,43 @@
127134
<version>${project.version}</version>
128135
</dependency>
129136

130-
<!-- bring in all jclouds-supported cloud providers -->
131-
<dependency>
132-
<groupId>${jclouds.groupId}</groupId>
133-
<artifactId>jclouds-allcompute</artifactId>
134-
</dependency>
135137
</dependencies>
136138

139+
<build>
140+
<!-- Required by microbean-helm - see https://github.com/grpc/grpc-java/blob/master/SECURITY.md#openssl-statically-linked-netty-tcnative-boringssl-static -->
141+
<extensions>
142+
<!-- Use os-maven-plugin to initialize the "os.detected" properties -->
143+
<extension>
144+
<groupId>kr.motd.maven</groupId>
145+
<artifactId>os-maven-plugin</artifactId>
146+
<version>1.5.0.Final</version>
147+
</extension>
148+
</extensions>
149+
<plugins>
150+
<!-- Use Ant to configure the appropriate "tcnative.classifier" property -->
151+
<plugin>
152+
<groupId>org.apache.maven.plugins</groupId>
153+
<artifactId>maven-antrun-plugin</artifactId>
154+
<executions>
155+
<execution>
156+
<phase>initialize</phase>
157+
<configuration>
158+
<exportAntProperties>true</exportAntProperties>
159+
<target>
160+
<condition property="tcnative.classifier"
161+
value="${os.detected.classifier}-fedora"
162+
else="${os.detected.classifier}">
163+
<isset property="os.detected.release.fedora"/>
164+
</condition>
165+
</target>
166+
</configuration>
167+
<goals>
168+
<goal>run</goal>
169+
</goals>
170+
</execution>
171+
</executions>
172+
</plugin>
173+
</plugins>
174+
</build>
175+
137176
</project>

0 commit comments

Comments
 (0)