Merge pull request #1454 from Azure/jianghaolu-patch-1

Remove keyvault data plane from roll-up client
Azure · Feb 11, 2017 · 26c541f · 26c541f
2 parents 2f326d9 + 380de08
commit 26c541f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,11 +10,11 @@ script:
    openssl aes-256-cbc -K $encrypted_25450b691aae_key -iv $encrypted_25450b691aae_iv -in my.azureauth.txt.enc -out my.azureauth.txt -d;
    export AZURE_TEST_MODE=RECORD || travis_terminate 1 ;
    export AZURE_AUTH_LOCATION=$TRAVIS_BUILD_DIR/my.azureauth.txt || travis_terminate 1 ;
-   mvn install -Dorg.slf4j.simpleLogger.defaultLogLevel=error || travis_terminate 1 ;
+   mvn -pl !azure-keyvault,!azure-keyvault-extensions install -Dorg.slf4j.simpleLogger.defaultLogLevel=error || travis_terminate 1 ;
   else
    mvn install -DskipTests=true || travis_terminate 1 ;
-   mvn test -Dorg.slf4j.simpleLogger.defaultLogLevel=error || travis_terminate 1 ;
-   mvn checkstyle:check || travis_terminate 1 ;
+   mvn -pl !azure-keyvault,!azure-keyvault-extensions test -Dorg.slf4j.simpleLogger.defaultLogLevel=error || travis_terminate 1 ;
+   mvn -pl !azure-keyvault,!azure-keyvault-extensions,!azure-keyvault-core,!azure-keyvault-webkey,!azure-keyvault-cryptography checkstyle:check || travis_terminate 1 ;
    mvn -pl !azure-samples package javadoc:aggregate -DskipTests=true || travis_terminate 1 ;
   fi
 

diff --git a/azure/pom.xml b/azure/pom.xml
@@ -109,31 +109,6 @@
       <artifactId>azure-mgmt-appservice</artifactId>
       <version>1.0.0-beta6-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>azure-keyvault</artifactId>
-      <version>1.0.0-beta5-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>azure-keyvault-core</artifactId>
-      <version>1.0.0-beta5-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>azure-keyvault-cryptography</artifactId>
-      <version>1.0.0-beta5-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>azure-keyvault-extensions</artifactId>
-      <version>1.0.0-beta5-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>azure-keyvault-webkey</artifactId>
-      <version>1.0.0-beta5-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>