Merge branch 'main' into release/identity-sdk-oct-2021

Azure · Oct 5, 2021 · 8175dc6 · 8175dc6
2 parents 73cfb70 + ebc71be
commit 8175dc6
Show file tree

Hide file tree

Showing 4,110 changed files with 191,115 additions and 100,174 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -6,7 +6,7 @@
 ###########
 
 # Catch all
-/sdk/                                               @joshfree @srnagar @anuchandy @conniey @jianghaolu @pallavit @lmolkova
+/sdk/                                               @joshfree @srnagar @anuchandy @conniey @pallavit @lmolkova @jonathangiles
 
 # BOM
 # PRLabel: %bom
@@ -37,13 +37,13 @@
 /sdk/communication/azure-communication-identity/    @petrsvihlik @martinbarnas-ms
 
 # PRLabel: %Container Registry
-/sdk/containerregistry/                             @pallavit @alzimmermsft @jianghaolu
+/sdk/containerregistry/                             @pallavit @alzimmermsft
 
 # PRLabel: %Azure.Core
-/sdk/core/                                          @alzimmermsft @jianghaolu @srnagar @anuchandy @lmolkova @pallavit @vcolin7 @mssfang
+/sdk/core/                                          @alzimmermsft @srnagar @anuchandy @lmolkova @pallavit @vcolin7 @mssfang @jonathangiles
 
 # PRLabel: %Azure.Core.AMQP
-/sdk/core/azure-core-amqp/                          @conniey @anuchandy @ki1729 @srnagar
+/sdk/core/azure-core-amqp/                          @conniey @anuchandy @ki1729 @srnagar @jonathangiles
 
 # PRLabel: %Azure.Core
 /sdk/core/azure-core-tracing-opentelemetry/         @samvaity @alzimmermsft @trask @lmolkova
@@ -56,13 +56,13 @@
 /sdk/cosmos/azure-spring-data-cosmos-test/          @kushagraThapar @mbhaskar @saragluna @yiliuTo @chenrujun @backwind1233 @stliu @ZhuXiaoBing-cn @zhichengliu12581 @moarychan @michaelqi793
 
 # PRLabel: %Digital Twins
-/sdk/digitaltwins/                                  @drwill-ms @timtay-microsoft @abhipsaMisra @azabbasi
+/sdk/digitaltwins/                                  @drwill-ms @azabbasi @johngallardo
 
 # PRLabel: %Models Repository
-/sdk/modelsrepository                               @drwill-ms @timtay-microsoft @abhipsaMisra @azabbasi @digimaun
+/sdk/modelsrepository                               @drwill-ms @timtay-microsoft @abhipsaMisra @azabbasi @digimaun @andykwong-ms
 
 # PRLabel: %Event Grid
-/sdk/eventgrid/                                     @srnagar @lmolkova
+/sdk/eventgrid/                                     @srnagar @lmolkova @mssfang
 
 # PRLabel: %Event Hubs
 /sdk/eventhubs/                                     @conniey @anuchandy @ki1729 @srnagar
@@ -83,7 +83,7 @@
 /sdk/metricsadvisor/                                @samvaity @anuchandy
 
 # PRLabel: %Azure.Identity
-/sdk/identity/                                      @g2vinay @schaabs @jianghaolu
+/sdk/identity/                                      @g2vinay @schaabs @joshfree
 
 # PRLabel: %KeyVault
 /sdk/keyvault/                                      @vcolin7 @g2vinay @samvaity
@@ -133,13 +133,12 @@
 
 # end to end tests
 # PRLabel: %Azure.Identity
-/sdk/e2e/                                           @jianghaolu @g2vinay
+/sdk/e2e/                                           @g2vinay @joshfree @alzimmermsft
 /common/smoke-tests/                                @joshfree @jonathangiles @alzimmermsft @g2vinay @conniey @srnagar
 
 # Management Plane
-/sdk/resourcemanager/                               @ChenTanyi @weidongxu-microsoft @yungezz @qwordy @haolingdong-msft
-/sdk/**/azure-resourcemanager-*                     @ChenTanyi @weidongxu-microsoft @yungezz @qwordy @haolingdong-msft
-/sdk/**/mgmt*/                                      @weidongxu-microsoft @yungezz
+/sdk/resourcemanager/                               @weidongxu-microsoft @qwordy @haolingdong-msft
+/sdk/**/azure-resourcemanager-*                     @weidongxu-microsoft @qwordy @haolingdong-msft
 
 # Quantum
 # PRLabel: %Azure Quantum
@@ -148,18 +147,18 @@
 ###########
 # Eng Sys
 ###########
