Skip to content

Commit

Permalink
[Post-release-patch] Merge released library version and CHANGLOGs bac…
Browse files Browse the repository at this point in the history
…k to main for Part 1 libraries (#38871)
  • Loading branch information
mssfang authored Feb 22, 2024
1 parent a497752 commit a44ed28
Show file tree
Hide file tree
Showing 40 changed files with 294 additions and 70 deletions.
60 changes: 31 additions & 29 deletions eng/pipelines/templates/stages/archetype-sdk-client-patch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ parameters:
- name: JavaBuildVersion
type: string
default: $(JavaBuildVersion)
- name: JavadocSafeJavaBuildVersion
type: string
default: $(JavadocSafeJavaBuildVersion)
- name: TestPipeline
type: boolean
default: false


stages:
- stage: Build
jobs:
Expand All @@ -46,8 +48,8 @@ stages:
name: azsdk-pool-mms-ubuntu-2004-general

steps:
# Skip sparse checkout for the `azure-sdk-for-<lang>-pr` private mirrored repositories
# as we require the github service connection to be loaded.
# Skip sparse checkout for the `azure-sdk-for-<lang>-pr` private mirrored repositories as we require the GitHub
# service connection to be loaded.
- ${{ if not(contains(variables['Build.DefinitionName'], 'java-pr')) }}:
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
parameters:
Expand Down Expand Up @@ -103,8 +105,9 @@ stages:
displayName: 'pip install markdown2 and BeautifulSoup4'
# Save the Package Properties
# ServiceDirectories variable is a plain, comma separated list of ServiceDirectories that is
# output by the generate_from_source_pom script above.
#
# ServiceDirectories variable is a plain, comma separated list of ServiceDirectories that is output by the
# generate_from_source_pom script above.
- pwsh: |
$ServiceDirs = '$(ServiceDirectories)'
foreach($ServiceDir in $ServiceDirs.Split(',')) {
Expand All @@ -113,25 +116,24 @@ stages:
workingDirectory: $(Pipeline.Workspace)
displayName: "Save Package Properties"
# Why is this necessary? Normal build and release jobs don't install reporting tools prior
# to building however they're still able to find the the build tools through the root aggregate
# pom file. The ClientFromSourcePom only contains what is necessary for the list of libraries
# and needs to have them installed explicitly otherwise the checkstyle plugin will fail to find
# com.azure:sdk-build-tools which is a dependency. It does this in spite of the fact that we're
# not running actually running checkstyle, it loads it to skip it...well done.
# Why is this necessary? Normal build and release jobs don't install reporting tools prior to building however
# they're still able to find the build tools through the root aggregate pom file. The ClientFromSourcePom only
# contains what is necessary for the list of libraries and needs to have them installed explicitly otherwise the
# checkstyle plugin will fail to find com.azure:sdk-build-tools which is a dependency. It does this in spite of
# the fact that we're not running actually running checkstyle, it loads it to skip it...well done.
- template: ../steps/install-reporting-tools.yml
parameters:
JdkVersion: ${{ parameters.JavaBuildVersion }}

- task: Maven@3
displayName: 'Build From Source and Package, JDK Version: ${{ parameters.JavaBuildVersion }}'
displayName: 'Build From Source and Package, JDK Version: ${{ parameters.JavadocSafeJavaBuildVersion }}'
inputs:
mavenPomFile: ClientFromSourcePom.xml
goals: 'deploy'
options: '$(DefaultOptions) -T ${{parameters.BuildParallelization}} -DskipTests -Dgenerate-overview -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -pl $(ProjectList) -am -DaltDeploymentRepository=id::default::file://$(System.DefaultWorkingDirectory)/build' # We include template-module so we ensure it always builds in CI
options: '$(DefaultOptions) -T ${{parameters.BuildParallelization}} -DskipTests -Dgenerate-overview -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -Dspotless.apply.skip=true -pl $(ProjectList) -am -DaltDeploymentRepository=id::default::file://$(System.DefaultWorkingDirectory)/build' # We include template-module, so we ensure it always builds in CI.
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
javaHomeOption: 'JDKVersion'
jdkVersionOption: ${{ parameters.JavaBuildVersion }}
jdkVersionOption: ${{ parameters.JavadocSafeJavaBuildVersion }}
jdkArchitectureOption: 'x64'
publishJUnitResults: false

Expand Down Expand Up @@ -250,7 +252,7 @@ stages:
filePath: eng/versioning/pom_file_version_scanner.ps1
arguments: -Debug:$$(IsDebug)

# Do all the verifications for all the artifacts after the sparse-checkout
# Do all the verifications for all the artifacts after the sparse-checkout.
- pwsh: |
$ArtifactsList = $('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object name, groupId)
$ArtifactsList | Format-Table -Property GroupId, Name | Out-String | Write-Host
Expand All @@ -260,11 +262,12 @@ stages:
}
displayName: 'Verify artifact versions for release'
# Uber JARs release a flattened POM, as dependencies are incorporated into the JAR circumnavigating the
# need to list dependencies in the POM. The flattened POM is generated and won't comply with our versioning
# validation, so omit uberJars from the artifacts list to verify.
# Uber JARs release a flattened POM, as dependencies are incorporated into the JAR circumnavigating the need to
# list dependencies in the POM. The flattened POM is generated and won't comply with our versioning validation,
# so omit uberJars from the artifacts list to verify.
#
# Note: This is different from the Batch release verification step because the ServiceDirectory, for this
# pipeline, is attached to each Artifact. It needs to be in the query so it can be passed into the script
# pipeline, is attached to each Artifact. It needs to be in the query, so it can be passed into the script.
- pwsh: |
$ArtifactsList = $('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object name, groupId, ServiceDirectory, uberJar | Where-Object -Not "uberJar")
$ArtifactsList | Format-Table -Property GroupId, Name, ServiceDirectory | Out-String | Write-Host
Expand All @@ -275,8 +278,8 @@ stages:
- template: /eng/common/pipelines/templates/steps/verify-readme.yml
parameters:
# For the moment, ServiceDirectories is JSON which may change to a comma delimited list instead of
# what's going on below
# For the moment, ServiceDirectories is JSON which may change to a comma delimited list instead of what's
# going on below
ScanPaths: $(ServiceDirectoriesFullPath)

- template: /eng/common/pipelines/templates/steps/verify-samples.yml
Expand All @@ -289,25 +292,24 @@ stages:
SourceDirectory: $(Build.SourcesDirectory)
BasePathLength: 38

# Verify changelog, the way it currently works would
# require a complete overhaul in order to be able to deal with multiple artifacts and
# multiple service directories. Even ignoring this, there's still the fact that each artifact's
# metadata can cause this step to be skipped so we still need to loop over this.
# Verify changelog, the way it currently works would require a complete overhaul in order to be able to deal
# with multiple artifacts and multiple service directories. Even ignoring this, there's still the fact that each
# artifact's metadata can cause this step to be skipped, so we still need to loop over this.
- ${{if ne(parameters.SDKType, 'data')}}:
- ${{ each artifact in parameters.Artifacts }}:
- ${{if ne(artifact.skipVerifyChangelog, 'true')}}:
- template: /eng/common/pipelines/templates/steps/verify-changelog.yml
parameters:
PackageName: ${{artifact.name}}
ServiceName: ${{artifact.ServiceDirectory}}
# Note, for the patch release pipeline there's no point in verifying the non-release
# changelog since the only time this pipeline should run is for a patch release.
# Note: For the patch release pipeline there's no point in verifying the non-release changelog since
# the only time this pipeline should run is for a patch release.
ForRelease: true

- template: /eng/common/pipelines/templates/steps/eng-common-workflow-enforcer.yml

# This pipeline should never get kicked off outside of an internal, manual run. Put the checks here
# so the pipeline never gets to the signing/release portions unless this is the case.
# This pipeline should never get kicked off outside an internal, manual run. Put the checks here so the pipeline never
# gets to the signing/release portions unless this is the case.
- ${{if and(in(variables['Build.Reason'], 'Manual', ''), eq(variables['System.TeamProject'], 'internal'))}}:
- template: archetype-java-release-patch.yml
parameters:
Expand Down
42 changes: 21 additions & 21 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ com.azure:azure-ai-anomalydetector;3.0.0-beta.5;3.0.0-beta.6
com.azure:azure-ai-contentsafety;1.0.0;1.1.0-beta.1
com.azure:azure-ai-documentintelligence;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-ai-documenttranslator;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-ai-formrecognizer;4.1.4;4.2.0-beta.1
com.azure:azure-ai-formrecognizer;4.1.5;4.2.0-beta.1
com.azure:azure-ai-formrecognizer-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-ai-metricsadvisor;1.1.21;1.2.0-beta.1
com.azure:azure-ai-metricsadvisor;1.1.22;1.2.0-beta.1
com.azure:azure-ai-metricsadvisor-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-ai-openai;1.0.0-beta.6;1.0.0-beta.7
com.azure:azure-ai-openai-assistants;1.0.0-beta.2;1.0.0-beta.3
com.azure:azure-ai-personalizer;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-ai-textanalytics;5.4.2;5.5.0-beta.1
com.azure:azure-ai-textanalytics;5.4.3;5.5.0-beta.1
com.azure:azure-ai-textanalytics-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-ai-translation-text;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-analytics-defender-easm;1.0.0-beta.1;1.0.0-beta.2
Expand All @@ -66,18 +66,18 @@ com.azure:azure-aot-graalvm-support-netty;1.0.0-beta.3;1.0.0-beta.4
com.azure:azure-aot-graalvm-samples;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-aot-graalvm-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-code-customization-parent;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-communication-callautomation;1.1.1;1.2.0-beta.1
com.azure:azure-communication-callautomation;1.1.2;1.2.0-beta.1
com.azure:azure-communication-callingserver;1.0.0-beta.4;1.0.0-beta.5
com.azure:azure-communication-chat;1.4.0;1.5.0-beta.1
com.azure:azure-communication-chat;1.4.1;1.5.0-beta.1
com.azure:azure-communication-common;1.3.0;1.4.0-beta.1
com.azure:azure-communication-common-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-communication-email;1.0.9;1.1.0-beta.1
com.azure:azure-communication-identity;1.5.1;1.6.0-beta.1
com.azure:azure-communication-email;1.0.10;1.1.0-beta.1
com.azure:azure-communication-identity;1.5.2;1.6.0-beta.1
com.azure:azure-communication-jobrouter;1.1.0;1.1.1
com.azure:azure-communication-networktraversal;1.1.0-beta.2;1.1.0-beta.3
com.azure:azure-communication-phonenumbers;1.1.9;1.2.0-beta.1
com.azure:azure-communication-rooms;1.0.7;1.1.0-beta.2
com.azure:azure-communication-sms;1.1.20;1.2.0-beta.1
com.azure:azure-communication-rooms;1.0.8;1.1.0-beta.2
com.azure:azure-communication-sms;1.1.21;1.2.0-beta.1
com.azure:azure-containers-containerregistry;1.2.4;1.3.0-beta.1
com.azure:azure-containers-containerregistry-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-core;1.46.0;1.47.0-beta.1
Expand Down Expand Up @@ -111,16 +111,16 @@ com.azure:azure-cosmos-encryption;2.8.0;2.9.0-beta.1
com.azure:azure-cosmos-test;1.0.0-beta.6;1.0.0-beta.7
com.azure:azure-cosmos-tests;1.0.0-beta.1;1.0.0-beta.1
com.azure.cosmos.kafka:azure-cosmos-kafka-connect;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-data-appconfiguration;1.5.1;1.6.0-beta.1
com.azure:azure-data-appconfiguration;1.5.2;1.6.0-beta.1
com.azure:azure-data-appconfiguration-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-data-schemaregistry;1.4.2;1.5.0-beta.1
com.azure:azure-data-schemaregistry-apacheavro;1.1.13;1.2.0-beta.2
com.azure:azure-data-schemaregistry-jsonschema;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-data-tables;12.3.18;12.4.0-beta.1
com.azure:azure-data-tables;12.3.19;12.4.0-beta.1
com.azure:azure-data-tables-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-developer-devcenter;1.0.0-beta.3;1.0.0-beta.4
com.azure:azure-developer-loadtesting;1.0.9;1.1.0-beta.1
com.azure:azure-digitaltwins-core;1.3.16;1.4.0-beta.1
com.azure:azure-developer-loadtesting;1.0.10;1.1.0-beta.1
com.azure:azure-digitaltwins-core;1.3.17;1.4.0-beta.1
com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-health-insights-clinicalmatching;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-health-insights-cancerprofiling;1.0.0-beta.1;1.0.0-beta.2
Expand All @@ -130,7 +130,7 @@ com.azure:azure-identity-extensions;1.1.12;1.2.0-beta.2
com.azure:azure-identity-broker;1.0.2;1.1.0-beta.1
com.azure:azure-identity-broker-samples;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-iot-deviceupdate;1.0.14;1.1.0-beta.1
com.azure:azure-iot-deviceupdate;1.0.15;1.1.0-beta.1
com.azure:azure-iot-modelsrepository;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-json;1.1.0;1.2.0-beta.1
com.azure:azure-json-gson;1.0.0-beta.3;1.0.0-beta.4
Expand All @@ -156,21 +156,21 @@ com.azure:azure-messaging-servicebus;7.15.1;7.16.0-beta.1
com.azure:azure-messaging-servicebus-stress;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-servicebus-track1-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-servicebus-track2-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-webpubsub;1.2.11;1.3.0-beta.1
com.azure:azure-messaging-webpubsub;1.2.12;1.3.0-beta.1
com.azure:azure-messaging-webpubsub-client;1.0.0;1.1.0-beta.1
com.azure:azure-mixedreality-authentication;1.2.20;1.3.0-beta.1
com.azure:azure-mixedreality-remoterendering;1.1.25;1.2.0-beta.1
com.azure:azure-mixedreality-authentication;1.2.21;1.3.0-beta.1
com.azure:azure-mixedreality-remoterendering;1.1.26;1.2.0-beta.1
com.azure:azure-monitor-opentelemetry-exporter;1.0.0-beta.17;1.0.0-beta.18
com.azure:azure-monitor-ingestion;1.1.3;1.2.0-beta.1
com.azure:azure-monitor-ingestion;1.1.4;1.2.0-beta.1
com.azure:azure-monitor-ingestion-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-monitor-query;1.2.8;1.3.0-beta.3
com.azure:azure-monitor-query;1.2.9;1.3.0-beta.3
com.azure:azure-monitor-query-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-perf-test-parent;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-quantum-jobs;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-search-documents;11.6.1;11.7.0-beta.2
com.azure:azure-search-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-security-attestation;1.1.20;1.2.0-beta.1
com.azure:azure-security-confidentialledger;1.0.16;1.1.0-beta.1
com.azure:azure-security-attestation;1.1.21;1.2.0-beta.1
com.azure:azure-security-confidentialledger;1.0.17;1.1.0-beta.1
com.azure:azure-security-keyvault-administration;4.4.3;4.5.0-beta.2
com.azure:azure-security-keyvault-certificates;4.5.9;4.6.0-beta.2
com.azure:azure-security-keyvault-jca;2.8.1;2.9.0-beta.1
Expand Down
6 changes: 3 additions & 3 deletions sdk/aot/azure-aot-graalvm-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-data-appconfiguration</artifactId>
<version>1.5.1</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;dependency} -->
<version>1.5.2</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -103,12 +103,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-ai-formrecognizer</artifactId>
<version>4.1.4</version> <!-- {x-version-update;com.azure:azure-ai-formrecognizer;dependency} -->
<version>4.1.5</version> <!-- {x-version-update;com.azure:azure-ai-formrecognizer;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-ai-textanalytics</artifactId>
<version>5.4.2</version> <!-- {x-version-update;com.azure:azure-ai-textanalytics;dependency} -->
<version>5.4.3</version> <!-- {x-version-update;com.azure:azure-ai-textanalytics;dependency} -->
</dependency>


Expand Down
11 changes: 11 additions & 0 deletions sdk/appconfiguration/azure-data-appconfiguration/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@

### Other Changes

## 1.5.2 (2024-02-20)

### Other Changes

#### Dependency Updates

- Upgraded `azure-core-http-netty` from `1.13.11` to version `1.14.0`.
- Upgraded `azure-core` from `1.45.1` to version `1.46.0`.


## 1.5.1 (2023-12-04)

### Other Changes
Expand All @@ -19,6 +29,7 @@
- Upgraded `azure-core-http-netty` from `1.13.10` to version `1.13.11`.
- Upgraded `azure-core` from `1.45.0` to version `1.45.1`.


## 1.5.0 (2023-11-08)

### Features Added
Expand Down
21 changes: 20 additions & 1 deletion sdk/attestation/azure-security-attestation/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@

### Other Changes

## 1.1.21 (2024-02-20)

### Other Changes

#### Dependency Updates

- Upgraded `azure-core` from `1.45.1` to version `1.46.0`.


## 1.1.20 (2023-12-04)

### Other Changes
Expand All @@ -21,6 +30,7 @@

- Upgraded `azure-core` from `1.45.0` to version `1.45.1`.


## 1.1.19 (2023-11-20)

### Other Changes
Expand All @@ -29,13 +39,16 @@

- Upgraded `azure-core` from `1.44.1` to version `1.45.0`.


## 1.1.18 (2023-10-20)

### Other Changes

#### Dependency Updates

- Upgraded `azure-core` from `1.43.0` to version `1.44.1`.


## 1.1.17 (2023-09-22)

### Other Changes
Expand Down Expand Up @@ -66,7 +79,8 @@

#### Dependency Updates

- Upgraded `azure-core` from `1.38.0` to version `1.39.0`.
- Upgraded `azure-core` from `1.39.0` to version `1.40.0`.


## 1.1.13 (2023-05-23)

Expand All @@ -76,6 +90,7 @@

- Upgraded `azure-core` from `1.38.0` to version `1.39.0`.


## 1.1.12 (2023-04-21)

### Other Changes
Expand All @@ -85,6 +100,7 @@
- Upgraded `azure-core` from `1.37.0` to version `1.38.0`.
- Upgraded `nimbus-jose-jwt` from `9.22` to version `9.31`.


## 1.1.11 (2023-03-16)

### Other Changes
Expand All @@ -93,6 +109,7 @@

- Upgraded `azure-core` from `1.36.0` to version `1.37.0`.


## 1.1.10 (2023-02-16)

### Other Changes
Expand All @@ -101,6 +118,7 @@

- Upgraded `azure-core` from `1.35.0` to version `1.36.0`.


## 1.1.9 (2023-01-09)

### Other Changes
Expand All @@ -109,6 +127,7 @@

- Upgraded `azure-core` from `1.34.0` to version `1.35.0`.


## 1.1.8 (2022-11-10)

### Other Changes
Expand Down
Loading

0 comments on commit a44ed28

Please sign in to comment.