You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2019/12/16 09:55:03 UTC
[brooklyn-server] branch master updated: Upgrade jclouds to 2.1.2
from 2.1.0
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new e53d141 Upgrade jclouds to 2.1.2 from 2.1.0
new 4ab738f Merge pull request #1074 from aledsage/upgrade-jclouds-2.1.2
e53d141 is described below
commit e53d141b51aae18c932b0f01f402a7c40db12d5f
Author: Aled Sage <al...@gmail.com>
AuthorDate: Mon Dec 2 15:18:51 2019 +0000
Upgrade jclouds to 2.1.2 from 2.1.0
---
karaf/features/src/main/feature/feature.xml | 1 -
locations/jclouds/pom.xml | 7 +------
.../jclouds/networking/creator/DefaultAzureArmNetworkCreator.java | 3 ++-
.../brooklyn/location/jclouds/JcloudsStubTemplateBuilder.java | 2 --
.../apache/brooklyn/location/jclouds/JcloudsWinrmingLiveTest.java | 2 --
pom.xml | 2 +-
6 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index bb1430f..141c3dc 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -288,7 +288,6 @@
</feature>
<feature name="brooklyn-locations-jclouds-labs" version="${project.version}" description="Brooklyn JClouds Labs Location Targets">
- <bundle>mvn:org.apache.jclouds.labs/azurecompute/${jclouds.version}</bundle>
</feature>
<feature name="brooklyn-container-service" version="${project.version}" description="Brooklyn Container Service and Location Targets">
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index f3c97d9..2502285 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -136,17 +136,12 @@
<version>${jclouds.version}</version>
<exclusions>
<exclusion>
- <!-- pulls in 1.17 where we want 1.21 -->
+ <!-- pulls in 1.17 where we want a newer version -->
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>${jclouds.groupId}.labs</groupId>
- <artifactId>azurecompute</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
<!-- these two seem needed here to prevent Eclipse IDE from getting wrong version of logback-core -->
<dependency>
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreator.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreator.java
index 45bb381..c5ac8f3 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreator.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreator.java
@@ -35,6 +35,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.jclouds.azurecompute.arm.AzureComputeApi;
+import org.jclouds.azurecompute.arm.domain.AddressSpace;
import org.jclouds.azurecompute.arm.domain.ResourceGroup;
import org.jclouds.azurecompute.arm.domain.Subnet;
import org.jclouds.azurecompute.arm.domain.VirtualNetwork;
@@ -123,7 +124,7 @@ public class DefaultAzureArmNetworkCreator {
Subnet subnet = Subnet.create(subnetName, null, null, subnetProperties);
VirtualNetwork.VirtualNetworkProperties virtualNetworkProperties = VirtualNetwork.VirtualNetworkProperties
- .builder().addressSpace(VirtualNetwork.AddressSpace.create(Arrays.asList(DEFAULT_VNET_ADDRESS_PREFIX)))
+ .builder().addressSpace(AddressSpace.create(Arrays.asList(DEFAULT_VNET_ADDRESS_PREFIX)))
.subnets(Arrays.asList(subnet)).build();
virtualNetworkApi.createOrUpdate(vnetName, location, Maps.newHashMap(), virtualNetworkProperties);
} else {
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsStubTemplateBuilder.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsStubTemplateBuilder.java
index ccf3ccc..844a874 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsStubTemplateBuilder.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsStubTemplateBuilder.java
@@ -170,8 +170,6 @@ public class JcloudsStubTemplateBuilder {
case "google-compute-engine" :
return new GoogleComputeEngineTemplateOptions();
//return mock(GoogleComputeEngineTemplateOptions.class);
- case "azurecompute" :
- return new org.jclouds.azurecompute.compute.options.AzureComputeTemplateOptions();
case "azurecompute-arm" :
return new org.jclouds.azurecompute.arm.compute.options.AzureTemplateOptions();
case "softlayer" :
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsWinrmingLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsWinrmingLiveTest.java
index b5a0686..32bdda2 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsWinrmingLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsWinrmingLiveTest.java
@@ -22,8 +22,6 @@ import java.util.Map;
import org.apache.brooklyn.util.collections.MutableMap;
import org.jclouds.Constants;
-import org.jclouds.azurecompute.arm.compute.options.AzureTemplateOptions;
-import org.jclouds.azurecompute.compute.options.AzureComputeTemplateOptions;
import org.jclouds.compute.domain.OsFamily;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/pom.xml b/pom.xml
index 396bd41..155280f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
<!-- Dependency Versions -->
- <jclouds.version>2.1.0</jclouds.version> <!-- JCLOUDS_VERSION -->
+ <jclouds.version>2.1.2</jclouds.version> <!-- JCLOUDS_VERSION -->
<logback.version>1.0.7</logback.version>
<slf4j.version>1.7.25</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception -->
<!-- Must match jclouds' version. From jclouds 1.9.3+ can be any version in the range [16-20) -->