From bd79b6ebb6438af185dc7c06bb3b9082ef24faca Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Wed, 30 Jan 2019 20:29:16 -0500
Subject: [PATCH 01/12] checkstyle,spotbugs config + build cleanup.

---
 build-tools/pom.xml                           |  22 ++
 .../checkstyle/checkstyle-suppressions.xml    |  12 +
 .../main/resources/checkstyle/checkstyle.xml  | 260 ++++++++++++++++++
 .../src/main/resources/checkstyle/java.header |   5 +
 .../resources/spotbugs/spotbugs-exclude.xml   |   4 +
 pom.client.build.xml                          |  35 ---
 pom.client.xml                                |  69 +++++
 7 files changed, 372 insertions(+), 35 deletions(-)
 create mode 100755 build-tools/pom.xml
 create mode 100755 build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml
 create mode 100755 build-tools/src/main/resources/checkstyle/checkstyle.xml
 create mode 100755 build-tools/src/main/resources/checkstyle/java.header
 create mode 100755 build-tools/src/main/resources/spotbugs/spotbugs-exclude.xml
 delete mode 100644 pom.client.build.xml

diff --git a/build-tools/pom.xml b/build-tools/pom.xml
new file mode 100755
index 000000000000..d3077924356e
--- /dev/null
+++ b/build-tools/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.microsoft.azure</groupId>
+    <artifactId>build-tools-azure</artifactId>
+    <name>Maven Build Tools</name>
+    <version>1.0.0</version>
+
+    <parent>
+        <groupId>com.microsoft.maven</groupId>
+        <artifactId>java-8-parent</artifactId>
+        <version>8.0.0</version>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>
diff --git a/build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml b/build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml
new file mode 100755
index 000000000000..a0caa126fdd9
--- /dev/null
+++ b/build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suppressions PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+    "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+  <suppress checks="Javadoc" files="Test[s]?.*\.java"/>
+  <suppress checks="Javadoc" files=".*Test[s]?\.java"/>
+  <suppress checks="Javadoc" files=".*Test[s]?Base\.java"/>
+  <suppress checks="Javadoc" files=".*CoverageReporter\.java"/>
+  <suppress checks="Header" files=".*package-info.java"/>
+</suppressions>
diff --git a/build-tools/src/main/resources/checkstyle/checkstyle.xml b/build-tools/src/main/resources/checkstyle/checkstyle.xml
new file mode 100755
index 000000000000..9a4a7af91ddb
--- /dev/null
+++ b/build-tools/src/main/resources/checkstyle/checkstyle.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!-- This is a checkstyle configuration file. For descriptions of
+what the following rules do, please see the checkstyle configuration
+page at http://checkstyle.sourceforge.net/config.html -->
+
+<module name="Checker">
+
+    <module name="SuppressionFilter">
+        <property name="file" value="${samedir}/checkstyle-suppressions.xml"/>
+        <property name="optional" value="true"/>
+    </module>
+    
+    <module name="Header">
+        <property name="header" value="/**\n * Copyright (c) Microsoft Corporation. All rights reserved.\n * Licensed under the MIT License. See License.txt in the project root for\n * license information.\n"/>
+        <property name="fileExtensions" value="java"/>
+    </module>
+
+    <module name="FileTabCharacter">
+        <!-- Checks that there are no tab characters in the file. -->
+    </module>
+
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
+
+    <module name="RegexpSingleline">
+        <!-- Checks that FIXME is not used in comments.  TODO is preferred. -->
+        <property name="format" value="((//.*)|(\*.*))FIXME"/>
+        <property name="message" value='TODO is preferred to FIXME.  e.g. "TODO(johndoe): Refactor when v2 is released."'/>
+    </module>
+
+    <module name="RegexpSingleline">
+        <!-- Checks that TODOs are named.  (Actually, just that they are followed by an open paren. -->
+        <property name="format" value="((//.*)|(\*.*))TODO [^(]"/>
+        <property name="message" value='All TODOs should be named.  e.g. "TODO (johndoe): Refactor when v2 is released."'/>
+    </module>
+
+    <!-- All Java AST specific tests live under TreeWalker module. -->
+    <module name="TreeWalker">
+
+        <!-- IMPORT CHECKS -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="AvoidStarImport"/>
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+
+        <!-- NAMING CHECKS -->
+        <!-- See http://checkstyle.sf.net/config_naming.html -->
+        <module name="ConstantName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+
+        <module name="TypeNameCheck">
+            <!-- Validates static, final fields against the
+            expression "^[A-Z][a-zA-Z0-9]*$". -->
+            <metadata name="altname" value="TypeName"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="ConstantNameCheck">
+            <!-- Validates non-private, static, final fields against the supplied
+            public/package final fields "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$". -->
+            <metadata name="altname" value="ConstantName"/>
+            <property name="applyToPublic" value="true"/>
+            <property name="applyToProtected" value="true"/>
+            <property name="applyToPackage" value="true"/>
+            <property name="applyToPrivate" value="false"/>
+            <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*|FLAG_.*)$"/>
+            <message key="name.invalidPattern"
+                     value="Variable ''{0}'' should be in ALL_CAPS (if it is a constant) or be private (otherwise)."/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="StaticVariableNameCheck">
+            <!-- Validates static, non-final fields against the supplied
+            expression "^[a-z][a-zA-Z0-9]*_?$". -->
+            <metadata name="altname" value="StaticVariableName"/>
+            <property name="applyToPublic" value="true"/>
+            <property name="applyToProtected" value="true"/>
+            <property name="applyToPackage" value="true"/>
+            <property name="applyToPrivate" value="true"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*_?$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="MemberNameCheck">
+            <!-- Validates non-static members against the supplied expression. -->
+            <metadata name="altname" value="MemberName"/>
+            <property name="applyToPublic" value="true"/>
+            <property name="applyToProtected" value="true"/>
+            <property name="applyToPackage" value="true"/>
+            <property name="applyToPrivate" value="true"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="MethodNameCheck">
+            <!-- Validates identifiers for method names. -->
+            <metadata name="altname" value="MethodName"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*(_[a-zA-Z0-9]+)*$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="ParameterName">
+            <!-- Validates identifiers for method parameters against the
+              expression "^[a-z][a-zA-Z0-9]*$". -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="LocalFinalVariableName">
+            <!-- Validates identifiers for local final variables against the
+              expression "^[a-z][a-zA-Z0-9]*$". -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="LocalVariableName">
+            <!-- Validates identifiers for local variables against the
+              expression "^[a-z][a-zA-Z0-9]*$". -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="FinalLocalVariable">
+            <!-- Checks that local variables that never have their values changed are declared final. -->
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="validateEnhancedForLoopVariable" value="true"/>
+        </module>
+
+        <!-- LENGTH and CODING CHECKS -->
+        <module name="LeftCurly">
+            <!-- Checks for placement of the left curly brace ('{'). -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="RightCurly">
+            <!-- Checks right curlies on CATCH, ELSE, and TRY blocks are on
+            the same line. e.g., the following example is fine:
+            <pre>
+              if {
+                ...
+              } else
+            </pre>
+            -->
+            <!-- This next example is not fine:
+            <pre>
+              if {
+                ...
+              }
+              else
+            </pre>
+            -->
+            <property name="option" value="same"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <!-- Checks for braces around if and else blocks -->
+        <module name="NeedBraces">
+            <property name="severity" value="warning"/>
+            <property name="tokens" value="LITERAL_IF, LITERAL_ELSE, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO"/>
+        </module>
+
+        <module name="UpperEll">
+            <!-- Checks that long constants are defined with an upper ell.-->
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="FallThrough">
+            <!-- Warn about falling through to the next case statement.  Similar to
+            javac -Xlint:fallthrough, but the check is suppressed if a single-line comment
+            on the last non-blank line preceding the fallen-into case contains 'fall through' (or
+            some other variants which we don't publicized to promote consistency).
+            -->
+            <property name="reliefPattern"
+                      value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
+            <property name="severity" value="error"/>
+        </module>
+
+
+        <!-- WHITESPACE CHECKS -->
+        <module name="Indentation">
+            <property name="basicOffset" value="4"/>
+            <property name="braceAdjustment" value="0"/>
+            <property name="caseIndent" value="4"/>
+            <property name="throwsIndent" value="4"/>
+            <property name="lineWrappingIndentation" value="4"/>
+            <property name="arrayInitIndent" value="4"/>
+        </module>
+
+        <module name="CustomImportOrder">
+            <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
+            <property name="specialImportsRegExp" value="^javax\."/>
+            <property name="standardPackageRegExp" value="^java\."/>
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+            <property name="separateLineBetweenGroups" value="false"/>
+        </module>
+
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <module name="EmptyForIteratorPad"/>
+        <module name="MethodParamPad"/>
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="OperatorWrap"/>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>
+
+        <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+        <module name="FileContentsHolder"/>
+
+        <!-- Checks for blocks. You know, those {}'s         -->
+        <!-- See http://checkstyle.sf.net/config_blocks.html -->
+        <module name="AvoidNestedBlocks"/>
+        <module name="EmptyBlock"/>
+
+        <!-- Checks for common coding problems               -->
+        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+
+        <!-- Updated on 03/17/2014: -->
+        <!-- Added ignore. Code is generated so magic numbers are not a largish issue. -->
+        <!-- <module name="MagicNumber" /> -->
+        <module name="MissingSwitchDefault"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->
+        <module name="FinalClass"/>
+        <module name="InterfaceIsType"/>
+        <module name="VisibilityModifier">
+            <property name="protectedAllowed" value="true"/>
+            <property name="packageAllowed" value="true"/>
+        </module>
+
+
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <module name="ArrayTypeStyle"/>
+
+    </module>
+</module>
diff --git a/build-tools/src/main/resources/checkstyle/java.header b/build-tools/src/main/resources/checkstyle/java.header
new file mode 100755
index 000000000000..5792d38a6a5a
--- /dev/null
+++ b/build-tools/src/main/resources/checkstyle/java.header
@@ -0,0 +1,5 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ */
\ No newline at end of file
diff --git a/build-tools/src/main/resources/spotbugs/spotbugs-exclude.xml b/build-tools/src/main/resources/spotbugs/spotbugs-exclude.xml
new file mode 100755
index 000000000000..0c4b49b47f6c
--- /dev/null
+++ b/build-tools/src/main/resources/spotbugs/spotbugs-exclude.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<FindBugsFilter>
+</FindBugsFilter>
\ No newline at end of file
diff --git a/pom.client.build.xml b/pom.client.build.xml
deleted file mode 100644
index 38f8b10ceef0..000000000000
--- a/pom.client.build.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>azure-sdk-parent-build</artifactId>
-  <version>${parent.version}</version>
-  <packaging>pom</packaging>
-
-  <name>Microsoft Azure SDK Build</name>
-  <description>Parent POM for Microsoft Azure SDK for Java</description>
-  <url>https://github.com/Azure/azure-sdk-for-java</url>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-maven-plugin</artifactId>
-        <version>9.2.22.v20170606</version>
-        <configuration>
-          <scanIntervalSeconds>0</scanIntervalSeconds>
-          <stopPort>11079</stopPort>
-          <stopKey>STOP</stopKey>
-          <waitForChild>false</waitForChild>
-          <jettyXml>./jetty.xml</jettyXml>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <modules>
-    <module>./template/client</module>
-    <module>./keyvault/data-plane</module>
-  </modules>
-</project>
diff --git a/pom.client.xml b/pom.client.xml
index 1483a12ec3a4..8a037fd9bbff 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -111,6 +111,8 @@
       <maven-shade-plugin.version>2.4.1</maven-shade-plugin.version>
       <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
       <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
+      <maven-build-tools.version>1.0.0</maven-build-tools.version>
+
    </properties>
 
    <dependencyManagement>
@@ -220,6 +222,73 @@
 
    <build>
 
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <dependencies>
+               <dependency>
+                  <groupId>com.microsoft.azure</groupId>
+                  <artifactId>build-tools-azure</artifactId>
+                  <version>${maven-build-tools.version}</version>
+               </dependency>
+            </dependencies>
+            <configuration>
+               <configLocation>checkstyle/checkstyle.xml</configLocation>
+               <suppressionsLocation>checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+               <headerLocation>checkstyle/java.header</headerLocation>
+               <propertyExpansion>samedir=runtimes/build-tools/src/main/resources</propertyExpansion>
+               <encoding>UTF-8</encoding>
+               <consoleOutput>true</consoleOutput>
+               <includeTestSourceDirectory>false</includeTestSourceDirectory>
+               <linkXRef>false</linkXRef>
+
+               <!-- TODO soon - enable these failure modes -->
+               <failsOnError>false</failsOnError>
+               <failOnViolation>false</failOnViolation>
+            </configuration>
+            <executions>
+               <execution>
+                  <phase>verify</phase>
+                  <goals>
+                     <goal>check</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+
+         <plugin>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-maven-plugin</artifactId>
+            <dependencies>
+               <dependency>
+                  <groupId>com.microsoft.azure</groupId>
+                  <artifactId>build-tools-azure</artifactId>
+                  <version>${maven-build-tools.version}</version>
+               </dependency>
+            </dependencies>
+            <configuration>
+               <effort>Max</effort>
+               <threshold>Low</threshold>
+               <xmlOutput>true</xmlOutput>
+               <spotbugsXmlOutputDirectory>${project.build.directory}/spotbugs</spotbugsXmlOutputDirectory>
+               <excludeFilterFile>spotbugs/spotbugs-exclude.xml</excludeFilterFile>
+
+               <!-- TODO soon - enable this failure mode -->
+               <failOnError>false</failOnError>
+            </configuration>
+            <executions>
+               <execution>
+                  <phase>verify</phase>
+                  <goals>
+                     <goal>check</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+
+      </plugins>
+
       <pluginManagement>
 
          <plugins>

From 9fadef66b1c1290b01f68a4b55bf73c1b8bee166 Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Thu, 31 Jan 2019 00:22:29 -0500
Subject: [PATCH 02/12] checkstyle rules updated  + headers updated.

---
 .../main/resources/checkstyle/checkstyle.xml  | 16 +---------------
 .../src/main/resources/checkstyle/java.header |  7 ++-----
 .../microsoft/azure/keyvault/core/IKey.java   |  7 ++-----
 .../azure/keyvault/core/IKeyResolver.java     |  7 ++-----
 .../azure/keyvault/core/package-info.java     |  4 +---
 .../keyvault/cryptography/Algorithm.java      |  7 ++-----
 .../cryptography/AlgorithmResolver.java       |  7 ++-----
 .../AsymmetricEncryptionAlgorithm.java        |  7 ++-----
 .../AsymmetricSignatureAlgorithm.java         |  7 ++-----
 .../keyvault/cryptography/ByteExtensions.java |  7 ++-----
 .../azure/keyvault/cryptography/EcKey.java    |  3 +++
 .../cryptography/EncryptionAlgorithm.java     |  7 ++-----
 .../IAuthenticatedCryptoTransform.java        |  7 ++-----
 .../cryptography/ICryptoTransform.java        |  7 ++-----
 .../cryptography/ISignatureTransform.java     |  7 ++-----
 .../cryptography/KeyWrapAlgorithm.java        |  7 ++-----
 .../azure/keyvault/cryptography/RsaKey.java   |  7 ++-----
 .../cryptography/SignatureAlgorithm.java      |  7 ++-----
 .../cryptography/SignatureEncoding.java       |  7 ++-----
 .../azure/keyvault/cryptography/Strings.java  |  7 ++-----
 .../SymmetricEncryptionAlgorithm.java         |  7 ++-----
 .../keyvault/cryptography/SymmetricKey.java   |  7 ++-----
 .../cryptography/algorithms/Aes128Cbc.java    |  7 ++-----
 .../algorithms/Aes128CbcHmacSha256.java       |  7 ++-----
 .../cryptography/algorithms/Aes192Cbc.java    |  7 ++-----
 .../algorithms/Aes192CbcHmacSha384.java       |  7 ++-----
 .../cryptography/algorithms/Aes256Cbc.java    |  7 ++-----
 .../algorithms/Aes256CbcHmacSha512.java       |  7 ++-----
 .../cryptography/algorithms/AesCbc.java       |  7 ++-----
 .../algorithms/AesCbcHmacSha2.java            |  7 ++-----
 .../cryptography/algorithms/AesKw.java        |  7 ++-----
 .../cryptography/algorithms/AesKw128.java     |  7 ++-----
 .../cryptography/algorithms/AesKw192.java     |  7 ++-----
 .../cryptography/algorithms/AesKw256.java     |  7 ++-----
 .../cryptography/algorithms/Rs256.java        |  7 ++-----
 .../cryptography/algorithms/Rsa15.java        |  7 ++-----
 .../algorithms/RsaEncryption.java             |  7 ++-----
 .../cryptography/algorithms/RsaOaep.java      |  7 ++-----
 .../cryptography/algorithms/RsaSignature.java |  7 ++-----
 .../cryptography/algorithms/package-info.java |  4 +---
 .../keyvault/cryptography/package-info.java   |  4 +---
 .../test/AesCbcBCProviderTest.java            |  3 +++
 .../test/AesCbcHmacShaBCProviderTest.java     |  3 +++
 .../cryptography/test/AesCbcHmacShaTest.java  |  3 +++
 .../cryptography/test/AesCbcTest.java         |  3 +++
 .../test/AesKwBCProviderTest.java             | 19 ++-----------------
 .../keyvault/cryptography/test/AesKwTest.java | 19 ++-----------------
 .../test/ECKeyBCProviderTest.java             |  3 +++
 .../keyvault/cryptography/test/ECKeyTest.java |  3 +++
 .../keyvault/cryptography/test/PemFile.java   |  3 +++
 .../test/RsaKeyBCProviderTest.java            |  3 +++
 .../cryptography/test/RsaKeyTest.java         |  3 +++
 .../test/SymmetricKeyBCProviderTest.java      | 19 ++-----------------
 .../cryptography/test/SymmetricKeyTest.java   | 19 ++-----------------
 .../extensions/AggregateKeyResolver.java      |  7 ++-----
 .../extensions/CachingKeyResolver.java        |  7 ++-----
 .../keyvault/extensions/KeyVaultKey.java      |  7 ++-----
 .../extensions/KeyVaultKeyResolver.java       |  7 ++-----
 .../azure/keyvault/extensions/Strings.java    |  7 ++-----
 .../test/CachingKeyResolverTest.java          | 19 ++-----------------
 .../KeyVaultClientIntegrationTestBase.java    |  3 +++
 .../KeyVaultKeyResolverBCProviderTest.java    | 18 ++----------------
 ...eyVaultKeyResolverDefaultProviderTest.java | 18 ++----------------
 .../keyvault/test/EcKeyIntegrationTests.java  |  3 +++
 .../webkey/Base64UrlJsonDeserializer.java     |  7 ++-----
 .../webkey/Base64UrlJsonSerializer.java       |  7 ++-----
 .../azure/keyvault/webkey/JsonWebKey.java     |  7 ++-----
 .../keyvault/webkey/JsonWebKeyCurveName.java  | 10 +++-------
 .../webkey/JsonWebKeyEncryptionAlgorithm.java |  7 ++-----
 .../keyvault/webkey/JsonWebKeyOperation.java  |  7 ++-----
 .../webkey/JsonWebKeySignatureAlgorithm.java  |  7 ++-----
 .../azure/keyvault/webkey/JsonWebKeyType.java |  7 ++-----
 .../azure/keyvault/webkey/package-info.java   |  3 +--
 .../webkey/test/AesValidationTests.java       |  3 +++
 .../webkey/test/ClearMemoryTests.java         |  3 +++
 .../webkey/test/EcHsmValidationTests.java     |  3 +++
 .../webkey/test/EcValidationTests.java        |  3 +++
 .../webkey/test/RsaHsmValidationTests.java    |  3 +++
 .../webkey/test/RsaValidationTests.java       |  3 +++
 .../azure/keyvault/CertificateIdentifier.java |  7 ++-----
 .../CertificateOperationIdentifier.java       |  7 ++-----
 .../azure/keyvault/IssuerIdentifier.java      |  7 ++-----
 .../azure/keyvault/KeyIdentifier.java         |  7 ++-----
 .../azure/keyvault/KeyVaultClient.java        |  7 ++-----
 .../azure/keyvault/KeyVaultClientBase.java    | 10 +++-------
 .../azure/keyvault/KeyVaultClientCustom.java  |  7 ++-----
 .../azure/keyvault/KeyVaultClientImpl.java    | 12 +++---------
 .../azure/keyvault/ObjectIdentifier.java      |  7 ++-----
 .../azure/keyvault/SecretIdentifier.java      |  7 ++-----
 .../authentication/AuthenticationResult.java  |  7 ++-----
 .../authentication/ChallengeCache.java        |  7 ++-----
 .../authentication/KeyVaultCredentials.java   |  7 ++-----
 .../keyvault/authentication/package-info.java |  3 +--
 .../KeyVaultClientBaseImpl.java               | 10 +++-------
 .../KeyVaultClientCustomImpl.java             |  8 ++------
 .../keyvault/implementation/package-info.java |  3 +--
 .../messagesecurity/HttpMessageSecurity.java  |  7 ++-----
 .../keyvault/messagesecurity/JWEHeader.java   |  7 ++-----
 .../keyvault/messagesecurity/JWEObject.java   |  7 ++-----
 .../keyvault/messagesecurity/JWSHeader.java   |  7 ++-----
 .../keyvault/messagesecurity/JWSObject.java   |  7 ++-----
 .../MessageSecurityHelper.java                |  7 ++-----
 .../messagesecurity/package-info.java         |  3 +--
 .../azure/keyvault/models/Action.java         | 10 +++-------
 .../azure/keyvault/models/ActionType.java     | 10 +++-------
 .../keyvault/models/AdministratorDetails.java | 10 +++-------
 .../azure/keyvault/models/Attributes.java     | 10 +++-------
 .../models/BackupCertificateResult.java       | 10 +++-------
 .../keyvault/models/BackupKeyResult.java      | 10 +++-------
 .../keyvault/models/BackupSecretResult.java   | 10 +++-------
 .../keyvault/models/BackupStorageResult.java  | 10 +++-------
 .../models/CertificateAttributes.java         | 10 +++-------
 .../keyvault/models/CertificateBundle.java    | 10 +++-------
 .../models/CertificateCreateParameters.java   | 10 +++-------
 .../models/CertificateImportParameters.java   | 10 +++-------
 .../models/CertificateIssuerItem.java         | 10 +++-------
 .../CertificateIssuerSetParameters.java       | 10 +++-------
 .../CertificateIssuerUpdateParameters.java    | 10 +++-------
 .../keyvault/models/CertificateItem.java      | 10 +++-------
 .../models/CertificateMergeParameters.java    | 10 +++-------
 .../keyvault/models/CertificateOperation.java | 10 +++-------
 .../CertificateOperationUpdateParameter.java  | 10 +++-------
 .../keyvault/models/CertificatePolicy.java    | 10 +++-------
 .../models/CertificateRestoreParameters.java  | 10 +++-------
 .../models/CertificateUpdateParameters.java   | 10 +++-------
 .../azure/keyvault/models/Contact.java        | 10 +++-------
 .../azure/keyvault/models/Contacts.java       | 10 +++-------
 .../models/DeletedCertificateBundle.java      | 10 +++-------
 .../models/DeletedCertificateItem.java        | 10 +++-------
 .../keyvault/models/DeletedKeyBundle.java     | 10 +++-------
 .../azure/keyvault/models/DeletedKeyItem.java | 10 +++-------
 .../models/DeletedSasDefinitionBundle.java    | 10 +++-------
 .../models/DeletedSasDefinitionItem.java      | 10 +++-------
 .../keyvault/models/DeletedSecretBundle.java  | 10 +++-------
 .../keyvault/models/DeletedSecretItem.java    | 10 +++-------
 .../models/DeletedStorageAccountItem.java     | 10 +++-------
 .../keyvault/models/DeletedStorageBundle.java | 10 +++-------
 .../models/DeletionRecoveryLevel.java         | 10 +++-------
 .../azure/keyvault/models/Error.java          | 10 +++-------
 .../keyvault/models/IssuerAttributes.java     | 10 +++-------
 .../azure/keyvault/models/IssuerBundle.java   | 10 +++-------
 .../keyvault/models/IssuerCredentials.java    | 10 +++-------
 .../keyvault/models/IssuerParameters.java     | 10 +++-------
 .../keyvault/models/JsonWebKeyCurveName.java  | 10 +++-------
 .../azure/keyvault/models/KeyAttributes.java  | 10 +++-------
 .../azure/keyvault/models/KeyBundle.java      | 10 +++-------
 .../keyvault/models/KeyCreateParameters.java  | 10 +++-------
 .../keyvault/models/KeyImportParameters.java  | 10 +++-------
 .../azure/keyvault/models/KeyItem.java        | 10 +++-------
 .../keyvault/models/KeyOperationResult.java   | 10 +++-------
 .../models/KeyOperationsParameters.java       | 10 +++-------
 .../azure/keyvault/models/KeyProperties.java  | 10 +++-------
 .../keyvault/models/KeyRestoreParameters.java | 10 +++-------
 .../keyvault/models/KeySignParameters.java    | 10 +++-------
 .../keyvault/models/KeyUpdateParameters.java  |  9 ++-------
 .../azure/keyvault/models/KeyUsageType.java   | 10 +++-------
 .../azure/keyvault/models/KeyVaultError.java  | 10 +++-------
 .../models/KeyVaultErrorException.java        | 10 +++-------
 .../keyvault/models/KeyVerifyParameters.java  | 10 +++-------
 .../keyvault/models/KeyVerifyResult.java      | 10 +++-------
 .../azure/keyvault/models/LifetimeAction.java | 10 +++-------
 .../keyvault/models/OrganizationDetails.java  | 10 +++-------
 .../azure/keyvault/models/PageImpl.java       | 10 +++-------
 ...endingCertificateSigningRequestResult.java | 10 +++-------
 .../models/SasDefinitionAttributes.java       | 10 +++-------
 .../keyvault/models/SasDefinitionBundle.java  | 10 +++-------
 .../models/SasDefinitionCreateParameters.java | 10 +++-------
 .../keyvault/models/SasDefinitionItem.java    | 10 +++-------
 .../models/SasDefinitionUpdateParameters.java | 10 +++-------
 .../azure/keyvault/models/SasTokenType.java   | 10 +++-------
 .../keyvault/models/SecretAttributes.java     | 10 +++-------
 .../azure/keyvault/models/SecretBundle.java   | 10 +++-------
 .../azure/keyvault/models/SecretItem.java     | 10 +++-------
 .../keyvault/models/SecretProperties.java     | 10 +++-------
 .../models/SecretRestoreParameters.java       | 10 +++-------
 .../keyvault/models/SecretSetParameters.java  | 10 +++-------
 .../models/SecretUpdateParameters.java        | 10 +++-------
 .../models/StorageAccountAttributes.java      | 10 +++-------
 .../StorageAccountCreateParameters.java       | 10 +++-------
 .../keyvault/models/StorageAccountItem.java   | 10 +++-------
 .../StorageAccountRegenerteKeyParameters.java | 10 +++-------
 .../StorageAccountUpdateParameters.java       | 10 +++-------
 .../azure/keyvault/models/StorageBundle.java  | 10 +++-------
 .../models/StorageRestoreParameters.java      | 10 +++-------
 .../models/SubjectAlternativeNames.java       | 10 +++-------
 .../azure/keyvault/models/Trigger.java        | 10 +++-------
 .../models/X509CertificateProperties.java     | 10 +++-------
 .../models/custom/CertificateBundle.java      |  7 ++-----
 .../models/custom/CertificateOperation.java   |  7 ++-----
 .../keyvault/models/custom/IssuerBundle.java  |  7 ++-----
 .../keyvault/models/custom/KeyBundle.java     |  7 ++-----
 .../keyvault/models/custom/SecretBundle.java  |  7 ++-----
 .../keyvault/models/custom/package-info.java  |  4 +---
 .../azure/keyvault/models/package-info.java   |  6 ++----
 .../azure/keyvault/package-info.java          |  6 ++----
 .../requests/CreateCertificateRequest.java    |  7 ++-----
 .../keyvault/requests/CreateKeyRequest.java   |  7 ++-----
 .../requests/ImportCertificateRequest.java    |  7 ++-----
 .../keyvault/requests/ImportKeyRequest.java   |  7 ++-----
 .../requests/MergeCertificateRequest.java     |  7 ++-----
 .../requests/SetCertificateIssuerRequest.java |  7 ++-----
 .../keyvault/requests/SetSecretRequest.java   |  7 ++-----
 .../UpdateCertificateIssuerRequest.java       |  7 ++-----
 .../UpdateCertificateOperationRequest.java    |  7 ++-----
 .../UpdateCertificatePolicyRequest.java       |  7 ++-----
 .../requests/UpdateCertificateRequest.java    |  7 ++-----
 .../keyvault/requests/UpdateKeyRequest.java   |  7 ++-----
 .../requests/UpdateSecretRequest.java         |  7 ++-----
 .../azure/keyvault/requests/package-info.java |  4 +---
 .../keyvault/test/AsyncOperationsTest.java    |  7 ++-----
 .../test/CertificateOperationsTest.java       |  7 ++-----
 .../keyvault/test/EnhancedKeyVaultTest.java   |  7 ++-----
 .../test/ITManagedStorageAccountKey.java      |  3 +++
 .../keyvault/test/KeyOperationsTest.java      |  7 ++-----
 .../KeyVaultClientIntegrationTestBase.java    |  3 +++
 .../keyvault/test/SecretOperationsTest.java   |  7 ++-----
 .../resources/MockUserTokenCredentials.java   |  3 +++
 .../com/microsoft/azure/template/Hello.java   |  7 ++-----
 .../azure/template/package-info.java          |  4 +---
 .../microsoft/azure/template/HelloTest.java   |  7 ++-----
 220 files changed, 537 insertions(+), 1240 deletions(-)

diff --git a/build-tools/src/main/resources/checkstyle/checkstyle.xml b/build-tools/src/main/resources/checkstyle/checkstyle.xml
index 9a4a7af91ddb..e9cc499b9e1a 100755
--- a/build-tools/src/main/resources/checkstyle/checkstyle.xml
+++ b/build-tools/src/main/resources/checkstyle/checkstyle.xml
@@ -16,7 +16,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
     </module>
     
     <module name="Header">
-        <property name="header" value="/**\n * Copyright (c) Microsoft Corporation. All rights reserved.\n * Licensed under the MIT License. See License.txt in the project root for\n * license information.\n"/>
+        <property name="header" value="// Copyright (c) Microsoft Corporation. All rights reserved.\n// Licensed under the MIT License."/>
         <property name="fileExtensions" value="java"/>
     </module>
 
@@ -131,12 +131,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
             <property name="severity" value="warning"/>
         </module>
 
-        <module name="FinalLocalVariable">
-            <!-- Checks that local variables that never have their values changed are declared final. -->
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="validateEnhancedForLoopVariable" value="true"/>
-        </module>
-
         <!-- LENGTH and CODING CHECKS -->
         <module name="LeftCurly">
             <!-- Checks for placement of the left curly brace ('{'). -->
@@ -197,14 +191,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
             <property name="arrayInitIndent" value="4"/>
         </module>
 
-        <module name="CustomImportOrder">
-            <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
-            <property name="specialImportsRegExp" value="^javax\."/>
-            <property name="standardPackageRegExp" value="^java\."/>
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="separateLineBetweenGroups" value="false"/>
-        </module>
-
         <!-- Checks for whitespace                               -->
         <!-- See http://checkstyle.sf.net/config_whitespace.html -->
         <module name="EmptyForIteratorPad"/>
diff --git a/build-tools/src/main/resources/checkstyle/java.header b/build-tools/src/main/resources/checkstyle/java.header
index 5792d38a6a5a..5a7f16910cd5 100755
--- a/build-tools/src/main/resources/checkstyle/java.header
+++ b/build-tools/src/main/resources/checkstyle/java.header
@@ -1,5 +1,2 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
\ No newline at end of file
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
\ No newline at end of file
diff --git a/keyvault/data-plane/azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/IKey.java b/keyvault/data-plane/azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/IKey.java
index 5eb18bd42677..8141909b99f1 100644
--- a/keyvault/data-plane/azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/IKey.java
+++ b/keyvault/data-plane/azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/IKey.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.core;
 
diff --git a/keyvault/data-plane/azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/IKeyResolver.java b/keyvault/data-plane/azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/IKeyResolver.java
index 635dd80c0287..d0fa3d0310ab 100644
--- a/keyvault/data-plane/azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/IKeyResolver.java
+++ b/keyvault/data-plane/azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/IKeyResolver.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.core;
 
diff --git a/keyvault/data-plane/azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/package-info.java b/keyvault/data-plane/azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/package-info.java
index b3417f38285d..e69854baa071 100644
--- a/keyvault/data-plane/azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/package-info.java
+++ b/keyvault/data-plane/azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/package-info.java
@@ -1,7 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
+// Licensed under the MIT License.
 
 /**
  * This package contains the interface for IKey and IKeyResolver.
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/Algorithm.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/Algorithm.java
index e80ccaf5a76b..0c620aef9492 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/Algorithm.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/Algorithm.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AlgorithmResolver.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AlgorithmResolver.java
index 1ac5c06c52d1..b5377308aa44 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AlgorithmResolver.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AlgorithmResolver.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AsymmetricEncryptionAlgorithm.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AsymmetricEncryptionAlgorithm.java
index b239a41d8530..e68b40305969 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AsymmetricEncryptionAlgorithm.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AsymmetricEncryptionAlgorithm.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AsymmetricSignatureAlgorithm.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AsymmetricSignatureAlgorithm.java
index ff5e1417ba5c..643d3277f9a0 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AsymmetricSignatureAlgorithm.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AsymmetricSignatureAlgorithm.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/ByteExtensions.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/ByteExtensions.java
index 07aee9a68949..b42971ddbee7 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/ByteExtensions.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/ByteExtensions.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/EcKey.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/EcKey.java
index fc82ad29025d..c16fe36b6ed4 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/EcKey.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/EcKey.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.cryptography;
 
 import java.io.IOException;
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/EncryptionAlgorithm.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/EncryptionAlgorithm.java
index 4d36c332b3be..73e147b2df99 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/EncryptionAlgorithm.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/EncryptionAlgorithm.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/IAuthenticatedCryptoTransform.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/IAuthenticatedCryptoTransform.java
index 113a14404cf4..9416e72863d5 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/IAuthenticatedCryptoTransform.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/IAuthenticatedCryptoTransform.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/ICryptoTransform.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/ICryptoTransform.java
index 4787a9d11a0f..97420879b6b0 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/ICryptoTransform.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/ICryptoTransform.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/ISignatureTransform.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/ISignatureTransform.java
index 484b1448fb51..8b30dbccff2d 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/ISignatureTransform.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/ISignatureTransform.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/KeyWrapAlgorithm.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/KeyWrapAlgorithm.java
index e0028d51a507..5142c2424655 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/KeyWrapAlgorithm.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/KeyWrapAlgorithm.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/RsaKey.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/RsaKey.java
index c0ae1b5995e7..e1946da8ef14 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/RsaKey.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/RsaKey.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SignatureAlgorithm.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SignatureAlgorithm.java
index 53d7459b9136..10b1329fb3b2 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SignatureAlgorithm.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SignatureAlgorithm.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SignatureEncoding.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SignatureEncoding.java
index b9fbc358ce03..85eed87cf755 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SignatureEncoding.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SignatureEncoding.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/Strings.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/Strings.java
index a1ead94749e6..43b067729036 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/Strings.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/Strings.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SymmetricEncryptionAlgorithm.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SymmetricEncryptionAlgorithm.java
index b582ced73492..3a4b54205a45 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SymmetricEncryptionAlgorithm.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SymmetricEncryptionAlgorithm.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SymmetricKey.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SymmetricKey.java
index c401d77251a8..4f80192b4a9c 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SymmetricKey.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/SymmetricKey.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes128Cbc.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes128Cbc.java
index 89a10584294d..b553e30cc55c 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes128Cbc.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes128Cbc.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes128CbcHmacSha256.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes128CbcHmacSha256.java
index f473aee20d11..0fa19b0fd02b 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes128CbcHmacSha256.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes128CbcHmacSha256.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes192Cbc.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes192Cbc.java
index fe6f3ff8f1f1..95348c2413b4 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes192Cbc.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes192Cbc.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes192CbcHmacSha384.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes192CbcHmacSha384.java
index ecfc65f49ff6..2e179684a478 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes192CbcHmacSha384.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes192CbcHmacSha384.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes256Cbc.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes256Cbc.java
index f198b9012b54..09cf33bc1787 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes256Cbc.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes256Cbc.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes256CbcHmacSha512.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes256CbcHmacSha512.java
index 61c1aead84b7..2c2ae7740c87 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes256CbcHmacSha512.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Aes256CbcHmacSha512.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesCbc.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesCbc.java
index f2b9d28f67e3..ac68e4e6afcb 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesCbc.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesCbc.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesCbcHmacSha2.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesCbcHmacSha2.java
index 9ab0a3cd2f1e..d4b5fb9c6a0f 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesCbcHmacSha2.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesCbcHmacSha2.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw.java
index 6bd7dfc28c63..e5d7a65d1d72 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw128.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw128.java
index d5696f5998f3..44f56bf56482 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw128.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw128.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw192.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw192.java
index 43225d8e080d..e4fadbfcd09b 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw192.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw192.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw256.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw256.java
index b2b514713c96..6b21161ecfa8 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw256.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/AesKw256.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Rs256.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Rs256.java
index e443398bf040..888a69e5dd6a 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Rs256.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Rs256.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Rsa15.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Rsa15.java
index 18ea8d28514f..8c0305298f4f 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Rsa15.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Rsa15.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/RsaEncryption.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/RsaEncryption.java
index 83343057aa55..0e9b3b2f39f3 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/RsaEncryption.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/RsaEncryption.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/RsaOaep.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/RsaOaep.java
index 38c3e4131231..d1d12da379f7 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/RsaOaep.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/RsaOaep.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/RsaSignature.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/RsaSignature.java
index 2e5a47548be9..d667184ea78b 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/RsaSignature.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/RsaSignature.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/package-info.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/package-info.java
index f3101db3f04c..b63ee69cc2da 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/package-info.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/package-info.java
@@ -1,7 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
+// Licensed under the MIT License.
 
 /**
  * This package contains cryptographic functions and implementations.
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/package-info.java b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/package-info.java
index 5492e8c67761..5e7ed7bb507a 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/package-info.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/package-info.java
@@ -1,7 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
+// Licensed under the MIT License.
 
 /**
  * This package contains cryptographic functions and implementations
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcBCProviderTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcBCProviderTest.java
index 043b2b54808b..86236194e435 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcBCProviderTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcBCProviderTest.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.cryptography.test;
 
 import java.security.Provider;
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcHmacShaBCProviderTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcHmacShaBCProviderTest.java
index 5c7e07a27347..2810c200db0e 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcHmacShaBCProviderTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcHmacShaBCProviderTest.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.cryptography.test;
 
 import java.security.Provider;
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcHmacShaTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcHmacShaTest.java
index ef588b4830e9..5ace1695e4d9 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcHmacShaTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcHmacShaTest.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.cryptography.test;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcTest.java
index 7b41487ef988..0532bb049b16 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcTest.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.cryptography.test;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwBCProviderTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwBCProviderTest.java
index 480db6f2e896..2ec6d8389573 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwBCProviderTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwBCProviderTest.java
@@ -1,20 +1,5 @@
-/**
- *
- * Copyright (c) Microsoft and contributors.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.test;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwTest.java
index e79e5569fe71..346f5402f3a8 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwTest.java
@@ -1,20 +1,5 @@
-/**
- *
- * Copyright (c) Microsoft and contributors.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.test;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/ECKeyBCProviderTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/ECKeyBCProviderTest.java
index 545c0eb1429c..c6d8373bae68 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/ECKeyBCProviderTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/ECKeyBCProviderTest.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.cryptography.test;
 
 import java.security.Provider;
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 bb08018f3823..8a57082beb7c 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
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.cryptography.test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/PemFile.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/PemFile.java
index 02c7f16e9f9d..d0fe37cfe00a 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/PemFile.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/PemFile.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.cryptography.test;
 
 import java.io.FileInputStream;
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/RsaKeyBCProviderTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/RsaKeyBCProviderTest.java
index c9a9c70acaeb..5ec7cd3127c0 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/RsaKeyBCProviderTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/RsaKeyBCProviderTest.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.cryptography.test;
 
 import java.security.Provider;
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/RsaKeyTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/RsaKeyTest.java
index 49449105e90c..665fcceaad30 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/RsaKeyTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/RsaKeyTest.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.cryptography.test;
 
 import static org.junit.Assert.*;
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyBCProviderTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyBCProviderTest.java
index 2954df416105..70c45dac0d02 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyBCProviderTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyBCProviderTest.java
@@ -1,20 +1,5 @@
-/**
- *
- * Copyright (c) Microsoft and contributors.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.test;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyTest.java
index b6d3194cae05..9cf33af34a23 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyTest.java
@@ -1,20 +1,5 @@
-/**
- *
- * Copyright (c) Microsoft and contributors.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.cryptography.test;
 
diff --git a/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/AggregateKeyResolver.java b/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/AggregateKeyResolver.java
index 8ce09dde16ae..849ff9b008cc 100644
--- a/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/AggregateKeyResolver.java
+++ b/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/AggregateKeyResolver.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.extensions;
 
diff --git a/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/CachingKeyResolver.java b/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/CachingKeyResolver.java
index 62bca3fabfdb..63734a6eb24f 100644
--- a/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/CachingKeyResolver.java
+++ b/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/CachingKeyResolver.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.extensions;
 
diff --git a/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/KeyVaultKey.java b/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/KeyVaultKey.java
index bfb58a8a7b8a..a67661b9ff9e 100644
--- a/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/KeyVaultKey.java
+++ b/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/KeyVaultKey.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 package com.microsoft.azure.keyvault.extensions;
 
 import java.io.IOException;
diff --git a/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/KeyVaultKeyResolver.java b/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/KeyVaultKeyResolver.java
index 3e8cc130cf7d..f78e631bd433 100644
--- a/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/KeyVaultKeyResolver.java
+++ b/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/KeyVaultKeyResolver.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.extensions;
 
diff --git a/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/Strings.java b/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/Strings.java
index 5d5fe934de6b..1bab9f916ca6 100644
--- a/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/Strings.java
+++ b/keyvault/data-plane/azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/Strings.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.extensions;
 
diff --git a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/CachingKeyResolverTest.java b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/CachingKeyResolverTest.java
index 39e15a594185..83e4de56e5bf 100644
--- a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/CachingKeyResolverTest.java
+++ b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/CachingKeyResolverTest.java
@@ -1,20 +1,5 @@
-/**
- *
- * Copyright (c) Microsoft and contributors.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.extensions.test;
 
diff --git a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultClientIntegrationTestBase.java b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultClientIntegrationTestBase.java
index fcec09021aa3..ba598d814768 100644
--- a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultClientIntegrationTestBase.java
+++ b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultClientIntegrationTestBase.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.extensions.test;
 
 import com.microsoft.aad.adal4j.AuthenticationContext;
diff --git a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverBCProviderTest.java b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverBCProviderTest.java
index 767ba1615544..aa1bcd1d6c33 100644
--- a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverBCProviderTest.java
+++ b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverBCProviderTest.java
@@ -1,19 +1,5 @@
-//
-//Copyright © Microsoft Corporation, All Rights Reserved
-//
-//Licensed under the Apache License, Version 2.0 (the "License");
-//you may not use this file except in compliance with the License.
-//You may obtain a copy of the License at
-//
-//http://www.apache.org/licenses/LICENSE-2.0
-//
-//THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
-//OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
-//ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A
-//PARTICULAR PURPOSE, MERCHANTABILITY OR NON-INFRINGEMENT.
-//
-//See the Apache License, Version 2.0 for the specific language
-//governing permissions and limitations under the License.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.extensions.test;
 
diff --git a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverDefaultProviderTest.java b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverDefaultProviderTest.java
index ab1ba4e83a18..4dc8cf746679 100644
--- a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverDefaultProviderTest.java
+++ b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverDefaultProviderTest.java
@@ -24,22 +24,8 @@
 import com.microsoft.azure.keyvault.requests.SetSecretRequest;
 import com.microsoft.azure.keyvault.webkey.JsonWebKeyType;
 
-//
-//Copyright © Microsoft Corporation, All Rights Reserved
-//
-//Licensed under the Apache License, Version 2.0 (the "License");
-//you may not use this file except in compliance with the License.
-//You may obtain a copy of the License at
-//
-//http://www.apache.org/licenses/LICENSE-2.0
-//
-//THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
-//OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
-//ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A
-//PARTICULAR PURPOSE, MERCHANTABILITY OR NON-INFRINGEMENT.
-//
-//See the Apache License, Version 2.0 for the specific language
-//governing permissions and limitations under the License.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 public class KeyVaultKeyResolverDefaultProviderTest extends KeyVaultClientIntegrationTestBase {
     
diff --git a/keyvault/data-plane/azure-keyvault-test/src/test/java/com/microsoft/azure/keyvault/test/EcKeyIntegrationTests.java b/keyvault/data-plane/azure-keyvault-test/src/test/java/com/microsoft/azure/keyvault/test/EcKeyIntegrationTests.java
index 92a006022bd2..df473fd27bdc 100644
--- a/keyvault/data-plane/azure-keyvault-test/src/test/java/com/microsoft/azure/keyvault/test/EcKeyIntegrationTests.java
+++ b/keyvault/data-plane/azure-keyvault-test/src/test/java/com/microsoft/azure/keyvault/test/EcKeyIntegrationTests.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.test;
 
 import static org.junit.Assert.*;
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/Base64UrlJsonDeserializer.java b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/Base64UrlJsonDeserializer.java
index f36de8c23bca..9e9990d3ba8b 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/Base64UrlJsonDeserializer.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/Base64UrlJsonDeserializer.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.webkey;
 
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/Base64UrlJsonSerializer.java b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/Base64UrlJsonSerializer.java
index c4b56b7d5a3a..282eab7b12db 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/Base64UrlJsonSerializer.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/Base64UrlJsonSerializer.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.webkey;
 
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKey.java b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKey.java
index c7d317a07028..c47a10ed02e8 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKey.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKey.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.webkey;
 
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyCurveName.java b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyCurveName.java
index b12aa57ece5f..3c922012d336 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyCurveName.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyCurveName.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.webkey;
 
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyEncryptionAlgorithm.java b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyEncryptionAlgorithm.java
index 6631fb4a2dac..49ae422ca2aa 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyEncryptionAlgorithm.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyEncryptionAlgorithm.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.webkey;
 
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyOperation.java b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyOperation.java
index 9dbb9d30fce6..674eb29ac4a1 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyOperation.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyOperation.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.webkey;
 
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeySignatureAlgorithm.java b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeySignatureAlgorithm.java
index 7075d00a1f97..12c255402d97 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeySignatureAlgorithm.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeySignatureAlgorithm.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- **/
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.webkey;
 
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyType.java b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyType.java
index dc5a7355bcc8..c375c3ac95f8 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyType.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/JsonWebKeyType.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.webkey;
 
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/package-info.java b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/package-info.java
index 6768bb504520..1ad32e7d4ed1 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/package-info.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/main/java/com/microsoft/azure/keyvault/webkey/package-info.java
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
+// Licensed under the MIT License.
 
 /**
  * This package contains the classes for key vault JSON web key. 
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/AesValidationTests.java b/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/AesValidationTests.java
index 3d1ed2b07c77..5336ad0e6be9 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/AesValidationTests.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/AesValidationTests.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.webkey.test;
 
 import java.util.Arrays;
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/ClearMemoryTests.java b/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/ClearMemoryTests.java
index f28801584059..295d861d6d95 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/ClearMemoryTests.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/ClearMemoryTests.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.webkey.test;
 
 import java.util.Random;
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/EcHsmValidationTests.java b/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/EcHsmValidationTests.java
index 0175b2164d69..f059824b4231 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/EcHsmValidationTests.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/EcHsmValidationTests.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.webkey.test;
 
 import org.junit.Assert;
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/EcValidationTests.java b/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/EcValidationTests.java
index a2f341dc1c05..9e83e0d6b6f9 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/EcValidationTests.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/EcValidationTests.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.webkey.test;
 
 import java.security.InvalidKeyException;
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/RsaHsmValidationTests.java b/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/RsaHsmValidationTests.java
index fd960ee23a8c..7d84e0d06881 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/RsaHsmValidationTests.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/RsaHsmValidationTests.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.webkey.test;
 
 import org.junit.Assert;
diff --git a/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/RsaValidationTests.java b/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/RsaValidationTests.java
index cb5bcb3de228..dae5e1e7a0e6 100644
--- a/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/RsaValidationTests.java
+++ b/keyvault/data-plane/azure-keyvault-webkey/src/test/java/com/microsoft/azure/keyvault/webkey/test/RsaValidationTests.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.webkey.test;
 
 import java.security.KeyPair;
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/CertificateIdentifier.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/CertificateIdentifier.java
index 3d89362feb2f..e70ecad0105e 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/CertificateIdentifier.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/CertificateIdentifier.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/CertificateOperationIdentifier.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/CertificateOperationIdentifier.java
index df6144064947..381c799fbcff 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/CertificateOperationIdentifier.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/CertificateOperationIdentifier.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/IssuerIdentifier.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/IssuerIdentifier.java
index 71c88d9d9ee9..924965c7f06b 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/IssuerIdentifier.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/IssuerIdentifier.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyIdentifier.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyIdentifier.java
index 493f4097df55..bc7ae6ce5911 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyIdentifier.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyIdentifier.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClient.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClient.java
index 58e8bd36ba57..4d76c7a924c6 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClient.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClient.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientBase.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientBase.java
index 72f475261b73..5389a3469a3f 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientBase.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientBase.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientCustom.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientCustom.java
index f64bf02a9061..aad7accae889 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientCustom.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientCustom.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientImpl.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientImpl.java
index f1d3c981b147..53c39908a51c 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientImpl.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientImpl.java
@@ -1,12 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
- * Changes may cause incorrect behavior and will be lost if the code is
- * regenerated.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/ObjectIdentifier.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/ObjectIdentifier.java
index cdd9309f3b71..64df53a2e44a 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/ObjectIdentifier.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/ObjectIdentifier.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/SecretIdentifier.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/SecretIdentifier.java
index f667437b8e0f..232aec69c5ee 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/SecretIdentifier.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/SecretIdentifier.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/AuthenticationResult.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/AuthenticationResult.java
index 6f1628acf30d..8e5aa976ecbc 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/AuthenticationResult.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/AuthenticationResult.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 package com.microsoft.azure.keyvault.authentication;
 
 /**
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/ChallengeCache.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/ChallengeCache.java
index 4559cac8332e..b8289971832d 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/ChallengeCache.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/ChallengeCache.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.authentication;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/KeyVaultCredentials.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/KeyVaultCredentials.java
index 2402f9d99b29..067477521176 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/KeyVaultCredentials.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/KeyVaultCredentials.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.authentication;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/package-info.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/package-info.java
index a565f188320a..20ce8cdf9a62 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/package-info.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/authentication/package-info.java
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
+// Licensed under the MIT License.
 
 /**
  * This package contains the classes for KeyVaultClient. Performs cryptographic
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/implementation/KeyVaultClientBaseImpl.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/implementation/KeyVaultClientBaseImpl.java
index a6a6b055a62a..73a46d58d621 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/implementation/KeyVaultClientBaseImpl.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/implementation/KeyVaultClientBaseImpl.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.implementation;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/implementation/KeyVaultClientCustomImpl.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/implementation/KeyVaultClientCustomImpl.java
index 043b28cf4742..19f01d755a82 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/implementation/KeyVaultClientCustomImpl.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/implementation/KeyVaultClientCustomImpl.java
@@ -1,9 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.implementation;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/implementation/package-info.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/implementation/package-info.java
index 9ddd63a760d9..d4dba89f2747 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/implementation/package-info.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/implementation/package-info.java
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
+// Licensed under the MIT License.
 
 /**
  * This package contains the classes for KeyVaultClient. Performs cryptographic
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/HttpMessageSecurity.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/HttpMessageSecurity.java
index 938ed984559a..ad2afd18e315 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/HttpMessageSecurity.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/HttpMessageSecurity.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.messagesecurity;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWEHeader.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWEHeader.java
index c687b1d33c40..33249204f555 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWEHeader.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWEHeader.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.messagesecurity;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWEObject.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWEObject.java
index 4a4ebded0cc5..502c6c0d95d2 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWEObject.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWEObject.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.messagesecurity;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWSHeader.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWSHeader.java
index 59595cd3f6b3..0628c3b3447f 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWSHeader.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWSHeader.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.messagesecurity;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWSObject.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWSObject.java
index 871f5b67d272..c520bb5b79d9 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWSObject.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/JWSObject.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.messagesecurity;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/MessageSecurityHelper.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/MessageSecurityHelper.java
index a94f8b5db86d..846f6c6a6216 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/MessageSecurityHelper.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/MessageSecurityHelper.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.messagesecurity;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/package-info.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/package-info.java
index c487c40ca28b..6a406f847567 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/package-info.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/messagesecurity/package-info.java
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
+// Licensed under the MIT License.
 
 /**
  * This package contains the classes for KeyVaultClient. Performs cryptographic
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Action.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Action.java
index e087781cdcc3..59187e23649f 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Action.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Action.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/ActionType.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/ActionType.java
index 1eed810b18ff..6977cd229d4b 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/ActionType.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/ActionType.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/AdministratorDetails.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/AdministratorDetails.java
index e1ae21d10dd1..181a763a11d5 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/AdministratorDetails.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/AdministratorDetails.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Attributes.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Attributes.java
index 9611767ac83e..0a22dab55f07 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Attributes.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Attributes.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupCertificateResult.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupCertificateResult.java
index 80817434103a..a562ea9c9def 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupCertificateResult.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupCertificateResult.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupKeyResult.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupKeyResult.java
index 22c1dfb7c4b6..e648e95c9fe9 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupKeyResult.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupKeyResult.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupSecretResult.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupSecretResult.java
index 8c5cf6d7f2ba..8e0108e1dd03 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupSecretResult.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupSecretResult.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupStorageResult.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupStorageResult.java
index 9b4d93b77700..51b27e2db089 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupStorageResult.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/BackupStorageResult.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateAttributes.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateAttributes.java
index 810216c00c89..9aa46e685096 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateAttributes.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateAttributes.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateBundle.java
index f9efa540df63..880d2f28631e 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateBundle.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateCreateParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateCreateParameters.java
index 301126e91b8b..9c2e7178fb9c 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateCreateParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateCreateParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateImportParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateImportParameters.java
index ca53338933c9..af6620a36a60 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateImportParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateImportParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateIssuerItem.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateIssuerItem.java
index f56b05b916c2..41f5dcb8155e 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateIssuerItem.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateIssuerItem.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateIssuerSetParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateIssuerSetParameters.java
index 9ef7c67f757c..78fe34803629 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateIssuerSetParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateIssuerSetParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateIssuerUpdateParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateIssuerUpdateParameters.java
index 656be38775bd..0c85ddfcdd16 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateIssuerUpdateParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateIssuerUpdateParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateItem.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateItem.java
index b61faa2a9458..f2675602ed66 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateItem.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateItem.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateMergeParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateMergeParameters.java
index 6d404066143a..2d94964846e4 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateMergeParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateMergeParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateOperation.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateOperation.java
index 9e00258247b6..264e945fbb15 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateOperation.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateOperation.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateOperationUpdateParameter.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateOperationUpdateParameter.java
index 98a494bc31cd..0d9a1460f0f5 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateOperationUpdateParameter.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateOperationUpdateParameter.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificatePolicy.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificatePolicy.java
index 44f94ba02a39..6a989413ba47 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificatePolicy.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificatePolicy.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateRestoreParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateRestoreParameters.java
index 094f070e38e2..ee01edddafbe 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateRestoreParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateRestoreParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateUpdateParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateUpdateParameters.java
index 7beed06ec6be..fdfabc12e5c2 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateUpdateParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/CertificateUpdateParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Contact.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Contact.java
index 729c6ec10624..7f6a0c1df5de 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Contact.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Contact.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Contacts.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Contacts.java
index b9b0b3547b25..c2af79b1f220 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Contacts.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Contacts.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedCertificateBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedCertificateBundle.java
index 4b1926c6784a..b534c42193fa 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedCertificateBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedCertificateBundle.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedCertificateItem.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedCertificateItem.java
index 5d14c7625464..1f075ea04567 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedCertificateItem.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedCertificateItem.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedKeyBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedKeyBundle.java
index 5125230205aa..332b9f839976 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedKeyBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedKeyBundle.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedKeyItem.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedKeyItem.java
index b374bebf643c..3cea86dd5b8d 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedKeyItem.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedKeyItem.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSasDefinitionBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSasDefinitionBundle.java
index 35575a25186b..a56d6edb1a95 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSasDefinitionBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSasDefinitionBundle.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSasDefinitionItem.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSasDefinitionItem.java
index 15aae9e35ac9..c1d1c8948b03 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSasDefinitionItem.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSasDefinitionItem.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSecretBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSecretBundle.java
index 001639d31120..d4abda18f515 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSecretBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSecretBundle.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSecretItem.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSecretItem.java
index 35865f364128..2042f6ee7e8f 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSecretItem.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedSecretItem.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedStorageAccountItem.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedStorageAccountItem.java
index 290bb199a4e7..925e875d5db2 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedStorageAccountItem.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedStorageAccountItem.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedStorageBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedStorageBundle.java
index 7d1baa4ca520..459c0b5e2660 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedStorageBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletedStorageBundle.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletionRecoveryLevel.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletionRecoveryLevel.java
index 8e02a9c88328..62efc61ecdef 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletionRecoveryLevel.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/DeletionRecoveryLevel.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Error.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Error.java
index 78fc47d0bca6..a0033d11ca96 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Error.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Error.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerAttributes.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerAttributes.java
index baf741301bec..99e30bf48dcf 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerAttributes.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerAttributes.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerBundle.java
index a6b6d53e8752..993245bcde8a 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerBundle.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerCredentials.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerCredentials.java
index ea804477220f..f2b753720e07 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerCredentials.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerCredentials.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerParameters.java
index 4258978ca557..2fe30e974ec1 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/IssuerParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/JsonWebKeyCurveName.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/JsonWebKeyCurveName.java
index a1c2caf1021e..809d1d35c97f 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/JsonWebKeyCurveName.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/JsonWebKeyCurveName.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyAttributes.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyAttributes.java
index 27c31153d2fe..4ca155b40329 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyAttributes.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyAttributes.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyBundle.java
index a505c687375e..e76c9119f59e 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyBundle.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyCreateParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyCreateParameters.java
index 76ecda2394e7..49b83775d06c 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyCreateParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyCreateParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyImportParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyImportParameters.java
index 255f53a64bc6..bfaa26ca27e2 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyImportParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyImportParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyItem.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyItem.java
index 03617a863ebb..da0dd54dc749 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyItem.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyItem.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyOperationResult.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyOperationResult.java
index 3761229220c1..3a8a7c61e42b 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyOperationResult.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyOperationResult.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyOperationsParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyOperationsParameters.java
index 167b8a5521f2..a8181300b156 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyOperationsParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyOperationsParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyProperties.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyProperties.java
index fe32ccf726a3..9afdfdd43f14 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyProperties.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyProperties.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyRestoreParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyRestoreParameters.java
index 0cf867e681bd..8dff8503f231 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyRestoreParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyRestoreParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeySignParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeySignParameters.java
index c5d40edb4dec..c385c24dec3e 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeySignParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeySignParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyUpdateParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyUpdateParameters.java
index 9752c5bb33f1..5e7a528c322c 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyUpdateParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyUpdateParameters.java
@@ -1,10 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyUsageType.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyUsageType.java
index 3bb0eb952bc9..06a3518f550e 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyUsageType.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyUsageType.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVaultError.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVaultError.java
index 9ed31855cc49..ff2fd28369ae 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVaultError.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVaultError.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVaultErrorException.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVaultErrorException.java
index 8bd16782f46c..e700fb625983 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVaultErrorException.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVaultErrorException.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVerifyParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVerifyParameters.java
index 56e9cc88fd72..d3214cd0c43a 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVerifyParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVerifyParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVerifyResult.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVerifyResult.java
index 85857ede68f2..95feb54a74d2 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVerifyResult.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/KeyVerifyResult.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/LifetimeAction.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/LifetimeAction.java
index 0ef49541eada..288ef4db6a6b 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/LifetimeAction.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/LifetimeAction.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/OrganizationDetails.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/OrganizationDetails.java
index fbbeb04fc911..a6b62fe4c3ac 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/OrganizationDetails.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/OrganizationDetails.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/PageImpl.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/PageImpl.java
index 014d89366c51..0b5bb63f2ae4 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/PageImpl.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/PageImpl.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/PendingCertificateSigningRequestResult.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/PendingCertificateSigningRequestResult.java
index d508235abe6e..b40c1c60b2f0 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/PendingCertificateSigningRequestResult.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/PendingCertificateSigningRequestResult.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionAttributes.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionAttributes.java
index bfb59d2dfd26..390f2a14f231 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionAttributes.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionAttributes.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionBundle.java
index 3c1f03824217..8cda22073b2e 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionBundle.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionCreateParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionCreateParameters.java
index 98c998022585..669989cb9ca3 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionCreateParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionCreateParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionItem.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionItem.java
index b6b8edccb8fa..ac45dc383dfa 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionItem.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionItem.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionUpdateParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionUpdateParameters.java
index 1604a6295176..52313e37ea54 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionUpdateParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasDefinitionUpdateParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasTokenType.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasTokenType.java
index 56a9b0c7760c..c70c84245875 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasTokenType.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SasTokenType.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretAttributes.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretAttributes.java
index b3e08b9afa0b..ab99ea57b519 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretAttributes.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretAttributes.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretBundle.java
index 180f6a418d15..e2c479072e8c 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretBundle.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretItem.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretItem.java
index 9001d0f515d1..aac61ca01758 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretItem.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretItem.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretProperties.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretProperties.java
index ceff8a773326..acac04eb1f44 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretProperties.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretProperties.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretRestoreParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretRestoreParameters.java
index 27100e54dab4..1695756c2c8f 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretRestoreParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretRestoreParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretSetParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretSetParameters.java
index 515d369e87db..2afab609eb79 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretSetParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretSetParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretUpdateParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretUpdateParameters.java
index 89e02e037499..4e0100aa9dc4 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretUpdateParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SecretUpdateParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountAttributes.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountAttributes.java
index 109e2c51bd5a..701feddbf666 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountAttributes.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountAttributes.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountCreateParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountCreateParameters.java
index cb49d6e14429..50f8c4c1bd57 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountCreateParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountCreateParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountItem.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountItem.java
index 93c041ee25fc..70e288af2d09 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountItem.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountItem.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountRegenerteKeyParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountRegenerteKeyParameters.java
index c29c60bde444..45984e8ecceb 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountRegenerteKeyParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountRegenerteKeyParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountUpdateParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountUpdateParameters.java
index 636137fff2ea..9f4832c2a09a 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountUpdateParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageAccountUpdateParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageBundle.java
index 86a2525d4a46..8b6a28f1f2e5 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageBundle.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageRestoreParameters.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageRestoreParameters.java
index 32ec85fe5ac9..d08e96b89a70 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageRestoreParameters.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/StorageRestoreParameters.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SubjectAlternativeNames.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SubjectAlternativeNames.java
index 2ab51851f479..4232309ef130 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SubjectAlternativeNames.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/SubjectAlternativeNames.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Trigger.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Trigger.java
index c42884ce962c..8a67e4566e5e 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Trigger.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/Trigger.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/X509CertificateProperties.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/X509CertificateProperties.java
index 34a279a73e5b..79505a237287 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/X509CertificateProperties.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/X509CertificateProperties.java
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 package com.microsoft.azure.keyvault.models;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/CertificateBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/CertificateBundle.java
index 85b6eeeadd1e..ec6c2ab01d1c 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/CertificateBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/CertificateBundle.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.models.custom;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/CertificateOperation.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/CertificateOperation.java
index b04553b54a3b..68692a01cd6e 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/CertificateOperation.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/CertificateOperation.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.models.custom;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/IssuerBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/IssuerBundle.java
index 09d0bdda30f9..dd5d1483cfbf 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/IssuerBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/IssuerBundle.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.models.custom;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/KeyBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/KeyBundle.java
index 2990cb852f45..224bbcf74ae6 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/KeyBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/KeyBundle.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.models.custom;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/SecretBundle.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/SecretBundle.java
index 643ae12dcfbc..68a39325f103 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/SecretBundle.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/SecretBundle.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.models.custom;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/package-info.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/package-info.java
index 0ae4922426f5..83863befdf74 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/package-info.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/custom/package-info.java
@@ -1,7 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
+// Licensed under the MIT License.
 
 /**
  * This package contains the classes for KeyVaultClient. Performs cryptographic
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/package-info.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/package-info.java
index 641d85ba3322..907aa591c5b8 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/package-info.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/models/package-info.java
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 /**
  * This package contains the models classes for KeyVaultClientBase.
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/package-info.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/package-info.java
index d9a1e4e79218..83731d497e58 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/package-info.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/package-info.java
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator
 
 /**
  * This package contains the classes for KeyVaultClientBase.
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/CreateCertificateRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/CreateCertificateRequest.java
index 5340938fe450..14d84a615e63 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/CreateCertificateRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/CreateCertificateRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/CreateKeyRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/CreateKeyRequest.java
index ce15d4c64398..00f89dd433b6 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/CreateKeyRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/CreateKeyRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/ImportCertificateRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/ImportCertificateRequest.java
index a39eac190cac..e149a9c1b46e 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/ImportCertificateRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/ImportCertificateRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/ImportKeyRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/ImportKeyRequest.java
index c8fd5942920b..eab10538cef6 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/ImportKeyRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/ImportKeyRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/MergeCertificateRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/MergeCertificateRequest.java
index 8b97e06b0245..cbd693356c58 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/MergeCertificateRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/MergeCertificateRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/SetCertificateIssuerRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/SetCertificateIssuerRequest.java
index ba6a77927622..6b5c5fce7e31 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/SetCertificateIssuerRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/SetCertificateIssuerRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/SetSecretRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/SetSecretRequest.java
index 79caf1dc45d5..9846d2cfd65d 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/SetSecretRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/SetSecretRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificateIssuerRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificateIssuerRequest.java
index 6ec959abd8e9..a96f3761c6c3 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificateIssuerRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificateIssuerRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificateOperationRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificateOperationRequest.java
index b1e736daa8bb..bd681576e6dd 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificateOperationRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificateOperationRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificatePolicyRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificatePolicyRequest.java
index 088889840fff..d516f071b573 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificatePolicyRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificatePolicyRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificateRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificateRequest.java
index 236c31df3a96..82d2fe06d099 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificateRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateCertificateRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateKeyRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateKeyRequest.java
index 429ee4e80ee5..51885fea13d7 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateKeyRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateKeyRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateSecretRequest.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateSecretRequest.java
index 547c3d6f859e..a95c0dc5b4cd 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateSecretRequest.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/UpdateSecretRequest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.requests;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/package-info.java b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/package-info.java
index a2056d0f7763..8d9199cfb9d2 100644
--- a/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/package-info.java
+++ b/keyvault/data-plane/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/requests/package-info.java
@@ -1,7 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
+// Licensed under the MIT License.
 
 /**
  * This package contains the classes for KeyVaultClient. Performs cryptographic
diff --git a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/AsyncOperationsTest.java b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/AsyncOperationsTest.java
index e9fd8e8a9a36..fa125e77695a 100644
--- a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/AsyncOperationsTest.java
+++ b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/AsyncOperationsTest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.test;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/CertificateOperationsTest.java b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/CertificateOperationsTest.java
index 5309a833eaec..d371b9d43b92 100644
--- a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/CertificateOperationsTest.java
+++ b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/CertificateOperationsTest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.test;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/EnhancedKeyVaultTest.java b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/EnhancedKeyVaultTest.java
index abfd063fbef5..19f8e28d388a 100644
--- a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/EnhancedKeyVaultTest.java
+++ b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/EnhancedKeyVaultTest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.test;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/ITManagedStorageAccountKey.java b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/ITManagedStorageAccountKey.java
index e490104a3106..d87af78af53e 100644
--- a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/ITManagedStorageAccountKey.java
+++ b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/ITManagedStorageAccountKey.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.test;
 
 import java.io.BufferedReader;
diff --git a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/KeyOperationsTest.java b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/KeyOperationsTest.java
index 19e22238c2f8..68165a422085 100644
--- a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/KeyOperationsTest.java
+++ b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/KeyOperationsTest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.test;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/KeyVaultClientIntegrationTestBase.java b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/KeyVaultClientIntegrationTestBase.java
index 8b0a40e74dd6..13f661926f72 100644
--- a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/KeyVaultClientIntegrationTestBase.java
+++ b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/KeyVaultClientIntegrationTestBase.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.azure.keyvault.test;
 
 import java.io.IOException;
diff --git a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/SecretOperationsTest.java b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/SecretOperationsTest.java
index 25673c2e98bc..c471cccf0cfd 100644
--- a/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/SecretOperationsTest.java
+++ b/keyvault/data-plane/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/SecretOperationsTest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.azure.keyvault.test;
 
diff --git a/keyvault/data-plane/azure-keyvault/src/test/java/resources/MockUserTokenCredentials.java b/keyvault/data-plane/azure-keyvault/src/test/java/resources/MockUserTokenCredentials.java
index c3df3c896777..e7fed19ba8c6 100644
--- a/keyvault/data-plane/azure-keyvault/src/test/java/resources/MockUserTokenCredentials.java
+++ b/keyvault/data-plane/azure-keyvault/src/test/java/resources/MockUserTokenCredentials.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package resources;
 
 import java.io.IOException;
diff --git a/template/client/src/main/java/com/microsoft/azure/template/Hello.java b/template/client/src/main/java/com/microsoft/azure/template/Hello.java
index 4af4ad00740d..5c6a1a63742d 100644
--- a/template/client/src/main/java/com/microsoft/azure/template/Hello.java
+++ b/template/client/src/main/java/com/microsoft/azure/template/Hello.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 package com.microsoft.azure.template;
 
 /**
diff --git a/template/client/src/main/java/com/microsoft/azure/template/package-info.java b/template/client/src/main/java/com/microsoft/azure/template/package-info.java
index 7181dfbebdd6..484b3410d4b5 100644
--- a/template/client/src/main/java/com/microsoft/azure/template/package-info.java
+++ b/template/client/src/main/java/com/microsoft/azure/template/package-info.java
@@ -1,7 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
+// Licensed under the MIT License.
 
 /**
  * This package contains classes for the template project.
diff --git a/template/client/src/test/java/com/microsoft/azure/template/HelloTest.java b/template/client/src/test/java/com/microsoft/azure/template/HelloTest.java
index 0bcf2265d0ae..3e37776b7d41 100644
--- a/template/client/src/test/java/com/microsoft/azure/template/HelloTest.java
+++ b/template/client/src/test/java/com/microsoft/azure/template/HelloTest.java
@@ -1,8 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 package com.microsoft.azure.template;
 
 import org.junit.Test;

From 6a52c965c1fa8bab9a5af394ee13acea3d658082 Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Thu, 31 Jan 2019 15:19:47 -0500
Subject: [PATCH 03/12] reverting headers.

---
 build-tools/pom.xml                           | 10 ++--------
 .../checkstyle/checkstyle-suppressions.xml    |  3 +++
 .../test/AesKwBCProviderTest.java             | 19 +++++++++++++++++--
 .../keyvault/cryptography/test/AesKwTest.java | 19 +++++++++++++++++--
 .../test/SymmetricKeyBCProviderTest.java      | 19 +++++++++++++++++--
 .../cryptography/test/SymmetricKeyTest.java   | 19 +++++++++++++++++--
 .../test/CachingKeyResolverTest.java          | 19 +++++++++++++++++--
 .../KeyVaultKeyResolverBCProviderTest.java    | 18 ++++++++++++++++--
 ...eyVaultKeyResolverDefaultProviderTest.java | 18 ++++++++++++++++--
 9 files changed, 122 insertions(+), 22 deletions(-)

diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index d3077924356e..f98d8b42f296 100755
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -4,17 +4,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>build-tools-azure</artifactId>
+    <groupId>com.azure</groupId>
+    <artifactId>sdk-build-tools</artifactId>
     <name>Maven Build Tools</name>
     <version>1.0.0</version>
 
-    <parent>
-        <groupId>com.microsoft.maven</groupId>
-        <artifactId>java-8-parent</artifactId>
-        <version>8.0.0</version>
-    </parent>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml b/build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml
index a0caa126fdd9..3bff1ca1f810 100755
--- a/build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml
+++ b/build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -9,4 +9,7 @@
   <suppress checks="Javadoc" files=".*Test[s]?Base\.java"/>
   <suppress checks="Javadoc" files=".*CoverageReporter\.java"/>
   <suppress checks="Header" files=".*package-info.java"/>
+  <suppress checks="Header" files=".*package-info.java"/>
+  <suppress checks="Header" files=".*package-info.java"/>
+
 </suppressions>
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwBCProviderTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwBCProviderTest.java
index 2ec6d8389573..480db6f2e896 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwBCProviderTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwBCProviderTest.java
@@ -1,5 +1,20 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
+/**
+ *
+ * Copyright (c) Microsoft and contributors.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 package com.microsoft.azure.keyvault.cryptography.test;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwTest.java
index 346f5402f3a8..e79e5569fe71 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesKwTest.java
@@ -1,5 +1,20 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
+/**
+ *
+ * Copyright (c) Microsoft and contributors.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 package com.microsoft.azure.keyvault.cryptography.test;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyBCProviderTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyBCProviderTest.java
index 70c45dac0d02..2954df416105 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyBCProviderTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyBCProviderTest.java
@@ -1,5 +1,20 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
+/**
+ *
+ * Copyright (c) Microsoft and contributors.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 package com.microsoft.azure.keyvault.cryptography.test;
 
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyTest.java b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyTest.java
index 9cf33af34a23..b6d3194cae05 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyTest.java
+++ b/keyvault/data-plane/azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/SymmetricKeyTest.java
@@ -1,5 +1,20 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
+/**
+ *
+ * Copyright (c) Microsoft and contributors.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 package com.microsoft.azure.keyvault.cryptography.test;
 
diff --git a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/CachingKeyResolverTest.java b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/CachingKeyResolverTest.java
index 83e4de56e5bf..39e15a594185 100644
--- a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/CachingKeyResolverTest.java
+++ b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/CachingKeyResolverTest.java
@@ -1,5 +1,20 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
+/**
+ *
+ * Copyright (c) Microsoft and contributors.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 package com.microsoft.azure.keyvault.extensions.test;
 
diff --git a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverBCProviderTest.java b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverBCProviderTest.java
index aa1bcd1d6c33..767ba1615544 100644
--- a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverBCProviderTest.java
+++ b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverBCProviderTest.java
@@ -1,5 +1,19 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
+//
+//Copyright © Microsoft Corporation, All Rights Reserved
+//
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
+//OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
+//ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A
+//PARTICULAR PURPOSE, MERCHANTABILITY OR NON-INFRINGEMENT.
+//
+//See the Apache License, Version 2.0 for the specific language
+//governing permissions and limitations under the License.
 
 package com.microsoft.azure.keyvault.extensions.test;
 
diff --git a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverDefaultProviderTest.java b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverDefaultProviderTest.java
index 4dc8cf746679..ab1ba4e83a18 100644
--- a/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverDefaultProviderTest.java
+++ b/keyvault/data-plane/azure-keyvault-extensions/src/test/java/com/microsoft/azure/keyvault/extensions/test/KeyVaultKeyResolverDefaultProviderTest.java
@@ -24,8 +24,22 @@
 import com.microsoft.azure.keyvault.requests.SetSecretRequest;
 import com.microsoft.azure.keyvault.webkey.JsonWebKeyType;
 
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
+//
+//Copyright © Microsoft Corporation, All Rights Reserved
+//
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
+//OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
+//ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A
+//PARTICULAR PURPOSE, MERCHANTABILITY OR NON-INFRINGEMENT.
+//
+//See the Apache License, Version 2.0 for the specific language
+//governing permissions and limitations under the License.
 
 public class KeyVaultKeyResolverDefaultProviderTest extends KeyVaultClientIntegrationTestBase {
     

From 7262e411482286f9a917f95bf99a2ece70aa1cc8 Mon Sep 17 00:00:00 2001
From: vgera <vvinaygera@gmail.com>
Date: Thu, 31 Jan 2019 22:30:18 -0800
Subject: [PATCH 04/12] checkstlye and spotbugs config changes

---
 .../checkstyle/checkstyle-suppressions.xml    | 11 +++-
 .../azure-keyvault-cryptography/pom.xml       |  1 -
 pom.client.xml                                | 53 +++++++++++++++++--
 3 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml b/build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml
index 3bff1ca1f810..b0d02a85189a 100755
--- a/build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml
+++ b/build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -9,7 +9,14 @@
   <suppress checks="Javadoc" files=".*Test[s]?Base\.java"/>
   <suppress checks="Javadoc" files=".*CoverageReporter\.java"/>
   <suppress checks="Header" files=".*package-info.java"/>
-  <suppress checks="Header" files=".*package-info.java"/>
-  <suppress checks="Header" files=".*package-info.java"/>
+
+  <!-- Files licensed with alternate license in the header -->
+  <suppress checks="Header" files=".*AesKwBCProviderTest.java"/>
+  <suppress checks="Header" files=".*AesKwTest.java"/>
+  <suppress checks="Header" files=".*SymmetricKeyBCProviderTest.java"/>
+  <suppress checks="Header" files=".*SymmetricKeyTest.java"/>
+  <suppress checks="Header" files=".*CachingKeyResolverTest.java"/>
+  <suppress checks="Header" files=".*KeyVaultKeyResolverBCProviderTest.java"/>
+  <suppress checks="Header" files=".*KeyVaultKeyResolverDefaultProviderTest.java"/>
 
 </suppressions>
diff --git a/keyvault/data-plane/azure-keyvault-cryptography/pom.xml b/keyvault/data-plane/azure-keyvault-cryptography/pom.xml
index 0a8e98de64d1..ebe570e2b5f7 100644
--- a/keyvault/data-plane/azure-keyvault-cryptography/pom.xml
+++ b/keyvault/data-plane/azure-keyvault-cryptography/pom.xml
@@ -38,7 +38,6 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<legal>
             <![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-		<checkstyle.skip>true</checkstyle.skip>
 	</properties>
 
 
diff --git a/pom.client.xml b/pom.client.xml
index 8a037fd9bbff..ba716d45c158 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -113,6 +113,8 @@
       <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
       <maven-build-tools.version>1.0.0</maven-build-tools.version>
 
+      <spotbugs.version>3.1.11</spotbugs.version>
+      <xml-maven-plugin.version>1.0</xml-maven-plugin.version>
    </properties>
 
    <dependencyManagement>
@@ -222,14 +224,15 @@
 
    <build>
 
+      <!-- This plugin scans checkstyle issues in the code -->
       <plugins>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
             <dependencies>
                <dependency>
-                  <groupId>com.microsoft.azure</groupId>
-                  <artifactId>build-tools-azure</artifactId>
+                  <groupId>com.azure</groupId>
+                  <artifactId>sdk-build-tools</artifactId>
                   <version>${maven-build-tools.version}</version>
                </dependency>
             </dependencies>
@@ -257,13 +260,14 @@
             </executions>
          </plugin>
 
+         <!-- This plugin scans reports spotbugs  in the code -->
          <plugin>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-maven-plugin</artifactId>
             <dependencies>
                <dependency>
-                  <groupId>com.microsoft.azure</groupId>
-                  <artifactId>build-tools-azure</artifactId>
+                  <groupId>com.azure</groupId>
+                  <artifactId>sdk-build-tools</artifactId>
                   <version>${maven-build-tools.version}</version>
                </dependency>
             </dependencies>
@@ -287,6 +291,47 @@
             </executions>
          </plugin>
 
+         <!-- This plugin exports spotbugs reports in html form -->
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>xml-maven-plugin</artifactId>
+            <version>${xml-maven-plugin.version}</version>
+            <executions>
+               <execution>
+                  <phase>verify</phase>
+                  <goals>
+                     <goal>transform</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <configuration>
+               <transformationSets>
+                  <transformationSet>
+                     <dir>${project.build.directory}/spotbugs</dir>
+                     <outputDir>${project.build.directory}/spotbugs</outputDir>
+                     <stylesheet>fancy-hist.xsl</stylesheet>
+                     <!--<stylesheet>default.xsl</stylesheet>-->
+                     <!--<stylesheet>plain.xsl</stylesheet>-->
+                     <!--<stylesheet>fancy.xsl</stylesheet>-->
+                     <!--<stylesheet>summary.xsl</stylesheet>-->
+                     <fileMappers>
+                        <fileMapper
+                                implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+                           <targetExtension>.html</targetExtension>
+                        </fileMapper>
+                     </fileMappers>
+                  </transformationSet>
+               </transformationSets>
+            </configuration>
+            <dependencies>
+               <dependency>
+                  <groupId>com.github.spotbugs</groupId>
+                  <artifactId>spotbugs</artifactId>
+                  <version>${spotbugs.version}</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+
       </plugins>
 
       <pluginManagement>

From ee3b9b77443d58720befe48fb5cab4a73d4038ac Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Fri, 1 Feb 2019 14:32:59 -0500
Subject: [PATCH 05/12] parent pom update.

---
 pom.client.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.client.xml b/pom.client.xml
index ba716d45c158..97e3d36b086d 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -85,6 +85,7 @@
       <azure-client-runtime.version>1.3.0</azure-client-runtime.version>
       <client-runtime.version>1.6.1</client-runtime.version>
       <commons-codec.version>1.10</commons-codec.version>
+      <spotbugs.version>3.1.11</spotbugs.version>
 
       <!-- Test Dependency Versions -->
       <adal4j.version>1.4.0</adal4j.version>
@@ -112,8 +113,6 @@
       <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
       <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
       <maven-build-tools.version>1.0.0</maven-build-tools.version>
-
-      <spotbugs.version>3.1.11</spotbugs.version>
       <xml-maven-plugin.version>1.0</xml-maven-plugin.version>
    </properties>
 
@@ -554,5 +553,6 @@
    <modules>
       <module>./template/client</module>
       <module>./keyvault/data-plane</module>
+      <module>./build-tools</module>
    </modules>
 </project>
\ No newline at end of file

From e1ad8fbbb6fdef98ad7cf698aa139664ec11bd7b Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Sat, 2 Feb 2019 19:00:49 -0500
Subject: [PATCH 06/12] parent pom update.

---
 pom.client.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.client.xml b/pom.client.xml
index 97e3d36b086d..fb11a01301f1 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -553,6 +553,5 @@
    <modules>
       <module>./template/client</module>
       <module>./keyvault/data-plane</module>
-      <module>./build-tools</module>
    </modules>
 </project>
\ No newline at end of file

From 08ff0a255eaf66e826a6d988792e442f505bec41 Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Mon, 4 Feb 2019 22:52:49 -0500
Subject: [PATCH 07/12] spotbugs and javadoc aggregation.

---
 eng/spotbugs-reporting/pom.xml | 82 ++++++++++++++++++++++++++++++++++
 pom.client.xml                 | 61 ++++++++++++++++++++++++-
 2 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 eng/spotbugs-reporting/pom.xml

diff --git a/eng/spotbugs-reporting/pom.xml b/eng/spotbugs-reporting/pom.xml
new file mode 100644
index 000000000000..e03f4268c96c
--- /dev/null
+++ b/eng/spotbugs-reporting/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <parent>
+        <artifactId>azure-client-sdk-parent</artifactId>
+        <groupId>com.azure</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.client.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>spotbugs-reporting</artifactId>
+    <version>1.0.0</version>
+
+    <properties>
+        <azure-keyvault.version>1.2.0</azure-keyvault.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-keyvault</artifactId>
+            <version>${azure-keyvault.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-keyvault-cryptography</artifactId>
+            <version>${azure-keyvault.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-keyvault-core</artifactId>
+            <version>${azure-keyvault.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-keyvault-extensions</artifactId>
+            <version>${azure-keyvault.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-keyvault-complete</artifactId>
+            <version>${azure-keyvault.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-keyvault-webkey</artifactId>
+            <version>${azure-keyvault.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>..\keyvault\data-plane\azure-keyvault\src\main\java</source>
+                                <source>..\keyvault\data-plane\azure-keyvault-cryptography\src\main\java</source>
+                                <source>..\keyvault\data-plane\azure-keyvault-core\src\main\java</source>
+                                <source>..\keyvault\data-plane\azure-keyvault-webkey\src\main\java</source>
+                                <source>..\keyvault\data-plane\azure-keyvault-extensions\src\main\java</source>
+                                <source>..\keyvault\data-plane\azure-keyvault-complete\src\main\java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
\ No newline at end of file
diff --git a/pom.client.xml b/pom.client.xml
index fb11a01301f1..c02258f6bf3d 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -114,6 +114,8 @@
       <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
       <maven-build-tools.version>1.0.0</maven-build-tools.version>
       <xml-maven-plugin.version>1.0</xml-maven-plugin.version>
+      <maven-site-plugin.version>3.7.1</maven-site-plugin.version>
+      <maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
    </properties>
 
    <dependencyManagement>
@@ -259,7 +261,7 @@
             </executions>
          </plugin>
 
-         <!-- This plugin scans reports spotbugs  in the code -->
+         <!-- This plugin scans reports spotbugs in the code -->
          <plugin>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-maven-plugin</artifactId>
@@ -331,6 +333,39 @@
             </dependencies>
          </plugin>
 
+         <!-- This plugin scans javadoc issues in the project. -->
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+               <doctitle>Azure SDK for Java Reference Documentation</doctitle>
+               <windowtitle>Azure SDK for Java Reference Documentation</windowtitle>
+               <failOnError>true</failOnError>
+               <footer>Visit the &lt;a href="http://java.ms"&gt;Azure for Java Developers&lt;/a&gt; site for more Java documentation, including quick starts, tutorials, and code samples.</footer>
+               <linksource>false</linksource>
+               <excludePackageNames>
+               </excludePackageNames>
+               <groups>
+                  <group>
+                     <title>Azure Batch</title>
+                     <packages>com.microsoft.azure.batch*</packages>
+                  </group>
+                  <group>
+                     <title>Azure Key Vault</title>
+                     <packages>com.microsoft.azure.keyvault*</packages>
+                  </group>
+               </groups>
+            </configuration>
+            <executions>
+               <execution>
+                  <id>attach-javadocs</id>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+
       </plugins>
 
       <pluginManagement>
@@ -490,6 +525,20 @@
                <version>${maven-jar-plugin.version}</version>
             </plugin>
 
+            <!-- This plugin is used to generate project's site and reports -->
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-site-plugin</artifactId>
+               <version>${maven-site-plugin.version}</version>
+            </plugin>
+
+            <!-- This plugin is used to generate reports information about the project. -->
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-project-info-reports-plugin</artifactId>
+               <version>${maven-project-info-reports-plugin.version}</version>
+            </plugin>
+
          </plugins>
 
       </pluginManagement>
@@ -548,10 +597,20 @@
 
       </profile>
 
+      <profile>
+         <id>spotbugs-reporting</id>
+         <modules>
+            <module>./template/client</module>
+            <module>./keyvault/data-plane</module>
+            <module>./eng/spotbugs-reporting</module>
+         </modules>
+      </profile>
+
    </profiles>
 
    <modules>
       <module>./template/client</module>
       <module>./keyvault/data-plane</module>
    </modules>
+
 </project>
\ No newline at end of file

From 5447e1c1560ee5988dc55945531e41873ba5fedb Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Mon, 4 Feb 2019 23:15:45 -0500
Subject: [PATCH 08/12] build tools pom update.

---
 build-tools/pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index f98d8b42f296..c985d1766915 100755
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -11,6 +11,24 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jetty-maven-plugin.version>9.2.22.v20170606</jetty-maven-plugin.version>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>${jetty-maven-plugin.version}</version>
+                <configuration>
+                    <scanIntervalSeconds>0</scanIntervalSeconds>
+                    <stopPort>11079</stopPort>
+                    <stopKey>STOP</stopKey>
+                    <waitForChild>false</waitForChild>
+                    <jettyXml>./jetty.xml</jettyXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

From 0a0b6d14b956a43bd70e98c8451a6b4ea7f1aa1f Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Mon, 4 Feb 2019 23:37:47 -0500
Subject: [PATCH 09/12] adding build tools module to parent pom

---
 pom.client.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.client.xml b/pom.client.xml
index c02258f6bf3d..ae99a599d4df 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -611,6 +611,7 @@
    <modules>
       <module>./template/client</module>
       <module>./keyvault/data-plane</module>
+      <module>./build-tools</module>
    </modules>
 
 </project>
\ No newline at end of file

From 5d83f4af48767b369b6242aa55e54a228a485255 Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Tue, 5 Feb 2019 00:12:19 -0500
Subject: [PATCH 10/12] Adding clarification to build tools pom.

---
 build-tools/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index c985d1766915..991e8cb62504 100755
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -16,6 +16,7 @@
 
     <build>
         <plugins>
+            <!-- Adding this plugin to ensure jetty plugin runs without errors on pom.client.xml. -->
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>

From 18684d2609c8c81b021a4e5f16f051744378a2e4 Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Tue, 5 Feb 2019 16:52:06 -0500
Subject: [PATCH 11/12] dir refactor + pom updates.

---
 eng/README.md                                 |  3 +
 eng/code-quality-reports/README.md            |  4 +
 .../code-quality-reports}/pom.xml             |  0
 .../checkstyle/checkstyle-suppressions.xml    |  0
 .../main/resources/checkstyle/checkstyle.xml  |  0
 .../src/main/resources/checkstyle/java.header |  0
 .../resources/spotbugs/spotbugs-exclude.xml   |  0
 eng/spotbugs-aggregate-report/README.md       |  4 +
 eng/spotbugs-aggregate-report/pom.xml         | 76 +++++++++++++++++++
 pom.client.xml                                |  4 +-
 10 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 eng/README.md
 create mode 100644 eng/code-quality-reports/README.md
 rename {build-tools => eng/code-quality-reports}/pom.xml (100%)
 rename {build-tools => eng/code-quality-reports}/src/main/resources/checkstyle/checkstyle-suppressions.xml (100%)
 rename {build-tools => eng/code-quality-reports}/src/main/resources/checkstyle/checkstyle.xml (100%)
 rename {build-tools => eng/code-quality-reports}/src/main/resources/checkstyle/java.header (100%)
 rename {build-tools => eng/code-quality-reports}/src/main/resources/spotbugs/spotbugs-exclude.xml (100%)
 create mode 100644 eng/spotbugs-aggregate-report/README.md
 create mode 100644 eng/spotbugs-aggregate-report/pom.xml

diff --git a/eng/README.md b/eng/README.md
new file mode 100644
index 000000000000..17927d88e56a
--- /dev/null
+++ b/eng/README.md
@@ -0,0 +1,3 @@
+# Engineering Tools
+
+All the tools/utilities used in Microsoft Azure Java SDK's build config are defined here.
diff --git a/eng/code-quality-reports/README.md b/eng/code-quality-reports/README.md
new file mode 100644
index 000000000000..79ed73ad966b
--- /dev/null
+++ b/eng/code-quality-reports/README.md
@@ -0,0 +1,4 @@
+# Code Quality Reports
+
+This module defines/configures the rules for code quality analysis tools such as checkstyle and spotbugs.
+For more information refer to [Checkstyle](https://checkstyle.org/) and [Spotbugs](https://spotbugs.github.io/).
\ No newline at end of file
diff --git a/build-tools/pom.xml b/eng/code-quality-reports/pom.xml
similarity index 100%
rename from build-tools/pom.xml
rename to eng/code-quality-reports/pom.xml
diff --git a/build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
similarity index 100%
rename from build-tools/src/main/resources/checkstyle/checkstyle-suppressions.xml
rename to eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
diff --git a/build-tools/src/main/resources/checkstyle/checkstyle.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle.xml
similarity index 100%
rename from build-tools/src/main/resources/checkstyle/checkstyle.xml
rename to eng/code-quality-reports/src/main/resources/checkstyle/checkstyle.xml
diff --git a/build-tools/src/main/resources/checkstyle/java.header b/eng/code-quality-reports/src/main/resources/checkstyle/java.header
similarity index 100%
rename from build-tools/src/main/resources/checkstyle/java.header
rename to eng/code-quality-reports/src/main/resources/checkstyle/java.header
diff --git a/build-tools/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
similarity index 100%
rename from build-tools/src/main/resources/spotbugs/spotbugs-exclude.xml
rename to eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
diff --git a/eng/spotbugs-aggregate-report/README.md b/eng/spotbugs-aggregate-report/README.md
new file mode 100644
index 000000000000..7b2647b889a3
--- /dev/null
+++ b/eng/spotbugs-aggregate-report/README.md
@@ -0,0 +1,4 @@
+# Spotbugs Aggregate Report
+
+This module combines all the source code in the repo and generates an aggregated spotbugs report across all the projects in the repo.
+For more information refer to [Spotbugs](https://spotbugs.github.io/).
\ No newline at end of file
diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml
new file mode 100644
index 000000000000..590e8faf5e31
--- /dev/null
+++ b/eng/spotbugs-aggregate-report/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <parent>
+        <artifactId>azure-client-sdk-parent</artifactId>
+        <groupId>com.azure</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.client.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>spotbugs-reporting</artifactId>
+    <version>1.0.0</version>
+
+    <properties>
+        <azure-keyvault.version>1.2.0</azure-keyvault.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-keyvault</artifactId>
+            <version>${azure-keyvault.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-keyvault-cryptography</artifactId>
+            <version>${azure-keyvault.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-keyvault-core</artifactId>
+            <version>${azure-keyvault.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-keyvault-extensions</artifactId>
+            <version>${azure-keyvault.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-keyvault-webkey</artifactId>
+            <version>${azure-keyvault.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>..\..\keyvault\data-plane\azure-keyvault\src\main\java</source>
+                                <source>..\..\keyvault\data-plane\azure-keyvault-cryptography\src\main\java</source>
+                                <source>..\..\keyvault\data-plane\azure-keyvault-core\src\main\java</source>
+                                <source>..\..\keyvault\data-plane\azure-keyvault-webkey\src\main\java</source>
+                                <source>..\..\keyvault\data-plane\azure-keyvault-extensions\src\main\java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
\ No newline at end of file
diff --git a/pom.client.xml b/pom.client.xml
index ae99a599d4df..ccf2c3a08f35 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -602,7 +602,7 @@
          <modules>
             <module>./template/client</module>
             <module>./keyvault/data-plane</module>
-            <module>./eng/spotbugs-reporting</module>
+            <module>./eng/spotbugs-aggregate-report</module>
          </modules>
       </profile>
 
@@ -611,7 +611,7 @@
    <modules>
       <module>./template/client</module>
       <module>./keyvault/data-plane</module>
-      <module>./build-tools</module>
+      <module>./eng/code-quality-reports</module>
    </modules>
 
 </project>
\ No newline at end of file

From d63130fd3af230458afb7ba924420c48e0b99354 Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Tue, 5 Feb 2019 16:54:04 -0500
Subject: [PATCH 12/12] file removal.

---
 eng/spotbugs-reporting/pom.xml | 82 ----------------------------------
 1 file changed, 82 deletions(-)
 delete mode 100644 eng/spotbugs-reporting/pom.xml

diff --git a/eng/spotbugs-reporting/pom.xml b/eng/spotbugs-reporting/pom.xml
deleted file mode 100644
index e03f4268c96c..000000000000
--- a/eng/spotbugs-reporting/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>azure-client-sdk-parent</artifactId>
-        <groupId>com.azure</groupId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../pom.client.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>spotbugs-reporting</artifactId>
-    <version>1.0.0</version>
-
-    <properties>
-        <azure-keyvault.version>1.2.0</azure-keyvault.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-keyvault</artifactId>
-            <version>${azure-keyvault.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-keyvault-cryptography</artifactId>
-            <version>${azure-keyvault.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-keyvault-core</artifactId>
-            <version>${azure-keyvault.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-keyvault-extensions</artifactId>
-            <version>${azure-keyvault.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-keyvault-complete</artifactId>
-            <version>${azure-keyvault.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-keyvault-webkey</artifactId>
-            <version>${azure-keyvault.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>..\keyvault\data-plane\azure-keyvault\src\main\java</source>
-                                <source>..\keyvault\data-plane\azure-keyvault-cryptography\src\main\java</source>
-                                <source>..\keyvault\data-plane\azure-keyvault-core\src\main\java</source>
-                                <source>..\keyvault\data-plane\azure-keyvault-webkey\src\main\java</source>
-                                <source>..\keyvault\data-plane\azure-keyvault-extensions\src\main\java</source>
-                                <source>..\keyvault\data-plane\azure-keyvault-complete\src\main\java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
\ No newline at end of file