Revert "This closes #119" This reverts commit 3f0944c1fcdda36f445e6a2b0485e443838a212c, reversing changes made to a93a3a36c982adbddf9898ed067070afc12689cd.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/67e89949 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/67e89949 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/67e89949 Branch: refs/heads/master Commit: 67e899490e70c8321921bc355783fed68c840928 Parents: 0f56713 Author: Thomas Bouron <thomas.bou...@cloudsoftcorp.com> Authored: Mon Apr 16 11:57:03 2018 +0100 Committer: Thomas Bouron <thomas.bou...@cloudsoftcorp.com> Committed: Mon Apr 16 11:57:03 2018 +0100 ---------------------------------------------------------------------- all/pom.xml | 49 +++++-------------------------------------------- 1 file changed, 5 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/67e89949/all/pom.xml ---------------------------------------------------------------------- diff --git a/all/pom.xml b/all/pom.xml index 6679083..de1166e 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -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>
