Update pipeline and version tooling to support clientcore

eng/pipelines/code-quality-reports.yml

@@ -5,6 +5,9 @@ parameters:
       - name: azure-core
         groupId: com.azure
         safeName: azurecore
+      - name: core
+        groupId: io.clientcore
+        safeName: core
 
 extends:
   template: /eng/pipelines/templates/stages/1es-redirect.yml

eng/pipelines/templates/jobs/ci.versions.tests.yml

@@ -73,7 +73,7 @@ jobs:
 
     steps:
       - pwsh: |
-          Write-Host "##vso[task.setvariable variable=AZURE_VERSION_OVERRIDE_TESTS]true"
+          Write-Host "##vso[task.setvariable variable=VERSION_OVERRIDE_TESTS]true"
           Write-Host "##vso[task.setvariable variable=TestVersionSupport]true"
         displayName: "Set version override variables"
 

eng/pipelines/templates/jobs/live.tests.yml

@@ -138,7 +138,7 @@ jobs:
           TestVersionSupport: ${{ parameters.TestVersionSupport }}
           TestEnvVars:
             AZURE_TEST_MODE: ${{ parameters.TestMode }}
-            AZURE_VERSION_OVERRIDE_TESTS: ${{ parameters.TestVersionSupport }}
+            VERSION_OVERRIDE_TESTS: ${{ parameters.TestVersionSupport }}
             ${{ each var in parameters.EnvVars }}:
               ${{ var.key }}: ${{ var.value }}
           UseFederatedAuth: ${{ parameters.UseFederatedAuth }}

eng/pipelines/templates/jobs/native.live.tests.yml

@@ -161,7 +161,7 @@ jobs:
           TestVersionSupport: ${{ parameters.TestVersionSupport }}
           TestEnvVars:
             AZURE_TEST_MODE: ${{ parameters.TestMode }}
-            AZURE_VERSION_OVERRIDE_TESTS: ${{ parameters.TestVersionSupport }}
+            VERSION_OVERRIDE_TESTS: ${{ parameters.TestVersionSupport }}
             ${{ each var in parameters.EnvVars }}:
               ${{ var.key }}: ${{ var.value }}
 

eng/pipelines/templates/steps/build-and-test.yml

@@ -61,7 +61,7 @@ steps:
       publishJUnitResults: false
       goals: 'install'
     env:
-      AZURE_VERSION_OVERRIDE_TESTS: ${{ parameters.TestVersionSupport }}
+      VERSION_OVERRIDE_TESTS: ${{ parameters.TestVersionSupport }}
     condition: and(succeeded(), ne(variables['TestFromSource'], 'true'), ne(variables['FirstTestOverrideRan'], 'true'))
 
   - task: PythonScript@0
@@ -83,7 +83,7 @@ steps:
       publishJUnitResults: false
       goals: 'clean install'
     env:
-      AZURE_VERSION_OVERRIDE_TESTS: ${{ parameters.TestVersionSupport }}
+      VERSION_OVERRIDE_TESTS: ${{ parameters.TestVersionSupport }}
     condition: and(succeeded(), eq(variables['TestVersionSupport'], 'true'))
 
   - ${{ parameters.PreTestRunSteps }}

eng/scripts/Remove-Azure-Artifacts-From-Cache.ps1