-/eng/                                               @benbp @weshaggard @danieljurek
+/eng/                                               @hallipr @weshaggard
 /eng/code-quality-reports/                          @mssfang @JonathanGiles
 /eng/jacoco-test-coverage/                          @srnagar @JonathanGiles
 /eng/spotbugs-aggregate-report/                     @srnagar @JonathanGiles
-/eng/mgmt/                                          @benbp @weshaggard @danieljurek @ChenTanyi @weidongxu-microsoft @yungezz
-/eng/versioning/                                    @benbp @danieljurek @alzimmermsft @samvaity @g2vinay
-/eng/versioning/external_dependencies.txt           @benbp @danieljurek @alzimmermsft @samvaity @g2vinay @saragluna @yiliuTo @chenrujun @backwind1233 @stliu @ZhuXiaoBing-cn @zhichengliu12581 @moarychan @michaelqi793
-/eng/bomgenerator                                   @pallavit @alzimmermsft @srnagar
+/eng/mgmt/                                          @weidongxu-microsoft @haolingdong-msft @hallipr @weshaggard
+/eng/versioning/                                    @alzimmermsft @samvaity @g2vinay
+/eng/versioning/external_dependencies.txt           @alzimmermsft @samvaity @g2vinay @saragluna @yiliuTo @chenrujun @backwind1233 @stliu @ZhuXiaoBing-cn @zhichengliu12581 @moarychan @michaelqi793 @jonathangiles
+/eng/bomgenerator                                   @pallavit @alzimmermsft @srnagar @jonathangiles
 /parent/                                            @alzimmermsft
 
-/**/tests.yml                                       @benbp
-/**/ci.yml                                          @benbp
+/**/tests.yml                                       @hallipr
+/**/ci.yml                                          @hallipr
 
 # Add owners for notifications for specific pipelines
-/eng/pipelines/aggregate-reports.yml                @joshfree
+/eng/pipelines/aggregate-reports.yml                @joshfree @jonathangiles
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -34,7 +34,7 @@ If applicable, add screenshots to help explain your problem.
  - Frameworks: [e.g. Spring Boot, Micronaut, Quarkus, etc] 
 
 If you suspect a dependency version mismatch (e.g. you see `NoClassDefFoundError`, `NoSuchMethodError` or similar), please provide
-- dependency tree (`mvn dependency:tree -Dverbose`)
+- verbose dependency tree (`mvn dependency:tree -Dverbose`)
 
 **Additional context**
 Add any other context about the problem here.

diff --git a/common/perf-test-core/pom.xml b/common/perf-test-core/pom.xml
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>4.2.0</version> <!-- {x-version-update;com.github.spotbugs:spotbugs-maven-plugin;external_dependency} -->
+        <version>4.2.2</version> <!-- {x-version-update;com.github.spotbugs:spotbugs-maven-plugin;external_dependency} -->
         <configuration>
           <failOnError>false</failOnError>
         </configuration>
@@ -55,12 +55,12 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.fasterxml.jackson.core:jackson-databind:[2.12.4]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
+                <include>com.fasterxml.jackson.core:jackson-databind:[2.12.5]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
 
                 <!-- special allowance for perf-test-core as it is not a shipping library: -->
                 <include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
 
-                <include>io.projectreactor:reactor-core:[3.4.9]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
+                <include>io.projectreactor:reactor-core:[3.4.10]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.12.4</version>  <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
+      <version>2.12.5</version>  <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
+      <version>1.11.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
     </dependency>
   </dependencies>
 </project>
diff --git a/common/smoke-tests/pom.xml b/common/smoke-tests/pom.xml
@@ -53,9 +53,9 @@
     </profile>
 
     <profile>
-      <id>java-lts</id>
+      <id>java9plus</id>
       <activation>
-        <jdk>[11,)</jdk>
+        <jdk>[9,)</jdk>
       </activation>
       <build>
         <plugins>
@@ -64,8 +64,8 @@
             <artifactId>maven-compiler-plugin</artifactId>
             <version>3.8.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
             <configuration>
-              <source>11</source>
-              <target>11</target>
+              <source>${java.version}</source>
+              <target>${java.version}</target>
               <showWarnings>true</showWarnings>
               <showDeprecation>true</showDeprecation>
               <compilerArgument>-Xlint:all</compilerArgument>
@@ -88,25 +88,25 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
+      <version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
+      <version>1.11.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-tracing-opentelemetry</artifactId>
-      <version>1.0.0-beta.14</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
+      <version>1.0.0-beta.15</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-okhttp</artifactId>
-      <version>1.7.3</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
+      <version>1.7.4</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
     </dependency>
 
     <dependency>
