update

CONTRIBUTING.md

@@ -44,7 +44,7 @@ Merging Pull Requests (for project contributors with write access)
 
 ### Pre-requisites
 
-- Install Java Development Kit 8
+- Install Java Development Kit 8 or 11
   - add `JAVA_HOME` to environment variables
 - Install [Maven](http://maven.apache.org/download.cgi)
   - add `MAVEN_HOME` to environment variables
@@ -54,52 +54,11 @@ Merging Pull Requests (for project contributors with write access)
 `REG ADD HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t REG_DWORD /d 1`<br>*(might need to type `yes` to override key if it already exists)*<br><br>
 2.- Set up `git` by running:<br> `git config --system core.longpaths true`
 
-### Building and Testing
+### Building and Unit Testing
 
->**Note**: Build and test instructions have recently changed. The ```pom.client.xml``` file is no
-> longer in the root of the repository and should be not be used as an aggregator moving forward.
-
-This repository uses Maven to build the various modules that make up the Azure SDK for Java. You can build the entire set of modules by running the following command from the root of the repository:
-
-```
-mvn -Dgpg.skip clean install
-```
-
-This will build, test and install all of the modules into your local Maven cache. Optionally, you
-can also skip unit test execution by issuing the following command. This can be useful when you
-just want to try out a quick change without having to worry about unit tests.
-
-```
-mvn -Dgpg.skip -DskipTests clean install
-```
-
-If you only want to work on one module, you may opt to build just that module and its dependencies (e.g. com.azure:azure-messaging-eventhubs):
-
-```
-mvn -Dgpg.skip -DskipTests -pl com.azure:azure-messaging-eventhubs -am
-```
-
-The ```-pl``` switch takes a comma seperated list of fully qualified module names and the ```-am```
-switch tells Maven to _also make_ all of the dependencies within the repository that it depends on. If
-you are making changes across two modules you can tell Maven to build them both like this:
-
-```
-mvn -Dgpg.skip -DskipTests -pl com.azure:azure-messaging-eventhubs,com.azure:azure-core-amqp -am
-```
-
-Some parts of the SDK have multiple modules for a particular service, if you want to avoid typing
-in all those module names for the ```-pl``` switch you can just target the appropriate POM file
-(e.g. sdk/eventhubs/pom.xml) and execute the following command.
-
-```
-mvn -f sdk/eventhubs/pom.xml -Dgpg.skip clean install
-```
-
-Note that any dependencies for those modules will need to be in the Maven cache so will want to run
-the first command listed above once to get the cache primed with all the dependencies.
-
->**Note**: Refer to [wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Building) for learning about how to build using Java 11 
->and [this wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Unit-Testing) for guidelines on unit testing
+Refer to the [build wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Building) for learning how to build Java SDKs
+and the [unit testing wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Unit-Testing) for guidelines on unit 
+testing.
 
 ### Live testing
 

eng/pipelines/smoke-test.yml → common/smoke-tests/smoke-test.yml

@@ -1,5 +1,5 @@
 variables:
-  - template: ./templates/variables/globals.yml
+  - template: /eng/pipelines/templates/variables/globals.yml
   - name: PomFile
     value: common/smoke-tests/pom.xml
 

eng/common/TestResources/Remove-TestResources.ps1

@@ -124,7 +124,12 @@ if (![string]::IsNullOrWhiteSpace($ServiceDirectory)) {
     $preRemovalScript = Join-Path -Path $root -ChildPath 'remove-test-resources-pre.ps1'
     if (Test-Path $preRemovalScript) {
         Log "Invoking pre resource removal script '$preRemovalScript'"
-        &$preRemovalScript -ResourceGroupName $ResourceGroupName @PSBoundParameters
+
+        if (!$PSCmdlet.ParameterSetName.StartsWith('ResourceGroup')) {
+            $PSBoundParameters.Add('ResourceGroupName', $ResourceGroupName);
+        }
+
+        &$preRemovalScript @PSBoundParameters
     }
 }
 

eng/common/scripts/Submit-PullRequest.ps1

@@ -41,7 +41,7 @@ param(
   $PRBody = $PRTitle
 )
 
-Write-Host $MyInvocation.Line
+Write-Host "> $PSCommandPath $args"
 
 $query = "state=open&head=${PROwner}:${PRBranch}&base=${BaseBranch}"
 

eng/common/scripts/copy-docs-to-blobstorage.ps1

@@ -10,7 +10,7 @@ param (
   $UploadLatest=1
 )
 
-Write-Host $MyInvocation.Line
+Write-Host "> $PSCommandPath $args"
 
 $Language = $Language.ToLower()
 

eng/common/scripts/copy-readmes-to-docs.ps1

@@ -9,7 +9,9 @@ param (
   [String]$TargetServices
 )
 
-$PACKAGE_README_REGEX = ".*[\/\\]sdk[\\\/][^\/\\]+[\\\/][^\/\\]+[\/\\]README\.md" 
+Write-Host "> $PSCommandPath $args"
+
+$PACKAGE_README_REGEX = ".*[\/\\]sdk[\\\/][^\/\\]+[\\\/][^\/\\]+[\/\\]README\.md"
 
 Write-Host "repo is $CodeRepo"
 
@@ -52,10 +54,10 @@ else {
 
 foreach($service in $selectedServices){
   $readmePath = Join-Path -Path $CodeRepo  -ChildPath "sdk/$service"
-  Write-Host "Examining: $readmePath" 
+  Write-Host "Examining: $readmePath"
 
   $libraries = $metadataResponse | Where-Object { $_.RepoPath -eq $service }
-  
+
   foreach($library in $libraries){
 
     $package = $library.Package

eng/common/scripts/create-tags-and-git-release.ps1

@@ -18,7 +18,7 @@ param (
   [switch]$forceCreate = $false
 )
 
-Write-Host  $MyInvocation.Line
+Write-Host "> $PSCommandPath $args"
 
 $VERSION_REGEX = "(?<major>\d+)(\.(?<minor>\d+))?(\.(?<patch>\d+))?((?<pre>[^0-9][^\s]+))?"
 $SDIST_PACKAGE_REGEX = "^(?<package>.*)\-(?<versionstring>$VERSION_REGEX$)"

eng/common/scripts/git-branch-push.ps1

@@ -28,7 +28,7 @@ param(
     [string] $PushArgs = ""
 )
 
-Write-Host $MyInvocation.Line
+Write-Host "> $PSCommandPath $args"
 
 # This is necessay because of the janky git command output writing to stderr.
 # Without explicitly setting the ErrorActionPreference to continue the script

eng/jacoco-test-coverage/pom.xml

@@ -39,7 +39,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-ai-formrecognizer</artifactId>
-      <version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure:azure-ai-formrecognizer;current} -->
+      <version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure:azure-ai-formrecognizer;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.1.0-beta.4</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
+      <version>1.1.0-beta.5</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -119,12 +119,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs</artifactId>
-      <version>5.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
+      <version>5.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
-      <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
+      <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -175,7 +175,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-search-documents</artifactId>
-      <version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure:azure-search-documents;current} -->
+      <version>1.0.0-beta.4</version> <!-- {x-version-update;com.azure:azure-search-documents;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

eng/mgmt/api-specs.json

@@ -102,6 +102,10 @@
     "source": "specification/datamigration/resource-manager/readme.md",
     "args": "--multiapi --fluent"
   },
+  "datashare/resource-manager": {
+    "source": "specification/datashare/resource-manager/readme.md",
+    "args": "--multiapi --fluent"
+  },
   "devtestlabs/resource-manager" : {
     "source": "specification/devtestlabs/resource-manager/readme.md",
     "args": "--multiapi --fluent"
@@ -323,6 +327,10 @@
       "\"moduleName\"": "\"StreamAnalytics\""
     }
   },
+  "subscription/resource-manager": {
+    "source": "specification/subscription/resource-manager/readme.md",
+    "args": "--multiapi --fluent"
+  },
   "support/resource-manager": {
     "source": "specification/support/resource-manager/readme.md",
     "args": "--multiapi --fluent"

eng/versioning/external_dependencies.txt

@@ -69,7 +69,7 @@ org.springframework.security:spring-security-web;5.2.0.RELEASE
 org.springframework.security:spring-security-oauth2-client;5.2.0.RELEASE
 org.springframework.security:spring-security-oauth2-core;5.2.0.RELEASE
 org.springframework.security:spring-security-oauth2-jose;5.2.0.RELEASE
-org.springframework:spring-web;5.2.0.RELEASE
+org.springframework:spring-web;5.2.5.RELEASE
 pl.pragmatists:JUnitParams;1.1.1
 
 ## Test dependency versions

eng/versioning/pom_file_version_scanner.ps1

@@ -293,14 +293,13 @@ Get-ChildItem -Path $Path -Filter pom*.xml -Recurse -File | ForEach-Object {
         Write-Error-With-Color "Error: <dependencyManagement> is not allowed. Every dependency must have its own version and version update tag"
     }
 
+    $xmlNsManager = New-Object -TypeName "Xml.XmlNamespaceManager" -ArgumentList $xmlPomFile.NameTable
+    $xmlNsManager.AddNamespace("ns", $xmlPomFile.DocumentElement.NamespaceURI)
+
     # Ensure that the project has a version tag with the exception of projects under the eng directory which
     # aren't releasing libraries but still need to have their dependencies checked
     if ($pomFile.Split([IO.Path]::DirectorySeparatorChar) -notcontains "eng") 
     {
-
-        $xmlNsManager = New-Object -TypeName "Xml.XmlNamespaceManager" -ArgumentList $xmlPomFile.NameTable
-        $xmlNsManager.AddNamespace("ns", $xmlPomFile.DocumentElement.NamespaceURI)
-
         $versionNode = $xmlPomFile.SelectSingleNode("/ns:project/ns:version", $xmlNsManager)
         if ($xmlPomFile.project.version -and $versionNode)
         {

eng/versioning/scan_for_unreleased_dependencies.ps1

@@ -87,6 +87,21 @@ Get-ChildItem -Path $serviceDirectory -Filter pom*.xml -Recurse -File | ForEach-
                         Write-Error-With-Color "Error: Cannot release non-beta libraries with beta_ dependencies. dependency=$($versionUpdateTag)"
                     }
                     continue
+                } else {
+                    # If this is an external dependency then continue
+                    if ($versionUpdateTag -match "external_dependency}") {
+                        continue
+                    }
+                    # If this isn't an external dependency then ensure that if the dependency
+                    # version is beta, that we're releasing a beta, otherwise fail
+                    if ($versionNode.InnerText -like '*-beta.*') 
+                    {
+                        if (!$libraryIsBeta)
+                        {
+                            $script:FoundError = $true
+                            Write-Error-With-Color "Error: Cannot release non-beta libraries with beta dependencies. dependency=$($versionUpdateTag), version=$($versionNode.InnerText.Trim())"
+                        }
+                    }
                 }
             }
             else
@@ -106,8 +121,7 @@ if (-Not $script:FoundPomFile) {
     exit(1)
 }
 if ($script:FoundError) {
-    Write-Error-With-Color "Libaries with unreleased dependencies cannot be released."
     exit(1)
 }
 
-Write-Host "$($inputGroupId):$($inputArtifactId) looks goood to release" -ForegroundColor Green
+Write-Host "$($inputGroupId):$($inputArtifactId) looks good to release" -ForegroundColor Green

eng/versioning/version_client.txt

@@ -4,10 +4,10 @@
 com.azure:azure-sdk-all;1.0.0;1.0.0
 com.azure:azure-sdk-parent;1.6.0;1.6.0
 com.azure:azure-client-sdk-parent;1.7.0;1.7.0
-com.azure:azure-ai-formrecognizer;1.0.0-beta.1;1.0.0-beta.2
+com.azure:azure-ai-formrecognizer;1.0.0-beta.2;1.0.0-beta.3
 com.azure:azure-ai-textanalytics;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-core;1.5.0;1.6.0-beta.1
-com.azure:azure-core-amqp;1.1.0;1.2.0-beta.1
+com.azure:azure-core-amqp;1.1.2;1.2.0-beta.1
 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-core-http-netty;1.5.1;1.6.0-beta.1
 com.azure:azure-core-http-okhttp;1.2.2;1.3.0-beta.1
@@ -21,25 +21,25 @@ com.azure:azure-cosmos-examples;4.0.1-beta.1;4.0.1-beta.1
 com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1
 com.azure:azure-data-appconfiguration;1.1.1;1.2.0-beta.1
 com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-identity;1.0.5;1.1.0-beta.4
+com.azure:azure-identity;1.0.6;1.1.0-beta.5
 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-messaging-eventhubs;5.0.3;5.1.0-beta.1
-com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.3;1.1.0-beta.1
+com.azure:azure-messaging-eventhubs;5.1.0;5.2.0-beta.1
+com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.1.0;1.2.0-beta.1
 com.azure:azure-messaging-servicebus;7.0.0-beta.1;7.0.0-beta.2
-com.azure:azure-search-documents;1.0.0-beta.2;1.0.0-beta.3
+com.azure:azure-search-documents;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-security-keyvault-certificates;4.1.0-beta.2;4.1.0-beta.3
 com.azure:azure-security-keyvault-keys;4.2.0-beta.3;4.2.0-beta.4
 com.azure:azure-security-keyvault-secrets;4.2.0-beta.2;4.2.0-beta.3
 com.azure:azure-sdk-template;1.0.4-beta.12;1.0.4-beta.13
-com.azure:azure-storage-blob;12.6.0;12.7.0-beta.1
-com.azure:azure-storage-blob-batch;12.5.0;12.6.0-beta.1
-com.azure:azure-storage-blob-cryptography;12.6.0;12.7.0-beta.1
+com.azure:azure-storage-blob;12.6.1;12.7.0-beta.1
+com.azure:azure-storage-blob-batch;12.5.1;12.6.0-beta.1
+com.azure:azure-storage-blob-cryptography;12.6.1;12.7.0-beta.1
 com.azure:azure-storage-blob-nio;12.0.0-beta.1;12.0.0-beta.1
-com.azure:azure-storage-common;12.6.0;12.7.0-beta.1
-com.azure:azure-storage-file-share;12.4.0;12.5.0-beta.1
-com.azure:azure-storage-file-datalake;12.1.0;12.2.0-beta.1
+com.azure:azure-storage-common;12.6.1;12.7.0-beta.1
+com.azure:azure-storage-file-share;12.4.1;12.5.0-beta.1
+com.azure:azure-storage-file-datalake;12.1.1;12.2.0-beta.1
 com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-storage-queue;12.5.0;12.6.0-beta.1
+com.azure:azure-storage-queue;12.5.1;12.6.0-beta.1
 com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1
 
@@ -48,7 +48,6 @@ com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1
 # Format;
 # unreleased_<groupId>:<artifactId>;dependency-version
 # note: The unreleased dependencies will not be manipulated with the automatic PR creation code.
-unreleased_com.azure:azure-core-amqp;1.1.0
 
 # Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
 # version and set the version to the released beta. Released beta dependencies are only valid

sdk/appconfiguration/azure-data-appconfiguration/pom.xml

@@ -90,7 +90,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ApiManagementConfig.java

@@ -21,7 +21,7 @@ public final class ApiManagementConfig {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 

sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ArmIdWrapper.java

@@ -21,7 +21,7 @@ public final class ArmIdWrapper {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 }

sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ContainerInfo.java

@@ -184,7 +184,7 @@ public ContainerInfo withName(String name) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 

sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/HostingEnvironmentProfile.java

@@ -33,7 +33,7 @@ public final class HostingEnvironmentProfile {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 

sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/PrivateLinkResource.java

@@ -39,7 +39,7 @@ public final class PrivateLinkResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 

sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/SnapshotRecoverySource.java

@@ -57,7 +57,7 @@ public SnapshotRecoverySource withLocation(String location) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }