You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2018/02/22 15:08:14 UTC
[1/3] brooklyn-server git commit: [BROOKLYN-583] Bump jclouds version
to 2.1.0
Repository: brooklyn-server
Updated Branches:
refs/heads/master 95698eadb -> 52c23b44a
[BROOKLYN-583] Bump jclouds version to 2.1.0
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/835b0a76
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/835b0a76
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/835b0a76
Branch: refs/heads/master
Commit: 835b0a764c34a812a77d8ddf796f7985e9e6e903
Parents: 95698ea
Author: andreaturli <an...@gmail.com>
Authored: Tue Dec 12 17:48:07 2017 +0100
Committer: andreaturli <an...@gmail.com>
Committed: Thu Feb 22 12:48:08 2018 +0100
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 53 ++------------------
locations/jclouds/pom.xml | 5 --
.../creator/DefaultAzureArmNetworkCreator.java | 3 +-
.../persist/jclouds/BlobStoreExpiryTest.java | 2 +-
.../jclouds/JcloudsStubTemplateBuilder.java | 6 +--
.../DefaultAzureArmNetworkCreatorTest.java | 6 +--
pom.xml | 2 +-
7 files changed, 14 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/835b0a76/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 4878ef5..06d8963 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -251,57 +251,16 @@
</feature>
<feature name="brooklyn-locations-jclouds" version="${project.version}" description="Brooklyn Jclouds Location Targets">
- <!-- Override jclouds provided 0.3_1 dependency - jclouds already depends on 1.1, but jclouds-karaf is not updated yet. -->
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/1.1_1</bundle>
-
- <!--
- OkHttp had OSGi support shortly in 3.0.0, but was immediately reverted in 3.0.1
- https://github.com/square/okhttp/pull/2192
- https://github.com/square/okhttp/issues/2243
- https://github.com/square/okhttp/pull/2246
- -->
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okhttp.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${okio.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.apache.jclouds.driver/jclouds-okhttp/${jclouds.version}</bundle>
-
- <bundle dependency="true">mvn:org.apache.jclouds.driver/jclouds-sshj/${jclouds.version}</bundle>
- <!--<bundle dependency="true">mvn:org.apache.jclouds.labs/abiquo/${jclouds.version}</bundle>--> <!-- jclouds abstraction not implemented -->
- <bundle dependency="true">mvn:org.apache.jclouds.api/docker/${jclouds.version}</bundle>
-
<bundle>mvn:org.apache.jclouds/jclouds-loadbalancer/${jclouds.version}</bundle>
<feature>jclouds-services</feature>
- <bundle dependency="true">wrap:mvn:com.jcraft/jsch.agentproxy.sshj/0.0.9$Bundle-Name=wrap%20%3A%3A%20jsch.agentproxy.sshj</bundle>
+ <feature>jclouds-driver-sshj</feature>
+ <feature>jclouds-driver-slf4j</feature>
<!-- Same as allcompute -->
- <feature>jclouds-aws-ec2</feature>
- <feature>jclouds-api-openstack-nova</feature>
- <feature>jclouds-api-byon</feature>
- <feature>jclouds-api-ec2</feature>
- <feature>jclouds-digitalocean2</feature>
- <feature>jclouds-gogrid</feature>
- <feature>jclouds-elastichosts-lon-b</feature>
- <feature>jclouds-elastichosts-lon-p</feature>
- <feature>jclouds-elastichosts-sat-p</feature>
- <feature>jclouds-openhosting-east1</feature>
- <feature>jclouds-serverlove-z1-man</feature>
- <feature>jclouds-skalicloud-sdg-my</feature>
- <feature>jclouds-go2cloud-jhb1</feature>
- <feature>jclouds-softlayer</feature>
- <feature>jclouds-api-cloudstack</feature>
- <feature>jclouds-profitbricks</feature>
- <!-- feature>hpcloud</feature-->
- <feature>jclouds-rackspace-cloudservers-us</feature>
- <feature>jclouds-rackspace-cloudservers-uk</feature>
+ <feature>jclouds-all-compute</feature>
<!-- Same as allblobstore -->
- <feature>jclouds-aws-s3</feature>
- <feature>jclouds-azureblob</feature>
- <feature>jclouds-api-atmos</feature>
- <feature>jclouds-api-openstack-swift</feature>
- <feature>jclouds-rackspace-cloudfiles-uk</feature>
- <feature>jclouds-rackspace-cloudfiles-us</feature>
- <!-- feature>hpcloud</feature -->
- <feature>jclouds-api-filesystem</feature>
+ <feature>jclouds-all-blobstore</feature>
<bundle start-level="85">mvn:org.apache.brooklyn/brooklyn-locations-jclouds/${project.version}</bundle>
<feature>brooklyn-software-winrm</feature>
@@ -310,10 +269,6 @@
<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>
- <bundle>mvn:org.apache.jclouds.labs/azurecompute-arm/${jclouds.version}</bundle>
- <bundle>mvn:org.apache.jclouds.api/oauth/${jclouds.version}</bundle>
- <bundle>mvn:org.apache.jclouds.common/googlecloud/${jclouds.version}</bundle>
- <bundle>mvn:org.apache.jclouds.provider/google-compute-engine/${jclouds.version}</bundle>
</feature>
<feature name="brooklyn-container-service" version="${project.version}" description="Brooklyn Container Service and Location Targets">
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/835b0a76/locations/jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index 878e598..5d3b09a 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -140,11 +140,6 @@
<artifactId>azurecompute</artifactId>
<version>${jclouds.version}</version>
</dependency>
- <dependency>
- <groupId>${jclouds.groupId}.labs</groupId>
- <artifactId>azurecompute-arm</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
<!-- these two seem needed here to prevent Eclipse IDE from getting wrong version of logback-core -->
<dependency>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/835b0a76/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreator.java
----------------------------------------------------------------------
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 885690f..45bb381 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
@@ -26,6 +26,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import com.google.common.collect.Maps;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,7 +125,7 @@ public class DefaultAzureArmNetworkCreator {
VirtualNetwork.VirtualNetworkProperties virtualNetworkProperties = VirtualNetwork.VirtualNetworkProperties
.builder().addressSpace(VirtualNetwork.AddressSpace.create(Arrays.asList(DEFAULT_VNET_ADDRESS_PREFIX)))
.subnets(Arrays.asList(subnet)).build();
- virtualNetworkApi.createOrUpdate(vnetName, location, virtualNetworkProperties);
+ virtualNetworkApi.createOrUpdate(vnetName, location, Maps.newHashMap(), virtualNetworkProperties);
} else {
LOG.info("Network config not specified when provisioning Azure machine, and default subnet does not exists. "
+ "Creating subnet [{}] on network [{}], and updating template options", subnetName, vnetName);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/835b0a76/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreExpiryTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreExpiryTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreExpiryTest.java
index 84ddabe..201a7eb 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreExpiryTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreExpiryTest.java
@@ -44,11 +44,11 @@ import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.domain.PageSet;
import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.domain.Credentials;
+import org.jclouds.openstack.keystone.auth.AuthHeaders;
import org.jclouds.openstack.keystone.v2_0.domain.Access;
import org.jclouds.openstack.keystone.v2_0.domain.Service;
import org.jclouds.openstack.keystone.v2_0.domain.Token;
import org.jclouds.openstack.keystone.v2_0.domain.User;
-import org.jclouds.openstack.v2_0.reference.AuthHeaders;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterMethod;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/835b0a76/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsStubTemplateBuilder.java
----------------------------------------------------------------------
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 e12f5cb..ccf3ccc 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
@@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Provider;
+import com.google.common.base.MoreObjects;
import org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions;
import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.HardwareBuilder;
@@ -55,7 +56,6 @@ import org.jclouds.rest.AuthorizationException;
import org.jclouds.softlayer.compute.options.SoftLayerTemplateOptions;
import com.google.common.base.Functions;
-import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Predicates;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
@@ -141,7 +141,7 @@ public class JcloudsStubTemplateBuilder {
templateBuilderProvider,
imageCache) {
@Override
- protected ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string().add("type", "Stubbed-TemplateBuilder");
}
};
@@ -154,7 +154,7 @@ public class JcloudsStubTemplateBuilder {
optionsProvider,
templateBuilderProvider) {
@Override
- protected ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string().add("type", "Stubbed-TemplateBuilder");
}
};
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/835b0a76/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreatorTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreatorTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreatorTest.java
index 542e4ab..23500c3 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreatorTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreatorTest.java
@@ -144,7 +144,7 @@ public class DefaultAzureArmNetworkCreatorTest {
verify(resourceGroupApi).get(TEST_RESOURCE_GROUP);
verify(resourceGroupApi).create(eq(TEST_RESOURCE_GROUP), eq(TEST_LOCATION), any());
- verify(virtualNetworkApi).createOrUpdate(eq(TEST_NETWORK_NAME), eq(TEST_LOCATION), any());
+ verify(virtualNetworkApi).createOrUpdate(eq(TEST_NETWORK_NAME), eq(TEST_LOCATION), any(), any());
//verify templateOptions updated to include defaults
Map<String, Object> templateOptions = configBag.get(TEMPLATE_OPTIONS);
@@ -176,7 +176,7 @@ public class DefaultAzureArmNetworkCreatorTest {
verify(resourceGroupApi).get(TEST_RESOURCE_GROUP);
verify(resourceGroupApi, never()).create(any(), any(), any());
- verify(virtualNetworkApi).createOrUpdate(eq(TEST_NETWORK_NAME), eq(TEST_LOCATION), any());
+ verify(virtualNetworkApi).createOrUpdate(eq(TEST_NETWORK_NAME), eq(TEST_LOCATION), any(), any());
//verify templateOptions updated to include defaults
Map<String, Object> templateOptions = configBag.get(TEMPLATE_OPTIONS);
@@ -210,7 +210,7 @@ public class DefaultAzureArmNetworkCreatorTest {
verify(resourceGroupApi).get(TEST_RESOURCE_GROUP);
verify(resourceGroupApi, never()).create(any(), any(), any());
- verify(virtualNetworkApi, never()).createOrUpdate(any(), any(), any());
+ verify(virtualNetworkApi, never()).createOrUpdate(any(), any(), any(), any());
//verify templateOptions updated to include defaults
Map<String, Object> templateOptions = configBag.get(TEMPLATE_OPTIONS);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/835b0a76/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6df2dcf..9c025e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
<!-- Dependency Versions -->
- <jclouds.version>2.0.2</jclouds.version> <!-- JCLOUDS_VERSION -->
+ <jclouds.version>2.1.0</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) -->
[3/3] brooklyn-server git commit: Closes #950
Posted by ge...@apache.org.
Closes #950
[BROOKLYN-583] Bump jclouds version to 2.1.0
- upgrade to jclouds 2.1.0
- update feature.xml to use jclouds-karaf repository
- bump sshj version to 0.20.0
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/52c23b44
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/52c23b44
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/52c23b44
Branch: refs/heads/master
Commit: 52c23b44ac6073e574799eb4af3ea7611bd6e81b
Parents: 95698ea e1427e7
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Thu Feb 22 15:07:57 2018 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Thu Feb 22 15:07:57 2018 +0000
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 53 ++------------------
locations/jclouds/pom.xml | 5 --
.../creator/DefaultAzureArmNetworkCreator.java | 3 +-
.../persist/jclouds/BlobStoreExpiryTest.java | 2 +-
.../jclouds/JcloudsStubTemplateBuilder.java | 6 +--
.../DefaultAzureArmNetworkCreatorTest.java | 6 +--
pom.xml | 4 +-
7 files changed, 15 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
[2/3] brooklyn-server git commit: bump version of sshj
Posted by ge...@apache.org.
bump version of sshj
- sshj version now matches jclouds version
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e1427e76
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e1427e76
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e1427e76
Branch: refs/heads/master
Commit: e1427e7682cba8bb6ae804a7803052d3fc66e1d8
Parents: 835b0a7
Author: andreaturli <an...@gmail.com>
Authored: Thu Feb 22 15:41:03 2018 +0100
Committer: andreaturli <an...@gmail.com>
Committed: Thu Feb 22 15:41:03 2018 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e1427e76/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c025e4..cf97425 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
<ivy.version>2.2.0</ivy.version>
<mx4j.version>3.0.1</mx4j.version>
<bouncycastle.version>1.51</bouncycastle.version>
- <sshj.version>0.12.0</sshj.version>
+ <sshj.version>0.20.0</sshj.version>
<felix.framework.version>5.6.1</felix.framework.version>
<reflections.version>0.9.10</reflections.version>
<jetty.version>9.3.14.v20161028</jetty.version>