Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java …

…into TextAnalytics

eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml

@@ -500,7 +500,7 @@
       <Class name="com.azure.security.keyvault.certificates.models.IssuerProperties"/>
       <Class name="com.azure.security.keyvault.certificates.models.CertificateIssuer"/>
       <Class name="com.azure.security.keyvault.certificates.models.CertificatePolicy"/>
-      <Class name="com.azure.security.keyvault.certificates.models.LifeTimeAction"/>
+      <Class name="com.azure.security.keyvault.certificates.models.LifetimeAction"/>
       <Class name="com.azure.security.keyvault.certificates.models.CertificateOperation"/>
     </Or>
     <Bug pattern="UPM_UNCALLED_PRIVATE_METHOD"/>
@@ -558,7 +558,7 @@
   <Match>
     <Or>
       <Class name="~.*JavaDoc(CodeSnippets|CodeSamples|Samples)"/>
-      <Class name="com.azure.storage.blob.batch.ReadmeCodeSamples"/>
+      <Class name="~.*ReadmeSamples"/>
       <Class name="com.azure.storage.file.datalake.GetSetAccessControlExample"/>
     </Or>
     <Bug pattern="DLS_DEAD_LOCAL_STORE,

eng/jacoco-test-coverage/pom.xml

@@ -95,7 +95,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-security-keyvault-secrets</artifactId>
-      <version>4.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
+      <version>4.0.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

gulpfile.js → eng/mgmt/gulpfile.js

@@ -11,6 +11,7 @@ var ghPages = require('gulp-gh-pages');
 var argv = require('yargs').argv;
 var gulpif = require('gulp-if');
 var exec = require('child_process').exec;
+const xmlparser = require('fast-xml-parser');
 
 const mappings = require('./api-specs.json');
 const defaultSpecRoot = "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master";
