Merge pull request Azure#26 from Azure/rrandall/quick-fixes

Minor fixes
lenala · Mar 9, 2018 · bf3f736 · bf3f736
2 parents 2d6780e + 6bda41f
commit bf3f736
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 28 deletions.
diff --git a/...ebkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeySignatureAlgorithm.java b/...ebkey/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.
      */

diff --git a/azure-keyvault/pom.xml b/azure-keyvault/pom.xml
@@ -1,4 +1,4 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under 
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
 	the MIT License. See License.txt in the project root for license information. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -102,7 +102,7 @@
 			<version>1.54</version>
 		</dependency>
 	</dependencies>
-	
+
 	<build>
 		<plugins>
 			<plugin>
@@ -145,24 +145,6 @@
 					<target>1.7</target>
 				</configuration>
 			</plugin>
-			<plugin>
-	  			<groupId>org.apache.maven.plugins</groupId>
-	  			<artifactId>maven-clean-plugin</artifactId>
-	  			<version>3.0.0</version>
-	  			<configuration>
-	  				<excludeDefaultDirectories>true</excludeDefaultDirectories>
-	  				<filesets>
-	  					<fileset>
-	  						<directory>target</directory>
-	  						<followSymlinks>false</followSymlinks>
-	  						<useDefaultExcludes>false</useDefaultExcludes>
-	  						<excludes>
-	  							<exclude>test-classes/session-records/</exclude>
-	  						</excludes>
-	  					</fileset>
-	  				</filesets>
-	  			</configuration>
-	  		</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
     <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
     <testMode>playback</testMode>
     <playbackServerPort>11080</playbackServerPort>
-    
+
   </properties>
 
   <developers>
@@ -126,7 +126,7 @@
       <dependency>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>adal4j</artifactId>
-        <version>1.1.2</version>
+        <version>1.4.0</version>
         <scope>test</scope>
       </dependency>
 
@@ -191,7 +191,7 @@
         <artifactId>maven-release-plugin</artifactId>
         <version>2.5.3</version>
       </plugin>
-    
+
     <plugin>
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>jetty-maven-plugin</artifactId>
@@ -203,15 +203,15 @@
           <httpConnector>
             <port>${playbackServerPort}</port>
           </httpConnector>
-       
+
         </configuration>
-        
+
 </plugin>
     </plugins>
 
     <pluginManagement>
       <plugins>
-      
+
       <plugin>
     <groupId>org.codehaus.mojo</groupId>
     <artifactId>properties-maven-plugin</artifactId>
@@ -227,7 +227,7 @@
 <name>keyvault.vaulturi</name>
        		<value>https://tifchen-keyvault-fancy.vault.azure.net</value>
                     </property>
-                    
+
                     <property>
                            		<name>keyvault.vaulturi.alt</name>
        		<value>https://tifchen-keyvault-fancier.vault.azure.net</value>
@@ -267,6 +267,26 @@
           <artifactId>maven-release-plugin</artifactId>
           <version>2.5.2</version>
         </plugin>
+  			<plugin>
+	  			<groupId>org.apache.maven.plugins</groupId>
+	  			<artifactId>maven-clean-plugin</artifactId>
+	  			<version>3.0.0</version>
+	  			<configuration>
+					<excludeDefaultDirectories>true</excludeDefaultDirectories>
+	  				<filesets>
+	  					<fileset>
+	  						<directory>target</directory>
+	  						<followSymlinks>false</followSymlinks>
+							<includes>
+								<include>**</include>
+							</includes>
+	  						<excludes>
+	  							<exclude>test-classes/session-records/</exclude>
+	  						</excludes>
+	  					</fileset>
+	  				</filesets>
+	  			</configuration>
+	  		</plugin>
         <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
         <plugin>
         	<groupId>org.eclipse.m2e</groupId>