From 7a0ea8445a917b333f2d6066ddb92fc79d435a5e Mon Sep 17 00:00:00 2001 From: Rich Randall Date: Thu, 8 Mar 2018 19:29:12 -0800 Subject: [PATCH 1/3] Fix mvn clean package --- azure-keyvault/pom.xml | 22 ++-------------------- pom.xml | 32 ++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/azure-keyvault/pom.xml b/azure-keyvault/pom.xml index 74509df0b761..58634b6c41c1 100644 --- a/azure-keyvault/pom.xml +++ b/azure-keyvault/pom.xml @@ -1,4 +1,4 @@ - @@ -102,7 +102,7 @@ 1.54 - + @@ -145,24 +145,6 @@ 1.7 - - org.apache.maven.plugins - maven-clean-plugin - 3.0.0 - - true - - - target - false - false - - test-classes/session-records/ - - - - - org.apache.maven.plugins maven-javadoc-plugin diff --git a/pom.xml b/pom.xml index 739951a3fc9d..6ea86ef03eb1 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ playback 11080 - + @@ -191,7 +191,7 @@ maven-release-plugin 2.5.3 - + org.eclipse.jetty jetty-maven-plugin @@ -203,15 +203,15 @@ ${playbackServerPort} - + - + - + org.codehaus.mojo properties-maven-plugin @@ -227,7 +227,7 @@ keyvault.vaulturi https://tifchen-keyvault-fancy.vault.azure.net - + keyvault.vaulturi.alt https://tifchen-keyvault-fancier.vault.azure.net @@ -267,6 +267,26 @@ 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 From eafad9f8c032cc264b1ad9b3e3a0e80f004156fb Mon Sep 17 00:00:00 2001 From: Rich Randall Date: Thu, 8 Mar 2018 19:41:42 -0800 Subject: [PATCH 2/3] Update ADAL version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ea86ef03eb1..a00a3ffee611 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ com.microsoft.azure adal4j - 1.1.2 + 1.4.0 test From 6bda41f034c3bb8a3bf399cc6045ae85ae8bc4ec Mon Sep 17 00:00:00 2001 From: Rich Randall Date: Thu, 8 Mar 2018 19:58:52 -0800 Subject: [PATCH 3/3] Add PS* JsonWebKeySignatureAlg constants --- .../keyvault/webkey/JsonWebKeySignatureAlgorithm.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeySignatureAlgorithm.java b/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeySignatureAlgorithm.java index 5e532c10cd29..edd9692d2997 100644 --- a/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeySignatureAlgorithm.java +++ b/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeySignatureAlgorithm.java @@ -16,6 +16,15 @@ * Defines values for JsonWebKeySignatureAlgorithm. */ public final class JsonWebKeySignatureAlgorithm { + /** Static value PS256 for JsonWebKeySignatureAlgorithm. */ + public static final JsonWebKeySignatureAlgorithm PS256 = new JsonWebKeySignatureAlgorithm("PS256"); + + /** Static value PS384 for JsonWebKeySignatureAlgorithm. */ + public static final JsonWebKeySignatureAlgorithm PS384 = new JsonWebKeySignatureAlgorithm("PS384"); + + /** Static value PS512 for JsonWebKeySignatureAlgorithm. */ + public static final JsonWebKeySignatureAlgorithm PS512 = new JsonWebKeySignatureAlgorithm("PS512"); + /** Static value RS256 for JsonWebKeySignatureAlgorithm. */ public static final JsonWebKeySignatureAlgorithm RS256 = new JsonWebKeySignatureAlgorithm("RS256"); @@ -64,7 +73,7 @@ public boolean equals(Object obj) { return value.equals(rhs.value); } } - + /** * All the JWK signature algorithms. */