@@ -118,37 +118,37 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.18.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
+      <version>4.19.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.3.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.3.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-security-keyvault-secrets</artifactId>
-      <version>4.3.2</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
+      <version>4.3.3</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs</artifactId>
-      <version>5.10.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
+      <version>5.10.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
-      <version>1.9.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
+      <version>1.10.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.13.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
+      <version>12.14.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
     </dependency>
 
     <dependency>

diff --git a/eng/bomgenerator/generateAzureSDKBOM.cmd b/eng/bomgenerator/generateAzureSDKBOM.cmd
diff --git a/eng/bomgenerator/generateAzureSDKBOM.ps1 b/eng/bomgenerator/generateAzureSDKBOM.ps1
@@ -0,0 +1,28 @@
+$repoRoot = Resolve-Path "${PSScriptRoot}..\..\.."
+$inputDir = Join-Path ${PSScriptRoot} "inputDir"
+$outputDir = Join-Path ${PSScriptRoot} "outputDir"
+$versionClientFileName = "version_client.txt"
+$pomFileName = "pom.xml"
+$defaultVersionClientFilePath = Join-Path $inputDir $versionClientFileName
+$defaultPomFilePath = Join-Path $inputDir $pomFileName
+$versionClientFilePath = Join-Path $repoRoot "eng" "versioning" $versionClientFileName
+$bomPomFilePath = Join-Path $repoRoot "sdk" "containerregistry" "azure-containers-containerregistry" $pomFileName
+
+if(! (Test-Path $inputDir)) { 
+  New-Item -Path $PSScriptRoot -Name "inputDir" -ItemType "directory"
+}
+
+if(! (Test-Path $defaultVersionClientFilePath)) {
+ Copy-Item $versionClientFilePath -Destination $inputDir
+}
+
+if(! (Test-Path $defaultPomFilePath)) {
+ Copy-Item $bomPomFilePath -Destination $inputDir
+}
+
+
+"mvn exec:java -Dexec.args='-inputDir=$inputDir -outputDir=$outputDir -mode=analyze'"
+if($LASTEXITCODE -ne 0) {
+  LogError "Failed to generate the BOM."
+  exit 1
+}
diff --git a/eng/bomgenerator/pom.xml b/eng/bomgenerator/pom.xml
@@ -39,6 +39,11 @@
       <artifactId>slf4j-log4j12</artifactId>
       <version>1.7.5</version>  <!-- {x-version-update;org.slf4j:slf4j-log4j12;external_dependency} -->
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
+      <version>2.12.4</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
+    </dependency>
   </dependencies>
   <build>
   <resources>
@@ -69,10 +74,8 @@
           <workingDirectory>${project.basedir}</workingDirectory>
           <mainClass>com.azure.tools.bomgenerator.Main</mainClass>
           <arguments>
-            <argument>-inputFile=${project.basedir}/../versioning/version_client.txt</argument>
-            <argument>-outputFile=${project.basedir}/target/newbom.xml</argument>
-            <argument>-pomFile=${project.basedir}/../../sdk/boms/azure-sdk-bom/pom.xml</argument>
-            <argument>-reportFile=${project.basedir}/target/dependency_conflictlist.html</argument>
+            <argument>-inputdir=${project.basedir}/inputdir</argument>
+            <argument>-outputdir=${project.basedir}/outputdir</argument>
           </arguments>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
         </configuration>

diff --git a/eng/bomgenerator/readme.md b/eng/bomgenerator/readme.md
@@ -3,7 +3,18 @@ This tool generates a BOM from a given set of input dependencies.
 This tool has 2 modes
 1. Generate mode - When run in this mode the tool generates the BOM. This is also the default mode.
 Arguments to run the tool in this mode.
-        -inputFile=<location_of_versionClient.txt> -outputFile=<location_of_new_bomFile> -pomFile=<location_of_current_bomFile> -inputdependenciesfile=<optional_file_to_override_input_dependencies>
+        -inputDir=<location_of_input_directory>
+		 This includes the following files.
+		 1. Version_client.txt file 
+		 2. The BOM file which is the initial POM file.
+		 3. InputDependencies file to override the inputs from the version_client.txt. This is an optional file.
+
+        -outputDir=<location_of_outputput_directory>
+        This generates the followibg files in the location.
+		1. Report log.
+		2. Newly created BOM file
+
 2. Analyze mode - When run in this mode the tool validates the BOM. 
 Arguments to run the tool in this mode.
-        -mode=analyze -pomFile=<location_of_bomFile>
+        -mode=analyze -inputDir=<location_to_inputDir)>
+		This location includes the pom file for the BOM or any library.