Skip to content

Commit c8ecc0f

Browse files
committed
Merge pull request #13 from jianghaolu/snap
Use sonatype as public snapshots
2 parents 6cdb496 + 69f21a2 commit c8ecc0f

File tree

4 files changed

+16
-42
lines changed

4 files changed

+16
-42
lines changed

client-runtime/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,6 @@
105105
</configuration>
106106
</plugin>
107107

108-
<plugin>
109-
<groupId>org.apache.maven.plugins</groupId>
110-
<artifactId>maven-antrun-plugin</artifactId>
111-
</plugin>
112-
113108
<plugin>
114109
<groupId>org.codehaus.mojo</groupId>
115110
<artifactId>build-helper-maven-plugin</artifactId>

client-runtime/src/main/java/com/microsoft/rest/RestClient.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@
1010
import com.microsoft.rest.credentials.ServiceClientCredentials;
1111
import com.microsoft.rest.retry.RetryHandler;
1212
import com.microsoft.rest.serializer.JacksonMapperAdapter;
13-
14-
import java.net.CookieManager;
15-
import java.net.CookiePolicy;
16-
1713
import okhttp3.Interceptor;
1814
import okhttp3.JavaNetCookieJar;
1915
import okhttp3.OkHttpClient;
2016
import okhttp3.logging.HttpLoggingInterceptor;
2117
import retrofit2.Retrofit;
2218

19+
import java.net.CookieManager;
20+
import java.net.CookiePolicy;
21+
2322
/**
2423
* An instance of this class stores the client information for making REST calls.
2524
*/
@@ -92,7 +91,7 @@ public Retrofit retrofit() {
9291
* URL instead of the raw one might be returned.
9392
*
9493
* @return the base URL.
95-
* @see {@link RestClient#setBaseUrl(String...)}
94+
* @see RestClient#setBaseUrl(String...)
9695
*/
9796
public String baseUrl() {
9897
return baseUrlHandler.baseUrl();

client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ public abstract class ServiceClient {
2020

2121
/**
2222
* Initializes a new instance of the ServiceClient class.
23+
*
24+
* @param baseUrl the service endpoint
2325
*/
2426
protected ServiceClient(String baseUrl) {
2527
this(new RestClient.Builder(baseUrl)

pom.xml

+10-32
Original file line numberDiff line numberDiff line change
@@ -44,28 +44,8 @@
4444

4545
<repositories>
4646
<repository>
47-
<id>azureoss-snapshots-pr</id>
48-
<name>Azure Private Snapshots</name>
49-
<url>http://azureoss.westus.cloudapp.azure.com:8080/nexus/content/repositories/snapshots-pr/</url>
50-
<layout>default</layout>
51-
<snapshots>
52-
<enabled>true</enabled>
53-
<updatePolicy>always</updatePolicy>
54-
</snapshots>
55-
</repository>
56-
<repository>
57-
<id>adx-snapshots</id>
58-
<name>Azure ADX Snapshots</name>
59-
<url>http://adxsnapshots.azurewebsites.net</url>
60-
<layout>default</layout>
61-
<snapshots>
62-
<enabled>true</enabled>
63-
<updatePolicy>always</updatePolicy>
64-
</snapshots>
65-
</repository>
66-
<repository>
67-
<id>oss-snapshots</id>
68-
<name>Open Source Snapshots</name>
47+
<id>ossrh</id>
48+
<name>Sonatype Snapshots</name>
6949
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
7050
<layout>default</layout>
7151
<snapshots>
@@ -77,12 +57,17 @@
7757

7858
<distributionManagement>
7959
<snapshotRepository>
80-
<id>adx-snapshots</id>
81-
<name>Azure ADX Snapshots</name>
82-
<url>ftp://waws-prod-bay-005.ftp.azurewebsites.windows.net/site/wwwroot</url>
60+
<id>ossrh</id>
61+
<name>Maven Central Snapshots</name>
62+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
8363
<uniqueVersion>true</uniqueVersion>
8464
<layout>default</layout>
8565
</snapshotRepository>
66+
<repository>
67+
<id>ossrh</id>
68+
<name>Maven Central</name>
69+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
70+
</repository>
8671
</distributionManagement>
8772

8873
<dependencyManagement>
@@ -201,12 +186,6 @@
201186
<br />*/</code>]]></bottom>
202187
</configuration>
203188
</plugin>
204-
205-
<plugin>
206-
<groupId>org.apache.maven.plugins</groupId>
207-
<artifactId>maven-release-plugin</artifactId>
208-
<version>2.5.3</version>
209-
</plugin>
210189
</plugins>
211190
<pluginManagement>
212191
<plugins>
@@ -238,7 +217,6 @@
238217
</environmentVariables>
239218
</configuration>
240219
</plugin>
241-
242220
<plugin>
243221
<groupId>org.apache.maven.plugins</groupId>
244222
<artifactId>maven-release-plugin</artifactId>

0 commit comments

Comments
 (0)