@@ -55,6 +56,7 @@ gulp.task('default', function() {
 
 const maxParallelism = parseInt(args['parallel'], 10) || os.cpus().length;
 var specRoot = args['spec-root'] || defaultSpecRoot;
+var sdkRoot = path.join(process.cwd(), '../..')
 var projects = args['projects'];
 var autoRestVersion = 'preview'; // default
 if (args['autorest'] !== undefined) {
@@ -63,6 +65,7 @@ if (args['autorest'] !== undefined) {
 var debug = args['debug'];
 var autoRestArgs = args['autorest-args'] || '';
 var autoRestExe;
+const mgmtPomFilename = 'pom.mgmt.xml'
 
 gulp.task('codegen', function(cb) {
     if (autoRestVersion.match(/[0-9]+\.[0-9]+\.[0-9]+.*/) ||
@@ -99,7 +102,7 @@ var handleInput = function(projects, cb) {
 
 var codegen = function(project, cb) {
     if (!args['preserve']) {
-        deleteFolderRecursive(project);
+        deleteMgmtFolders(project);
     }
 
     console.log('Generating "' + project + '" from spec file ' + specRoot + '/' + mappings[project].source);
@@ -130,7 +133,7 @@ var codegen = function(project, cb) {
     cmd = autoRestExe + ' ' + specRoot + "/" + mappings[project].source +
                         ' --java ' +
                         ' --azure-arm ' +
-                        ' --azure-libraries-for-java-folder=' + process.cwd() + ' ' +
+                        ' --azure-libraries-for-java-folder=' + sdkRoot + ' ' +
                         ` --license-header=MICROSOFT_MIT_NO_CODEGEN ` +
                         generatorPath +
                         regenManager +
@@ -151,6 +154,31 @@ var codegen = function(project, cb) {
     return execa(cmd, [], { shell: true, stdio: "inherit" });
 };
 
+var deleteMgmtFolders = function(project) {
+    var modules = []
+
+    project = project.split('/')[0]
+    var projectRoot = path.join(sdkRoot, 'sdk', project);
+    var projectPom = path.join(projectRoot, mgmtPomFilename);
+    // find all modules from pom
+    if(fs.existsSync(projectPom)) {
+        var xml = fs.readFileSync(projectPom, {encoding: 'utf-8'});
+        var mods = xmlparser.parse(xml).project.modules.module
+        if (typeof mods === 'string') {
+            modules.push(mods);
+        } else {
+            modules = mods;
+        }
+    }
+
+    modules.forEach(function(mod, index) {
+        moduleDir = path.join(projectRoot, mod);
+        if(fs.lstatSync(moduleDir).isDirectory()) {
+            deleteFolderRecursive(moduleDir);
+        }
+    });
+}
+
 var deleteFolderRecursive = function(folder) {
     var header = "Code generated by Microsoft (R) AutoRest Code Generator";
     if(fs.existsSync(folder)) {

package.json → eng/mgmt/package.json

@@ -18,7 +18,8 @@
   "devDependencies": {
     "colors": "1.1.2",
     "execa": "^0.8.0",
-    "gulp": "^3.9.0",
+    "fast-xml-parser": "3.15.0",
+    "gulp": "^3.9.1",
     "gulp-exec": "2.1.2",
     "gulp-gh-pages": "^0.5.4",
     "gulp-if": "^2.0.0",

eng/pipelines/templates/jobs/archetype-sdk-client.yml

@@ -55,6 +55,21 @@ jobs:
         inputs:
           versionSpec: '3.6'
 
+      - template: tools/daily-dev-build-variable/daily-dev-build-variable.yml@azure-sdk-tools
+
+      - ${{ each artifact in parameters.Artifacts }}:
+        - script: |
+            python3 --version 
+            python3 eng/versioning/set_versions.py --update-type all --build-type client --build-qualifier dev.$(Build.BuildNumber) --artifact-id ${{artifact.name}}
+          condition: eq(variables['SetDevVersion'],'true')
+          displayName: Append dev package version suffix for ${{artifact.name}}
+      
+      - script: |
+          python3 --version
+          python3 eng/versioning/update_versions.py --update-type all --build-type client
+        condition: eq(variables['SetDevVersion'],'true')
+        displayName: Apply version settings to repository
+
       - script: |
           pip install markdown2 BeautifulSoup4
         displayName: 'pip install markdown2 and BeautifulSoup4'
@@ -73,7 +88,7 @@ jobs:
         inputs:
           mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
           goals: 'package'
-          options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dinclude-template -Dgenerate-overview' # We include template-module so we ensure it always builds in CI
+          options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview' # We include template-module so we ensure it always builds in CI
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaVersion)
@@ -95,6 +110,10 @@ jobs:
       vmImage: 'ubuntu-16.04'
 
     steps:
+      - pwsh: |
+          $(Build.SourcesDirectory)/eng/versioning/pom_file_version_scanner.ps1
+        displayName: "Verify versions in POM files"
+        
       - task: UsePythonVersion@0
         displayName: 'Use Python 3.6'
         inputs:

eng/pipelines/templates/stages/archetype-sdk-client.yml

@@ -8,6 +8,7 @@ stages:
     - template: ../jobs/archetype-sdk-client.yml
       parameters:
         ServiceDirectory: ${{parameters.ServiceDirectory}}
+        Artifacts: ${{parameters.Artifacts}}
 
   # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
   - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:

eng/spotbugs-aggregate-report/pom.xml

@@ -204,7 +204,7 @@
         <dependency>
           <groupId>com.azure</groupId>
           <artifactId>azure-security-keyvault-secrets</artifactId>
-          <version>4.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
+          <version>4.0.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
         </dependency>
         <dependency>
           <groupId>com.azure</groupId>

eng/versioning/external_dependencies.txt

@@ -16,7 +16,6 @@ com.microsoft.azure:azure-client-authentication;1.6.15
 com.microsoft.azure:azure-client-runtime;1.6.15
 com.microsoft.azure:azure-core;0.9.8
 com.microsoft.azure:azure-keyvault-cryptography;1.2.2
-com.microsoft.azure:azure-mgmt-keyvault;1.11.1
 com.microsoft.azure:client-runtime;1.6.15
 com.microsoft.azure:qpid-proton-j-extensions;1.2.1
 com.microsoft.azure:spotbugs-maven-plugin;1.2.1