From 3500845affc4308068de62d3769bf9a6870616af Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Sun, 25 Sep 2016 22:27:08 -0500 Subject: [PATCH 1/3] Use JDK 1.7 as build version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b9ffc3fc5704..79717acee5aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: java sudo: false jdk: -- oraclejdk8 +- oraclejdk7 script: - mvn install -DskipTests=true - mvn -pl !azure-batch,!azure-mgmt-website checkstyle:check From ad81d00b60253b4c26c3339a87effc3981a52678 Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Tue, 27 Sep 2016 12:02:40 -0700 Subject: [PATCH 2/3] Use jdk7's api annotations --- azure-mgmt-batch/pom.xml | 2 +- azure-mgmt-compute/pom.xml | 2 +- azure-mgmt-datalake-analytics/pom.xml | 2 +- azure-mgmt-datalake-store-uploader/pom.xml | 2 +- azure-mgmt-datalake-store/pom.xml | 2 +- azure-mgmt-graph-rbac/pom.xml | 2 +- azure-mgmt-keyvault/pom.xml | 2 +- azure-mgmt-network/pom.xml | 2 +- azure-mgmt-redis/pom.xml | 2 +- azure-mgmt-resources/pom.xml | 2 +- azure-mgmt-search/pom.xml | 2 +- azure-mgmt-storage/pom.xml | 2 +- azure-samples/pom.xml | 2 +- azure/pom.xml | 2 +- pom.xml | 10 +++------- 15 files changed, 17 insertions(+), 21 deletions(-) diff --git a/azure-mgmt-batch/pom.xml b/azure-mgmt-batch/pom.xml index 0ccc35671bad..d345494c31cb 100644 --- a/azure-mgmt-batch/pom.xml +++ b/azure-mgmt-batch/pom.xml @@ -75,7 +75,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 diff --git a/azure-mgmt-compute/pom.xml b/azure-mgmt-compute/pom.xml index 634fa7bf996a..7bb1cef3436d 100644 --- a/azure-mgmt-compute/pom.xml +++ b/azure-mgmt-compute/pom.xml @@ -80,7 +80,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 com.jcraft diff --git a/azure-mgmt-datalake-analytics/pom.xml b/azure-mgmt-datalake-analytics/pom.xml index 8206fe240b46..3be7845b3e5e 100644 --- a/azure-mgmt-datalake-analytics/pom.xml +++ b/azure-mgmt-datalake-analytics/pom.xml @@ -84,7 +84,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 diff --git a/azure-mgmt-datalake-store-uploader/pom.xml b/azure-mgmt-datalake-store-uploader/pom.xml index b34c73cfcc07..cfedd1486656 100644 --- a/azure-mgmt-datalake-store-uploader/pom.xml +++ b/azure-mgmt-datalake-store-uploader/pom.xml @@ -83,7 +83,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 diff --git a/azure-mgmt-datalake-store/pom.xml b/azure-mgmt-datalake-store/pom.xml index a64549a8257d..c84932d84fd7 100644 --- a/azure-mgmt-datalake-store/pom.xml +++ b/azure-mgmt-datalake-store/pom.xml @@ -72,7 +72,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 diff --git a/azure-mgmt-graph-rbac/pom.xml b/azure-mgmt-graph-rbac/pom.xml index 8b091da7312d..286d2ade4bf9 100644 --- a/azure-mgmt-graph-rbac/pom.xml +++ b/azure-mgmt-graph-rbac/pom.xml @@ -70,7 +70,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 diff --git a/azure-mgmt-keyvault/pom.xml b/azure-mgmt-keyvault/pom.xml index 1079f2622ab3..aa9f7db97ebc 100644 --- a/azure-mgmt-keyvault/pom.xml +++ b/azure-mgmt-keyvault/pom.xml @@ -75,7 +75,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 diff --git a/azure-mgmt-network/pom.xml b/azure-mgmt-network/pom.xml index e88976a6bdb8..6500b4451516 100644 --- a/azure-mgmt-network/pom.xml +++ b/azure-mgmt-network/pom.xml @@ -70,7 +70,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 diff --git a/azure-mgmt-redis/pom.xml b/azure-mgmt-redis/pom.xml index 9421e2817701..2a6f98b794ed 100644 --- a/azure-mgmt-redis/pom.xml +++ b/azure-mgmt-redis/pom.xml @@ -68,7 +68,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 com.microsoft.azure diff --git a/azure-mgmt-resources/pom.xml b/azure-mgmt-resources/pom.xml index a6e693f58c09..3bec46023e7f 100644 --- a/azure-mgmt-resources/pom.xml +++ b/azure-mgmt-resources/pom.xml @@ -69,7 +69,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 diff --git a/azure-mgmt-search/pom.xml b/azure-mgmt-search/pom.xml index f5cfb3456ab0..9653ecd9d8c9 100644 --- a/azure-mgmt-search/pom.xml +++ b/azure-mgmt-search/pom.xml @@ -70,7 +70,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 diff --git a/azure-mgmt-storage/pom.xml b/azure-mgmt-storage/pom.xml index 0ada7eae840b..fcbf3e88bbee 100644 --- a/azure-mgmt-storage/pom.xml +++ b/azure-mgmt-storage/pom.xml @@ -70,7 +70,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 diff --git a/azure-samples/pom.xml b/azure-samples/pom.xml index 02442fa6f088..fc6c4ee6acfc 100644 --- a/azure-samples/pom.xml +++ b/azure-samples/pom.xml @@ -77,7 +77,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 diff --git a/azure/pom.xml b/azure/pom.xml index 34c3c7917a50..437c039a35fe 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -106,7 +106,7 @@ com.microsoft.azure api-annotations - 0.0.1-SNAPSHOT + 0.0.1 com.microsoft.azure diff --git a/pom.xml b/pom.xml index 9ea023219e46..b86bf3898b03 100644 --- a/pom.xml +++ b/pom.xml @@ -53,14 +53,10 @@ - azure-public-snapshots - Azure Public Snapshots - http://adxmaven.westus.cloudapp.azure.com/repository/maven-snapshots + api-annotations-staging + Api annotations staging repo + https://oss.sonatype.org/service/local/repositories/commicrosoftazure-1420/content default - - true - always - From d7d7760248b08fa3f4a0025ccd1a27f1665867a8 Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Tue, 27 Sep 2016 12:07:47 -0700 Subject: [PATCH 3/3] Clean up parent pom --- pom.xml | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/pom.xml b/pom.xml index b86bf3898b03..d53d7db27122 100644 --- a/pom.xml +++ b/pom.xml @@ -41,40 +41,6 @@ - - - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default - - true - always - - - - api-annotations-staging - Api annotations staging repo - https://oss.sonatype.org/service/local/repositories/commicrosoftazure-1420/content - default - - - - - - 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/ - - -