diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml index e731cdde5da7..dfb84b399a64 100644 --- a/.azure-pipelines/client.test.live.yml +++ b/.azure-pipelines/client.test.live.yml @@ -10,7 +10,7 @@ queue: steps: - bash: | LOG_PARAMS='-Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - mvn test -Dhttp.keepAlive=false -Dsurefire.rerunFailingTestsCount=3 $LOG_PARAMS -f pom.client.build.xml + mvn test -Dhttp.keepAlive=false -Dsurefire.rerunFailingTestsCount=3 $LOG_PARAMS -f $(pomFile) displayName: 'Run Live Tests' env: ARM_CLIENTID: $(ARM_CLIENTID) diff --git a/keyvault/data-plane/azure-keyvault-complete/pom.xml b/keyvault/data-plane/azure-keyvault-complete/pom.xml index 00f69fd66c81..2c27e314be88 100644 --- a/keyvault/data-plane/azure-keyvault-complete/pom.xml +++ b/keyvault/data-plane/azure-keyvault-complete/pom.xml @@ -5,11 +5,11 @@ the MIT License. See License.txt in the project root for license information. -- 4.0.0 - com.microsoft.azure - azure-keyvault-parent - 1.2.0 - ../pom.xml - + com.microsoft.azure + azure-keyvault-parent + 1.2.0 + ../pom.xml + com.microsoft.azure azure-keyvault-complete @@ -42,7 +42,7 @@ the MIT License. See License.txt in the project root for license information. -- microsoft - Microsoft + Microsoft Corporation diff --git a/keyvault/data-plane/azure-keyvault-core/pom.xml b/keyvault/data-plane/azure-keyvault-core/pom.xml index 6c7dfb51eadd..49ff6c514c55 100644 --- a/keyvault/data-plane/azure-keyvault-core/pom.xml +++ b/keyvault/data-plane/azure-keyvault-core/pom.xml @@ -12,6 +12,7 @@ ../pom.xml + com.microsoft.azure azure-keyvault-core 1.2.0 jar @@ -42,7 +43,7 @@ microsoft - Microsoft + Microsoft Corporation @@ -64,7 +65,6 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 @@ -74,36 +74,12 @@ + org.codehaus.mojo build-helper-maven-plugin - 1.12 - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - com.microsoft.schemas._2003._10.serialization - /** -
* Copyright (c) Microsoft Corporation. All rights reserved. -
* Licensed under the MIT License. See License.txt in the project root for -
* license information. -
*/]]> - - diff --git a/keyvault/data-plane/azure-keyvault-cryptography/pom.xml b/keyvault/data-plane/azure-keyvault-cryptography/pom.xml index 9d1d354c8f84..0a8e98de64d1 100644 --- a/keyvault/data-plane/azure-keyvault-cryptography/pom.xml +++ b/keyvault/data-plane/azure-keyvault-cryptography/pom.xml @@ -4,15 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + + com.microsoft.azure + azure-keyvault-parent + 1.2.0 + ../pom.xml + + com.microsoft.azure - azure-keyvault-parent + azure-keyvault-cryptography 1.2.0 - ../pom.xml - - - azure-keyvault-cryptography - 1.2.0 jar Microsoft Azure SDK for Key Vault Cryptography @@ -84,6 +85,23 @@ org.bouncycastle bcprov-jdk15on test - + + + + + + org.apache.maven.plugins + maven-resources-plugin + + ${basedir}/target/test-classes + + + ${basedir}/src/test/resources + + + + + + diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/ECKeyTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/ECKeyTest.java index ef0c036938a2..bb08018f3823 100644 --- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/ECKeyTest.java +++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/ECKeyTest.java @@ -43,7 +43,6 @@ import com.microsoft.azure.keyvault.cryptography.algorithms.Es384; import com.microsoft.azure.keyvault.cryptography.algorithms.Es512; import com.microsoft.azure.keyvault.cryptography.SignatureEncoding; -import com.microsoft.azure.keyvault.cryptography.test.resources.PemFile; import com.microsoft.azure.keyvault.webkey.JsonWebKey; import com.microsoft.azure.keyvault.webkey.JsonWebKeyCurveName; import com.microsoft.azure.keyvault.webkey.JsonWebKeyType; @@ -83,8 +82,8 @@ protected static void setProvider(Provider provider) { public static void setUpBeforeClass() throws Exception { setProvider(Security.getProvider("SunEC")); EC_KEY_GENERATOR = KeyPairGenerator.getInstance("EC", _provider); - - Path byte_location = Paths.get("src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/byte_array.bin"); + + Path byte_location = Paths.get(getPath("byte_array.bin")); CEK = Files.readAllBytes(byte_location); FACTORY = KeyFactory.getInstance("EC", _provider); @@ -220,16 +219,25 @@ private KeyPair getKeyFromFile(String privateKeyPath, String publicKeyPath) thro } private void testFromFile(String keyType, MessageDigest digest, String algorithm) throws Exception { - String privateKeyPath = "src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/" + keyType + "keynew.pem"; - String publicKeyPath = "src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/" + keyType + "keypubnew.pem"; + String privateKeyPath = getPath(keyType+"keynew.pem"); + String publicKeyPath = getPath(keyType+"keypubnew.pem"); EcKey newKey = new EcKey("akey", getKeyFromFile(privateKeyPath, publicKeyPath)); - Path signatureLocation = Paths.get("src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/" + keyType + "sig.der"); + Path signatureLocation = Paths.get(getPath(keyType+"sig.der")); byte[] signature = SignatureEncoding.fromAsn1Der(Files.readAllBytes(signatureLocation), algorithm); doVerify(newKey, digest, signature); } + + private static String getPath(String filename){ + + String path = ECKeyTest.class.getClassLoader().getResource(filename).getPath(); + if(path.contains(":")){ + path = path.substring(1); + } + return path; + } @Test public void testCreateSECP256K1Key() throws Exception { diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/PemFile.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/PemFile.java similarity index 88% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/PemFile.java rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/PemFile.java index 1064a943d68a..02c7f16e9f9d 100644 --- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/PemFile.java +++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/PemFile.java @@ -1,4 +1,4 @@ -package com.microsoft.azure.keyvault.cryptography.test.resources; +package com.microsoft.azure.keyvault.cryptography.test; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/SECP256key.pem b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/SECP256key.pem similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/SECP256key.pem rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/SECP256key.pem diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/byte_array.bin b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/byte_array.bin similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/byte_array.bin rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/byte_array.bin diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p256key.pem b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p256key.pem similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p256key.pem rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p256key.pem diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p256keynew.pem b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p256keynew.pem similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p256keynew.pem rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p256keynew.pem diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p256keypubnew.pem b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p256keypubnew.pem similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p256keypubnew.pem rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p256keypubnew.pem diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p256sig.der b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p256sig.der similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p256sig.der rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p256sig.der diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p384keynew.pem b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p384keynew.pem similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p384keynew.pem rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p384keynew.pem diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p384keypubnew.pem b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p384keypubnew.pem similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p384keypubnew.pem rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p384keypubnew.pem diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p384sig.der b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p384sig.der similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p384sig.der rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p384sig.der diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p521keynew.pem b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p521keynew.pem similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p521keynew.pem rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p521keynew.pem diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p521keypubnew.pem b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p521keypubnew.pem similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p521keypubnew.pem rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p521keypubnew.pem diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p521sig.der b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p521sig.der similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/p521sig.der rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/p521sig.der diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/secp256keynew.pem b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/secp256keynew.pem similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/secp256keynew.pem rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/secp256keynew.pem diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/secp256keypubnew.pem b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/secp256keypubnew.pem similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/secp256keypubnew.pem rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/secp256keypubnew.pem diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/secp256sig.der b/keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/secp256sig.der similarity index 100% rename from keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/resources/secp256sig.der rename to keyvault/data-plane/azure-keyvault-cryptography/src/test/resources/secp256sig.der diff --git a/keyvault/data-plane/azure-keyvault-extensions/pom.xml b/keyvault/data-plane/azure-keyvault-extensions/pom.xml index 84e38493f3b5..9e25a92b9e51 100644 --- a/keyvault/data-plane/azure-keyvault-extensions/pom.xml +++ b/keyvault/data-plane/azure-keyvault-extensions/pom.xml @@ -42,7 +42,7 @@ microsoft - Microsoft + Microsoft Corporation @@ -67,10 +67,6 @@ - - com.microsoft.azure - azure-client-runtime - com.microsoft.azure azure-mgmt-resources @@ -102,15 +98,14 @@ com.microsoft.azure azure-mgmt-resources - 1.3.1-SNAPSHOT test-jar test - com.microsoft.azure - adal4j - test - + com.microsoft.azure + adal4j + test + @@ -136,7 +131,6 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 @@ -149,32 +143,8 @@ org.codehaus.mojo build-helper-maven-plugin - 1.12 - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - *.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.storage - /** -
* Copyright (c) Microsoft Corporation. All rights reserved. -
* Licensed under the MIT License. See License.txt in the project root for -
* license information. -
*/]]> - - diff --git a/keyvault/data-plane/azure-keyvault-webkey/pom.xml b/keyvault/data-plane/azure-keyvault-webkey/pom.xml index d5d6477ab41c..37515de98279 100644 --- a/keyvault/data-plane/azure-keyvault-webkey/pom.xml +++ b/keyvault/data-plane/azure-keyvault-webkey/pom.xml @@ -11,7 +11,7 @@ azure-keyvault-webkey - 1.2.0 + 1.2.0 jar Microsoft Azure SDK for Key Vault WebKey @@ -84,7 +84,6 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 @@ -97,32 +96,8 @@ org.codehaus.mojo build-helper-maven-plugin - 1.12 - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - com.microsoft.schemas._2003._10.serialization; - /** -
* Copyright (c) Microsoft Corporation. All rights reserved. -
* Licensed under the MIT License. See License.txt in the project root for -
* license information. -
*/]]> - - diff --git a/keyvault/data-plane/azure-keyvault/pom.xml b/keyvault/data-plane/azure-keyvault/pom.xml index 2c6d3ae35a08..2a4c21597078 100644 --- a/keyvault/data-plane/azure-keyvault/pom.xml +++ b/keyvault/data-plane/azure-keyvault/pom.xml @@ -10,6 +10,7 @@ the MIT License. See License.txt in the project root for license information. -- ../pom.xml + com.microsoft.azure azure-keyvault 1.2.0 jar @@ -41,40 +42,28 @@ the MIT License. See License.txt in the project root for license information. -- microsoft - Microsoft + Microsoft Corporation - - - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default - - true - always - - - - - com.microsoft.azure - azure-keyvault-cryptography - - - com.microsoft.azure - azure-keyvault-webkey - + com.microsoft.azure + azure-keyvault-cryptography + + + + com.microsoft.azure + azure-keyvault-webkey + - com.microsoft.azure - azure-client-runtime - + com.microsoft.azure + azure-client-runtime + @@ -82,181 +71,105 @@ the MIT License. See License.txt in the project root for license information. -- client-runtime - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - - - - - commons-codec - commons-codec - - - com.google.guava - guava - - - org.apache.commons - commons-lang3 - - - joda-time - joda-time - 2.1 - - - com.squareup.retrofit2 - retrofit - 2.4.0 - - - com.squareup.okhttp3 - okhttp - 3.10.0 - - - com.squareup.okio - okio - 1.14.0 - - - io.reactivex - rxjava - - com.microsoft.azure azure-mgmt-storage - 1.3.0 test + - com.microsoft.azure - azure-mgmt-graph-rbac - 1.3.0 - test - + com.microsoft.azure + azure-mgmt-graph-rbac + test + + com.microsoft.azure azure-mgmt-resources test + + com.microsoft.azure + azure-mgmt-keyvault + test + + com.microsoft.azure - azure-mgmt-keyvault - test - - - com.microsoft.azure - azure-keyvault - - - + azure-keyvault + + + + - com.microsoft.azure - azure-mgmt-resources - 1.3.1-SNAPSHOT - test-jar - test - + com.microsoft.azure + azure-mgmt-resources + test-jar + test + + - com.microsoft.azure - adal4j - test - + com.microsoft.azure + adal4j + test + + com.microsoft.azure azure-storage - 4.4.0 test + + + com.microsoft.azure + azure-client-authentication + test + + - com.google.code.gson - gson - 2.2.4 - test - - - com.microsoft.azure - azure-client-authentication - 1.6.3 - test - - - junit - junit - test - + junit + junit + test + + - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - true - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.12 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.22.0 - - - ${basedir}/azure-keyvault/target/azure-keyvault-${project.version}.jar - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - com.microsoft.schemas._2003._10.serialization; - /** -
* Copyright (c) Microsoft Corporation. All rights reserved. -
* Licensed under the MIT License. See License.txt in the project root for -
* license information. -
*/]]> - - - + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + true + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + ${basedir}/azure-keyvault/target/azure-keyvault-${project.version}.jar + + + + + + diff --git a/keyvault/data-plane/pom.xml b/keyvault/data-plane/pom.xml index 79d6a47f2004..32d24fbed347 100644 --- a/keyvault/data-plane/pom.xml +++ b/keyvault/data-plane/pom.xml @@ -6,12 +6,14 @@ 4.0.0 - com.microsoft.azure - azure-sdk-parent - 1.0-SNAPSHOT + com.azure + azure-client-sdk-parent + 1.0.0-SNAPSHOT ../../pom.client.xml + 1.2.0 + com.microsoft.azure azure-keyvault-parent pom @@ -34,403 +36,74 @@ - UTF-8 - - - - 2.9.6 - - - playback - 11080 - 11081 + 1.2.0 - - - microsoft - Microsoft - - - - - - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default - - true - always - - - - - - - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default - - true - always - - - - - - - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - true - default - - - - + com.microsoft.azure azure-keyvault-webkey - 1.2.0 + ${azure-keyvault.version} + com.microsoft.azure azure-keyvault-cryptography - 1.2.0 + ${azure-keyvault.version} + com.microsoft.azure azure-keyvault-core - 1.2.0 - - - com.microsoft.azure - azure-keyvault - 1.2.0 - - - com.microsoft.azure - azure-keyvault-extensions - 1.2.0 - - - - - - com.microsoft.azure - azure-mgmt-keyvault - 1.11.1 - - - com.microsoft.azure - azure-client-runtime - 1.3.0 - - - com.microsoft.azure - azure-mgmt-resources - 1.3.0 - - - com.microsoft.azure - azure - 1.3.0 + ${azure-keyvault.version} - - com.microsoft.rest - client-runtime - 1.6.1 + com.microsoft.azure + azure-keyvault + ${azure-keyvault.version} - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - - - org.apache.commons - commons-lang3 - 3.4 - - - commons-codec - commons-codec - 1.10 - - - io.reactivex - rxjava - 1.2.4 - - - com.google.guava - guava - 20.0 - - - - - junit - junit - 4.12 - test - com.microsoft.azure - adal4j - 1.4.0 - test - - - org.bouncycastle - bcprov-jdk15on - 1.59 + azure-keyvault-extensions + ${azure-keyvault.version} + - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - com.microsoft.azure - autorest-build-tools - 1.0.0-beta6-SNAPSHOT - - - com.puppycrawl.tools - checkstyle - 6.18 - - - - checkstyle.xml - samedir=runtimes/build-tools/src/main/resources - suppressions.xml - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - true - true - -Xlint:unchecked - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - *.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.storage - /** -
* Copyright (c) Microsoft Corporation. All rights reserved. -
* Licensed under the MIT License. See License.txt in the project root for -
* license information. -
*/]]> - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - - org.eclipse.jetty - jetty-maven-plugin - 9.2.22.v20170606 - - jetty.xml - - - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - - set-system-properties - - - - + org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.18.1 + maven-compiler-plugin - - **/Test*.java - **/*Test.java - **/*Tests.java - **/*TestCase.java - - - ${testMode} - https://azure-keyvault-3.vault.azure.net - https://azure-keyvault-2.vault.azure.net - + 1.7 + 1.7 + true + true + -Xlint:unchecked - - org.apache.maven.plugins - maven-release-plugin - 2.5.2 - - - org.apache.maven.plugins - maven-clean-plugin - 3.0.0 - - true - - - target - false - - ** - - - test-classes/session-records/ - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - com.googlecode.addjars-maven-plugin - - - addjars-maven-plugin - - [1.0.5,) - - add-jars - - - - - - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.18.1 - - - - integration-test - verify - - - - - + - - - run-shade-plugin - - runShadePlugin - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.1 - - - - - shade-plugin - package - - shade - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - - - - - - + + + + + microsoft + Microsoft Corporation + + + ./azure-keyvault ./azure-keyvault-core diff --git a/pom.client.build.xml b/pom.client.build.xml index d0f1a308d713..38f8b10ceef0 100644 --- a/pom.client.build.xml +++ b/pom.client.build.xml @@ -1,19 +1,14 @@ 4.0.0 - - com.microsoft.azure - azure-sdk-parent - 1.0-SNAPSHOT - ./pom.client.xml - + com.microsoft.azure azure-sdk-parent-build ${parent.version} pom Microsoft Azure SDK Build - This package bundles all the SDKs in a multi-module for build/CI purposes. + Parent POM for Microsoft Azure SDK for Java https://github.com/Azure/azure-sdk-for-java diff --git a/pom.client.xml b/pom.client.xml index 52fc0d84f920..1483a12ec3a4 100644 --- a/pom.client.xml +++ b/pom.client.xml @@ -1,53 +1,444 @@ - - 4.0.0 - com.microsoft.azure - azure-sdk-parent - pom - 1.0-SNAPSHOT - - Microsoft Azure SDK Parent - This package contains the parent module of Microsoft Azure SDK. - https://github.com/Azure/azure-sdk-for-java - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - true - true - -Xlint:unchecked - - - - org.eclipse.jetty - jetty-maven-plugin - 9.2.22.v20170606 - - 0 - 11079 - STOP - false - ./jetty.xml - - - - - - - - - junit - junit - 4.12 - test - - - - - + + + 4.0.0 + com.azure + azure-client-sdk-parent + pom + 1.0.0-SNAPSHOT + Microsoft Azure SDK Build + Parent POM for Microsoft Azure SDK for Java + https://github.com/Azure/azure-sdk-for-java + + + com.microsoft.maven + java-8-parent + 8.0.0 + + + + + The MIT License (MIT) + http://opensource.org/licenses/MIT + repo + + + + + + microsoft + Microsoft Corporation + + + + + + + + ossrh + Sonatype Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + default + + true + always + + + + + + + + + ossrh + Sonatype Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + default + + true + always + + + + + + + + + ossrh + Sonatype Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + true + default + + + + + + UTF-8 + + playback + 11080 + 11081 + + + 2.9.6 + 1.3.0 + 1.6.1 + 1.10 + + + 1.4.0 + 1.59 + 1.11.1 + 1.3.0 + 1.3.1-SNAPSHOT + 1.3.0 + 1.3.0 + 4.4.0 + 1.6.3 + + + + 1.0.1-SNAPSHOT + 3.0.1 + 2.5.3 + 9.2.22.v20170606 + 1.0.0 + 2.4.3 + 3.0.0 + 1.0.0 + 2.18.1 + 2.4.1 + 3.0.0 + 3.0.2 + + + + + + + + com.microsoft.azure + azure-client-runtime + ${azure-client-runtime.version} + + + + + com.microsoft.rest + client-runtime + ${client-runtime.version} + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + + + commons-codec + commons-codec + ${commons-codec.version} + + + + + com.microsoft.azure + azure-mgmt-storage + ${azure-mgmt-storage.version} + test + + + + com.microsoft.azure + azure-mgmt-graph-rbac + ${azure-mgmt-graph-rbac.version} + test + + + + com.microsoft.azure + azure-mgmt-resources + ${azure-mgmt-resources-test.version} + test-jar + test + + + + com.microsoft.azure + azure-client-authentication + ${azure-client-authentication.version} + test + + + + com.microsoft.azure + adal4j + ${adal4j.version} + test + + + + org.bouncycastle + bcprov-jdk15on + ${bcprov-jdk15on.version} + + + + com.microsoft.azure + azure-mgmt-keyvault + ${azure-mgmt-keyvault.version} + test + + + + com.microsoft.azure + azure-mgmt-resources + ${azure-mgmt-resources.version} + test + + + + com.microsoft.azure + azure-storage + ${azure-storage.version} + test + + + + + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + + compile-samples-source + generate-test-sources + + add-test-source + + + + src/samples/java + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/Test*.java + **/*Test.java + **/*Tests.java + **/*TestCase.java + + + ${testMode} + https://azure-keyvault-3.vault.azure.net + https://azure-keyvault-2.vault.azure.net + + + + + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin.version} + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + + true + + + target + false + + ** + + + test-classes/session-records/ + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + ${lifecycle-mapping.version} + + + + + + com.googlecode.addjars-maven-plugin + addjars-maven-plugin + [1.0.5,) + + add-jars + + + + + + + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + + + integration-test + verify + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + true + true + -Xlint:unchecked + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty-maven-plugin.version} + + 0 + 11079 + STOP + false + ./jetty.xml + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + + + + + + + + + + + run-shade-plugin + + runShadePlugin + + + + + + + + + org.apache.maven.plugins + maven-shade-plugin + ${maven-shade-plugin.version} + + + + + shade-plugin + package + + shade + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + + + + + + + + + + + + + ./template/client + ./keyvault/data-plane + + \ No newline at end of file diff --git a/template/client/pom.xml b/template/client/pom.xml index f1e43618990e..00bb72525d20 100644 --- a/template/client/pom.xml +++ b/template/client/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - com.microsoft.azure - azure-sdk-parent - 1.0-SNAPSHOT + com.azure + azure-client-sdk-parent + 1.0.0-SNAPSHOT ../../pom.client.xml