@@ -11,7 +11,7 @@ param(
 $StartTime = $(get-date)
 
 # Any new subdirectories to clean would be added here.
-$rootFolders = ("/com/azure", "/com/microsoft/azure")
+$rootFolders = ("/com/azure", "/com/microsoft/azure", "/io/clientcore")
 
 foreach ($rootFolder in $rootFolders) {
   # Determine the starting search path by joining the Maven cache folder with the specific Azure SDKs subpath.

eng/scripts/aggregate_javadoc_configuration.txt

@@ -50,6 +50,8 @@ Group;Azure Quantum Jobs;com.azure.quantum.jobs*
 Group;Azure Schema Registry;com.azure.data.schemaregistry*
 Group;Azure Search Documents;com.azure.search.documents*
 Group;Azure Security Attestation;com.azure.security.attestation*
+Group;Azure Serialization - JSON;com.azure.json*
+Group;Azure Serialization - XML;com.azure.xml*
 Group;Azure Service Bus;com.azure.messaging.servicebus*
 Group;Azure Storage - Common;com.azure.storage.common*
 Group;Azure Storage - Blobs;com.azure.storage.blob*
@@ -70,9 +72,9 @@ Group;Azure Web Pub Sub;com.azure.messaging.webpubsub*
 Link;https://docs.oracle.com/javase/8/docs/api/
 Link;https://projectreactor.io/docs/core/release/api/
 Link;https://projectreactor.io/docs/netty/release/api/
-Link;https://fasterxml.github.io/jackson-annotations/javadoc/2.13/
-Link;https://fasterxml.github.io/jackson-core/javadoc/2.13/
-Link;https://fasterxml.github.io/jackson-databind/javadoc/2.13/
+Link;https://fasterxml.github.io/jackson-annotations/javadoc/2.17/
+Link;https://fasterxml.github.io/jackson-core/javadoc/2.17/
+Link;https://fasterxml.github.io/jackson-databind/javadoc/2.17/
 Link;https://netty.io/4.1/api/
 Link;https://avro.apache.org/docs/current/api/java/
 

eng/scripts/generate_aggregate_pom.py

@@ -22,10 +22,10 @@
 from pom_helper import *
 
 # azure-client-sdk-parent valid parent POMs for Track 2 libraries.
-valid_parents = ['com.azure:azure-client-sdk-parent']
+valid_parents = ['com.azure:azure-client-sdk-parent', 'io.clientcore:clientcore-parent']
 
 # List of parent POMs that should be retained as projects to create POM.
-parent_pom_identifiers = ['com.azure:azure-sdk-parent', 'com.azure:azure-client-sdk-parent', 'com.azure:azure-perf-test-parent']
+parent_pom_identifiers = ['com.azure:azure-sdk-parent', 'com.azure:azure-client-sdk-parent', 'com.azure:azure-perf-test-parent', 'io.clientcore:clientcore-parent']
 
 include_groups = []
 
@@ -102,6 +102,7 @@ def create_aggregate_pom(project_list: str, groups: str, exclude_project_list: s
         include_groups.append('com.azure')
         include_groups.append('com.azure.spring')
         include_groups.append('com.azure.resourcemanager')
+        include_groups.append('io.clientcore')
     else:
         for group in groups.split(','):
             include_groups.append(group)
@@ -123,7 +124,7 @@ def create_aggregate_pom(project_list: str, groups: str, exclude_project_list: s
     projects = create_projects(project_list_identifiers, artifact_identifier_to_version)
 
     with open(file=client_aggregate_pom_path, mode='w') as aggregatePom:
-        aggregatePom.write(pom_file_start.format('azure-sdk-aggregate-report'))
+        aggregatePom.write(pom_file_start.format('sdk-aggregate-report'))
         aggregatePom.write(start_modules)
         dependencies = ''
 

eng/scripts/generate_from_source_pom.py

@@ -36,10 +36,10 @@
 
 # azure-client-sdk-parent, azure-perf-test-parent, spring-boot-starter-parent, and azure-spring-boot-test-parent are
 # valid parent POMs for Track 2 libraries.
-valid_parents = ['com.azure:azure-client-sdk-parent', 'com.azure:azure-perf-test-parent', 'org.springframework.boot:spring-boot-starter-parent', 'com.azure.spring:azure-spring-boot-test-parent', 'com.azure.cosmos.spark:azure-cosmos-spark_3_2-12']
+valid_parents = ['com.azure:azure-client-sdk-parent', 'com.azure:azure-perf-test-parent', 'org.springframework.boot:spring-boot-starter-parent', 'com.azure.spring:azure-spring-boot-test-parent', 'com.azure.cosmos.spark:azure-cosmos-spark_3_2-12', 'io.clientcore:clientcore-parent']
 
 # List of parent POMs that should be retained as projects to create a full from source POM.
-parent_pom_identifiers = ['com.azure:azure-sdk-parent', 'com.azure:azure-client-sdk-parent', 'com.azure:azure-perf-test-parent', 'com.azure.spring:azure-spring-boot-test-parent']
+parent_pom_identifiers = ['com.azure:azure-sdk-parent', 'com.azure:azure-client-sdk-parent', 'com.azure:azure-perf-test-parent', 'com.azure.spring:azure-spring-boot-test-parent', 'io.clientcore:clientcore-parent']
 
 # From this file get to the root path of the repo.
 root_path = os.path.normpath(os.path.abspath(__file__) + '/../../../')
@@ -315,6 +315,8 @@ def project_uses_client_parent(project: Project, projects: Dict[str, Project]) -
     while project.parent_pom is not None:
         if project.parent_pom == 'com.azure:azure-client-sdk-parent':
             return True
+        if project.parent_pom == 'io.clientcore:clientcore-parent':
+            return True
         project = projects.get(project.parent_pom, default_project)
 
     return False

eng/scripts/generatepatch.ps1

@@ -16,7 +16,7 @@ This script will do a number of things when ran:
 - It will update the changelog and readme to point to the new version.
 
 .PARAMETER ArtifactIds
-The artifact id. The script currently assumes groupId is com.azure
+The artifact id. The script currently assumes groupId is com.azure by default, set the GroupId parameter if the groupId is different.
 
 .PARAMETER ServiceDirectoryName
 Optional: The service directory that contains all the artifacts. If this is not provided the service directory is calculated from the first artifact.
@@ -29,6 +29,9 @@ the branch name is release/{ArtifactId}_{ReleaseVersion}. The script pushes the
 .PARAMETER PushToRemote
 Optional: Whether the commited changes should be pushed to the remote branch or not.The default value is false.
 
+.PARAMETER GroupId
+Optional: The groupId of the artifact. The default value is com.azure
+
 .EXAMPLE
 PS> ./eng/scripts/Generate-Patch.ps1 -ArtifactId azure-mixedreality-remoterendering
 This creates a remote branch "release/azure-mixedreality-remoterendering" with all the necessary changes.
@@ -40,7 +43,8 @@ You should make any additional changes to the change log to capture the changes
 param(
   [string[]]$ArtifactIds,
   [string]$ServiceDirectoryName,
-  [string]$BranchName
+  [string]$BranchName,
+  [string]$GroupId = 'com.azure'
 )
 
 $RepoRoot = Resolve-Path "${PSScriptRoot}..\..\.."
@@ -83,7 +87,7 @@ foreach ($artifactId in $ArtifactIds) {
     $patchInfo = [ArtifactPatchInfo]::new()
     $patchInfo.ArtifactId = $artifactId
     $patchInfo.ServiceDirectoryName = $ServiceDirectoryName
-    GeneratePatch -PatchInfo $patchInfo -BranchName $BranchName -RemoteName $RemoteName -GroupId "com.azure"
+    GeneratePatch -PatchInfo $patchInfo -BranchName $BranchName -RemoteName $RemoteName -GroupId $GroupId
     #TriggerPipeline -PatchInfos $patchInfo -BranchName $BranchName
 }
 

eng/scripts/syncversionclient.ps1

@@ -35,11 +35,11 @@ class EngSysVersionInfo{
     [String] $DependencyVersion
     [String] $CurrentVersion
 
-    EngSysVersionInfo($Name, $DependencyVersion, $CurrentVersion) {
+    EngSysVersionInfo($Name, $DependencyVersion, $CurrentVersion, $GroupId = 'com.azure') {
         $this.Name = $Name
         $this.DependencyVersion = $DependencyVersion
         $this.CurrentVersion = $CurrentVersion
-        $this.GroupId = 'com.azure'
+        $this.GroupId = $GroupId
     }
 }
 
@@ -54,7 +54,7 @@ function ParseVersionClientFile($GroudpId) {
             $dependencyVersion = $Matches.2
             $currentVersion = $Matches.3
 
-            $engSysVersionInfo = [EngSysVersionInfo]::new($artifactId, $dependencyVersion, $currentVersion)
+            $engSysVersionInfo = [EngSysVersionInfo]::new($artifactId, $dependencyVersion, $currentVersion, $GroudpId)
             $versionClientInfo[$artifactId] = $engSysVersionInfo
         }
     }
@@ -70,7 +70,7 @@ function SyncVersionClientFile([String]$GroupId) {
     foreach($artifactId in $artifactIds) {
         $artifactInfo = GetVersionInfoForAnArtifactId -ArtifactId $artifactId
         $latestPatchOrGaVersion = $ArtifactInfo.LatestGAOrPatchVersion
-        
+
         if([String]::IsNullOrWhiteSpace($latestPatchOrGaVersion)) {
             # This library does not have a released version so we are likely good here.
             continue
@@ -93,7 +93,7 @@ function SyncVersionClientFile([String]$GroupId) {
 
 # Don't call functions when the script is being dot sourced
 if ($MyInvocation.InvocationName -ne ".") {
-    SyncVersionClientFile -GroupId "com.azure"
+    SyncVersionClientFile -GroupId $GroupId
 }
 
 

eng/scripts/update-yml-triggers.ps1

@@ -14,7 +14,7 @@ This script will update all the path triggers for the ci.yml files based on our
  - all pom.xml files will be in the exclude list to help prevent triggering all pipelines whenever we only do version number changes.
 
 As a workaround to prevent every pipeline in the repo from
-triggering when we increment the verison of azure-core we are
+triggering when we increment the version of azure-core we are
 excluding pom.xml file only changes from triggering the other
 pipelines.
 

eng/versioning/pom_file_version_scanner.ps1

@@ -34,7 +34,7 @@ param()
 
 # Since we're skipping Management for the moment, only look for files with certain parents. These
 # limitations will vanish once Management track is updated.
-$ValidParents = ("azure-sdk-parent", "azure-client-sdk-parent", "azure-data-sdk-parent", "azure-perf-test-parent", "azure-cosmos-spark_3_2-12")
+$ValidParents = ("azure-sdk-parent", "azure-client-sdk-parent", "azure-data-sdk-parent", "azure-perf-test-parent", "azure-cosmos-spark_3_2-12", "io.clientcore:clientcore-parent")
 
 # SpringSampleParents is necessary for the spring samples which have to build using the spring-boot-starter-parent BOM.
 # The problem with this is, it's a BOM file and the spring dependencies are pulled in through that which means any
@@ -1008,4 +1008,4 @@ if ($script:FoundError)
     exit 1
 }
 # no errors, ensure it's exiting 0
-exit 0
+exit 0

eng/versioning/set_versions.py

@@ -46,7 +46,7 @@
 from utils import prerelease_version_regex_with_name
 
 # some things that should not be updated for devops builds, in the case where everything is being updated in one call
-items_we_should_not_update = ['com.azure:azure-sdk-all', 'com.azure:azure-sdk-parent', 'com.azure:azure-client-sdk-parent', 'com.azure:azure-data-sdk-parent', 'com.azure:azure-perf-test-parent', 'com.azure:azure-code-customization-parent']
+items_we_should_not_update = ['com.azure:azure-sdk-all', 'com.azure:azure-sdk-parent', 'com.azure:azure-client-sdk-parent', 'com.azure:azure-data-sdk-parent', 'com.azure:azure-perf-test-parent', 'com.azure:azure-code-customization-parent', 'io.clientcore:clientcore-parent']
 
 # The regex string we want should be the anchored one since the entire string is what's being matched
 version_regex_named = re.compile(version_regex_str_with_names_anchored)

eng/versioning/version_client.txt

@@ -483,6 +483,7 @@ io.clientcore:clientcore-parent;1.0.0-beta.1;1.0.0-beta.1
 io.clientcore:core;1.0.0-beta.1;1.0.0-beta.2
 io.clientcore:http-okhttp3;1.0.0-beta.1;1.0.0-beta.1
 io.clientcore:http-stress;1.0.0-beta.1;1.0.0-beta.1
+io.clientcore:optional-dependency-tests;1.0.0-beta.1;1.0.0-beta.1
 
 # Unreleased dependencies: Copy the entry from above, prepend "unreleased_" and remove the current
 # version. Unreleased dependencies are only valid for dependency versions.

sdk/clientcore/http-stress/pom.xml

@@ -127,20 +127,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <id>java12plus</id>
-      <activation>
-        <jdk>[12,)</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>io.clientcore</groupId>
-          <artifactId>http-jdk-httpclient</artifactId>
-          <version>1.0.0-beta.1</version> <!-- {x-version-update;io.clientcore:http-jdk-httpclient;dependency} -->
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
 </project>

sdk/clientcore/optional-dependency-tests/pom.xml

@@ -15,7 +15,7 @@
   <groupId>io.clientcore</groupId>
   <artifactId>optional-dependency-tests</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.0-beta.2</version> <!-- {x-version-update;io.clientcore:core;current} -->
+  <version>1.0.0-beta.1</version> <!-- {x-version-update;io.clientcore:optional-dependency-tests;current} -->
 
   <name>Java Core library tests for optional dependencies and features.</name>
   <description>Tests that validate optional dependencies and features of the Core library.</description>

sdk/parents/azure-client-sdk-parent/pom.xml

@@ -1701,7 +1701,7 @@
       <id>external-dependency-version-overrides</id>
       <activation>
         <property>
-          <name>env.AZURE_VERSION_OVERRIDE_TESTS</name>
+          <name>env.VERSION_OVERRIDE_TESTS</name>
         </property>
       </activation>
       <repositories>