From 69f21a2633867c9dc6ff5edd381584747f037f38 Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Thu, 5 May 2016 10:12:47 -0700 Subject: [PATCH] Use sonatype as public snapshots --- client-runtime/pom.xml | 5 --- .../java/com/microsoft/rest/RestClient.java | 9 ++-- .../com/microsoft/rest/ServiceClient.java | 2 + pom.xml | 42 +++++-------------- 4 files changed, 16 insertions(+), 42 deletions(-) diff --git a/client-runtime/pom.xml b/client-runtime/pom.xml index 029c12e26022d..a7c0b7441b02c 100644 --- a/client-runtime/pom.xml +++ b/client-runtime/pom.xml @@ -105,11 +105,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - org.codehaus.mojo build-helper-maven-plugin diff --git a/client-runtime/src/main/java/com/microsoft/rest/RestClient.java b/client-runtime/src/main/java/com/microsoft/rest/RestClient.java index ffc52643040d7..e1a94ee6b7b40 100644 --- a/client-runtime/src/main/java/com/microsoft/rest/RestClient.java +++ b/client-runtime/src/main/java/com/microsoft/rest/RestClient.java @@ -10,16 +10,15 @@ import com.microsoft.rest.credentials.ServiceClientCredentials; import com.microsoft.rest.retry.RetryHandler; import com.microsoft.rest.serializer.JacksonMapperAdapter; - -import java.net.CookieManager; -import java.net.CookiePolicy; - import okhttp3.Interceptor; import okhttp3.JavaNetCookieJar; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; import retrofit2.Retrofit; +import java.net.CookieManager; +import java.net.CookiePolicy; + /** * An instance of this class stores the client information for making REST calls. */ @@ -92,7 +91,7 @@ public Retrofit retrofit() { * URL instead of the raw one might be returned. * * @return the base URL. - * @see {@link RestClient#setBaseUrl(String...)} + * @see RestClient#setBaseUrl(String...) */ public String baseUrl() { return baseUrlHandler.baseUrl(); diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java index ef2f8cae9cfec..674b6a1bc6253 100644 --- a/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java +++ b/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java @@ -20,6 +20,8 @@ public abstract class ServiceClient { /** * Initializes a new instance of the ServiceClient class. + * + * @param baseUrl the service endpoint */ protected ServiceClient(String baseUrl) { this(new RestClient.Builder(baseUrl) diff --git a/pom.xml b/pom.xml index 98b38905b457f..a6f30c1d67ddf 100644 --- a/pom.xml +++ b/pom.xml @@ -44,28 +44,8 @@ - azureoss-snapshots-pr - Azure Private Snapshots - http://azureoss.westus.cloudapp.azure.com:8080/nexus/content/repositories/snapshots-pr/ - default - - true - always - - - - adx-snapshots - Azure ADX Snapshots - http://adxsnapshots.azurewebsites.net - default - - true - always - - - - oss-snapshots - Open Source Snapshots + ossrh + Sonatype Snapshots https://oss.sonatype.org/content/repositories/snapshots/ default @@ -77,12 +57,17 @@ - adx-snapshots - Azure ADX Snapshots - ftp://waws-prod-bay-005.ftp.azurewebsites.windows.net/site/wwwroot + ossrh + Maven Central Snapshots + https://oss.sonatype.org/content/repositories/snapshots true default + + ossrh + Maven Central + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + @@ -201,12 +186,6 @@
*/]]>
- - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - @@ -238,7 +217,6 @@ - org.apache.maven.plugins maven-release-plugin