Skip to content
Permalink
Browse files
Revert "This closes #119"
This reverts commit 3f0944c, reversing
changes made to a93a3a3.
  • Loading branch information
tbouron committed Apr 16, 2018
1 parent 0f56713 commit 67e899490e70c8321921bc355783fed68c840928
Showing 1 changed file with 5 additions and 44 deletions.
@@ -51,13 +51,6 @@
<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>
@@ -134,43 +127,11 @@
<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>

0 comments on commit 67e8994

Please sign in to comment.