diff --git a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java index 19d7361d25..50ef222bad 100644 --- a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java +++ b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java @@ -51,6 +51,7 @@ import javax.net.ssl.SSLContext; import javax.ws.rs.core.HttpHeaders; import org.jclouds.Constants; +import org.jclouds.JcloudsVersion; import org.jclouds.crypto.CryptoStreams; import org.jclouds.http.HttpCommandExecutorService; import org.jclouds.http.HttpRequest; @@ -77,7 +78,9 @@ import com.google.common.io.CountingOutputStream; @Singleton public class JavaUrlHttpCommandExecutorService extends BaseHttpCommandExecutorService { - public static final String USER_AGENT = "jclouds/1.0 java/" + System.getProperty("java.version"); + public static final String USER_AGENT = String.format("jclouds/%s java/%s", JcloudsVersion.get(), System + .getProperty("java.version")); + @Resource protected Logger logger = Logger.NULL; private final Supplier untrustedSSLContextProvider; diff --git a/core/src/test/java/org/jclouds/http/JavaUrlHttpCommandExecutorServiceIntegrationTest.java b/core/src/test/java/org/jclouds/http/JavaUrlHttpCommandExecutorServiceIntegrationTest.java index 4e71445a40..e64008d029 100644 --- a/core/src/test/java/org/jclouds/http/JavaUrlHttpCommandExecutorServiceIntegrationTest.java +++ b/core/src/test/java/org/jclouds/http/JavaUrlHttpCommandExecutorServiceIntegrationTest.java @@ -27,6 +27,7 @@ import java.util.Properties; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.http.internal.JavaUrlHttpCommandExecutorService; +import org.testng.annotations.Test; import com.google.inject.Module; @@ -35,6 +36,7 @@ import com.google.inject.Module; * * @author Adrian Cole */ +@Test public class JavaUrlHttpCommandExecutorServiceIntegrationTest extends BaseHttpCommandExecutorServiceIntegrationTest { protected Module createConnectionModule() { diff --git a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java index 15b6f4f892..25e84bdfce 100644 --- a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java +++ b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java @@ -43,6 +43,7 @@ import org.apache.http.entity.FileEntity; import org.apache.http.entity.InputStreamEntity; import org.apache.http.entity.StringEntity; import org.apache.http.params.CoreProtocolPNames; +import org.jclouds.JcloudsVersion; import org.jclouds.http.HttpRequest; import org.jclouds.io.Payload; import org.jclouds.io.payloads.BasePayload; @@ -59,8 +60,8 @@ import com.google.common.base.Throwables; */ @Singleton public class ApacheHCUtils { - - public static final String USER_AGENT = "jclouds/1.0 httpclient/4.0.1"; + //TODO: look up httpclient version + public static final String USER_AGENT = String.format("jclouds/%s httpclient/%s", JcloudsVersion.get(), "4.1.1"); public static HttpUriRequest convertToApacheRequest(HttpRequest request) { HttpUriRequest apacheRequest; diff --git a/drivers/gae/src/main/java/org/jclouds/gae/GaeHttpCommandExecutorService.java b/drivers/gae/src/main/java/org/jclouds/gae/GaeHttpCommandExecutorService.java index 929bafdf88..2ca19fa727 100644 --- a/drivers/gae/src/main/java/org/jclouds/gae/GaeHttpCommandExecutorService.java +++ b/drivers/gae/src/main/java/org/jclouds/gae/GaeHttpCommandExecutorService.java @@ -26,6 +26,7 @@ import javax.inject.Named; import javax.inject.Singleton; import org.jclouds.Constants; +import org.jclouds.JcloudsVersion; import org.jclouds.concurrent.SingleThreaded; import org.jclouds.http.HttpCommandExecutorService; import org.jclouds.http.HttpRequest; @@ -50,8 +51,9 @@ import com.google.common.annotations.VisibleForTesting; @SingleThreaded @Singleton public class GaeHttpCommandExecutorService extends BaseHttpCommandExecutorService { - public static final String USER_AGENT = "jclouds/1.0 urlfetch/1.3.5"; - + //TODO: look up gae version + public static final String USER_AGENT = String.format("jclouds/%s urlfetch/%s", JcloudsVersion.get(), "1.4.3"); + private final URLFetchService urlFetchService; private final ConvertToGaeRequest convertToGaeRequest; private final ConvertToJcloudsResponse convertToJcloudsResponse; diff --git a/drivers/gae/src/test/java/org/jclouds/gae/AsyncGaeHttpCommandExecutorServiceIntegrationTest.java b/drivers/gae/src/test/java/org/jclouds/gae/AsyncGaeHttpCommandExecutorServiceIntegrationTest.java index 0d1113c040..2971e88031 100644 --- a/drivers/gae/src/test/java/org/jclouds/gae/AsyncGaeHttpCommandExecutorServiceIntegrationTest.java +++ b/drivers/gae/src/test/java/org/jclouds/gae/AsyncGaeHttpCommandExecutorServiceIntegrationTest.java @@ -63,6 +63,7 @@ import com.google.inject.Module; * * @author Adrian Cole */ +@Test public class AsyncGaeHttpCommandExecutorServiceIntegrationTest extends BaseHttpCommandExecutorServiceIntegrationTest { Logger logger = Logger.CONSOLE;