Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Spring December release branch to main #26352

Merged
merged 21 commits into from
Jan 11, 2022
Merged

Merge Spring December release branch to main #26352

merged 21 commits into from
Jan 11, 2022

Conversation

yiliuTo
Copy link
Member

@yiliuTo yiliuTo commented Jan 7, 2022

As subject.

yiliuTo and others added 14 commits December 24, 2021 15:15
@yiliuTo
add java doc (#26173)
4528239
@yiliuTo
Udpate spring appconfig libraries for Dec release (#26165)
ad6cacb
@yiliuTo
remove empty headers (#26178)
e36f12b
@azure-sdk
Increment version for spring releases (#26179)
aa968b5 
Increment package version after release of com.azure.spring azure-spring-cloud-context
@azure-sdk
Increment version for spring releases (#26183)
15be3a4 
Increment package version after release of com.azure.spring azure-spring-integration-core
@yiliuTo
udpate jca changelog for release (#26181)
2b2a378
@azure-sdk
Increment version for keyvault releases (#26185)
450490d 
Increment package version after release of com.azure azure-security-keyvault-jca
@azure-sdk
Increment version for spring releases (#26177)
f9dede5
@azure-sdk
Increment version for spring releases (#26184)
e57efb3
@yiliuTo
prepare release for azure-spring-boot-bom (#26208)
b28642b
@yiliuTo
Prepare app config release (#26311)
eda0f00
@azure-sdk
Increment version for appconfiguration releases (#26317)
1b2ad9a 
Increment package version after release of com.azure.spring azure-spring-cloud-feature-management
@azure-sdk
Increment version for appconfiguration releases (#26320)
c27e396
@yiliuTo
Prepare bom relesae (#26349)
6b0e665
@yiliuTo yiliuTo requested review from stliu and vcolin7 as code owners January 7, 2022 03:21
@ghost ghost added azure-spring All azure-spring related issues App Configuration Azure.ApplicationModel.Configuration KeyVault labels Jan 7, 2022
saragluna
saragluna approved these changes Jan 7, 2022
View reviewed changes
Copy link
Member

@saragluna saragluna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@yiliuTo
Copy link
Member Author

yiliuTo commented Jan 10, 2022

/azp run java - keyvault - ci

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yiliuTo
Copy link
Member Author

yiliuTo commented Jan 10, 2022

cc @alzimmermsft and @srnagar , due to pr #26331 , the compilation of source code is now skipped in the stage of Run SpotBugs, Checkstyle, RevApi, and Javadoc, and it causes that the maven shade plugin uses the source jar built in the last job to shade external libraries' code into, which has already get shaded, thus we will get the error of https://dev.azure.com/azure-sdk/public/_build/results?buildId=1283989&view=logs&j=b70e5e73-bbb6-5567-0939-8415943fadb9&t=ba3cf43a-b2bf-50f9-f95f-93049ca44ad1.

To fix it, we want to modify the pipeline parameter of Run SpotBugs, Checkstyle, RevApi, and Javadoc by adding a parameter to disable the maven-shade-plugin for keyvault ci, and for other pipelines, that value is blank by default.

@alzimmermsft
Copy link
Member

Thank you for submitting the fix! I'm wondering if longer term the step should be updated to be similar to the testing step where it targets specific plugins instead of the lifecycle phase (surefire:test vs test and checkstyle:check spotbugs:check ... vs verify). It'll mean more maintenance for the pipeline jobs when we add new functionality (fairly rare) but will ensure consistence in jobs when new functionality is added (adding a new plugin won't result in additional work running).

@srnagar - what are your thoughts?

@yiliuTo
Copy link
Member Author

yiliuTo commented Jan 11, 2022

/check-enforcer override

@yiliuTo yiliuTo merged commit 8438ec9 into main Jan 11, 2022
@yiliuTo yiliuTo deleted the release/spring-dec branch January 11, 2022 02:19
samvaity pushed a commit to samvaity/azure-sdk-for-java that referenced this pull request Jan 11, 2022
@yiliuTo @samvaity
Merge Spring December release branch to main (Azure#26352)
5b4f231
samvaity pushed a commit to samvaity/azure-sdk-for-java that referenced this pull request Jan 11, 2022
@yiliuTo @samvaity
Merge Spring December release branch to main (Azure#26352)
c75b5b4
azure-sdk pushed a commit to azure-sdk/azure-sdk-for-java that referenced this pull request Nov 9, 2023
@zhenqxuMSFT @yalixiang
@pauld-msft @michaelkira @bgashirabake @harryli0108 @berndverst @ahmelsayed @halspang @LaylaLiu-gmail @michimune @yash-nisar @Seris370
CodeGen from PR 26352 in Azure/azure-rest-api-specs
d0f778f 
Release app microsoft.app 2023 08 01 preview (Azure#26352)

* Adds base for updating Microsoft.App from version preview/2023-05-02-preview to version 2023-08-01-preview

* Updates readme

* Updates API version in new specs and examples

* Add type to Certificate (Azure#25380)

* Add type to Certificate

* lint

* Add gpus property to AvailableWorkloadProfiles. (Azure#25328)

* Add gpus property to AvailableWorkloadProfiles.

* Fix.

* Pauld/re add build and builder (Azure#25442)

* cherry picked the build and builder updates

* some more cleanup

* added arm id format, removed extra properties, and named the resource provisioning states

* Add OT and AI config (Azure#25350)

* Add OT and AI config

* resolve comments

* Add service bind properties to dapr component (Azure#25781)

* dapr component sb-bind definition add

* fix

* ran npx prettier

* npx prettier

---------

Co-authored-by: bgashirabake@gmail.com <bgashirabake@microsoft.com>

* Adding patching scenario ARM API (Azure#25446)

* cherry picked the build and builder updates

* some more cleanup

* Adding patching scenario and samples

* Added to readme

* Lint fix

* Linting

* Linting error fix

* Addressed comments and added extra properties

* Linting

* Fixing patch skip post action

* Linting

* Addressing comments

* Reverting patchDetails changes

* Fixing pipeline error

* Linting

* Removed invalid required tag

* Fixed examples

* Addressed comments

---------

Co-authored-by: Paul Dorsch <107068277+pauld-msft@users.noreply.github.com>
Co-authored-by: Paul Dorsch <pauldorsch@microsoft.com>

* Update microsoft.app 2023-08-01-preview for new DaprSubscription API feature (Azure#25631)

* ACA Dapr Subscription: WIP

Signed-off-by: Bernd Verst <github@bernd.dev>

* Add Dapr Subscription examples

Signed-off-by: Bernd Verst <github@bernd.dev>

* complete examples

Signed-off-by: Bernd Verst <github@bernd.dev>

* Add DaprSubscription descriptions

Signed-off-by: Bernd Verst <github@bernd.dev>

* include updated readme

Signed-off-by: Bernd Verst <github@bernd.dev>

* fix casing

Signed-off-by: Bernd Verst <github@bernd.dev>

* formatting

Signed-off-by: Bernd Verst <github@bernd.dev>

* Use Types v5

Signed-off-by: Bernd Verst <github@bernd.dev>

* Revert "Use Types v5"

v5 causes several mysterious SDK build errors in this branch on this PR. To avoid this error we will stick to v3 for now. We will upgrade to v5 in a future net new branch.

This reverts commit 6a43aacf16132ff1918cbeb9d9b15c74b3a55a78.

---------

Signed-off-by: Bernd Verst <github@bernd.dev>

* Support log streaming on build resource (Azure#25902)

* updated the build resource to support build upload and log streaming, with a token to be passed in via header

* add x-ms-secret and update buildendpoint -> endpoint

* retrieve log stream and upload endpoint tokens through post requests, as they are secrets

* remove secret flag from tokenendpoint property, as we expect users to retrieve it

* rename file

* updated format of how build object returns auth token

* fix example

* added expiration date to token response

* fix auth token to also include build resource information

* renamed getAuthToken -> listAuthToken and removed resource information from token response

* fix examples

* updated samples to be more accurate

* Update serviceBinds with clientType and customizedKeys (Azure#26111)

* Update serviceBinds with clientType and customizedKeys

* force ci

* fix missing }

---------

Co-authored-by: Ahmed ElSayed <ahmels@microsoft.com>

* Adds new Dapr Component Resiliency Feature to existing version `Release app microsoft.app 2023 08 01 preview` (Azure#26107)

* Add Dapr Component Resiliency Policies APIs to ContainerApps 2023-08-01-preview

Signed-off-by: Bernd Verst <github@bernd.dev>

* Update deletion return code

* Fix variable name

* Remove invalid status code from example

* prettify

* Register new resource in readme

* Remove existing import cycle

* Use integers not integer strings

* Fix delete status codes

* More changes

* Update examples

* Revert "Remove existing import cycle" which causes unrelated failures

This reverts commit 8ce1a74f9d12b333c43c324f1b2250a64a0f1add.

---------

Signed-off-by: Bernd Verst <github@bernd.dev>

* Add API spec for ContainerApp Resiliency (Azure#25732)

Signed-off-by: Hal Spang <halspang@microsoft.com>

* Add extendedlocation for job (Azure#26196)

* Add extendedlocation for job

* Add sample for container apps on connectedEnvironment

* Fixes for examples

* Fix connected environment example

* Update old examples

* removing SourceToCloud patching from 08-01-preview (Azure#26245)

* Add diagnostic routes to Container App Jobs (Azure#26227)

* Add diagnostic routes to Container App Jobs

* Update

* Update

* Update

* Update

* Update

* Update

* Update operationIds

---------

Co-authored-by: Michimune Kohno <mikono@microsoft.com>

* Update app resiliency rest api spec (Azure#26357)

Signed-off-by: Yash Nisar <yashnisar@microsoft.com>

* Fix ACA component resiliency examples (Azure#26441)

* Fix arm review comments for container app (Azure#26455)

* update

* update

* update

* Fix SDK build error for Microsoft.App (Azure#26416)

* Fix SDK build error for Microsoft.App

* Update

* update

* update

* update

---------

Co-authored-by: Michimune Kohno <mikono@microsoft.com>

* Fix arm review comments for container app (Azure#26479)

* fix

* update

* update

* Fix detectorProperties request path (Azure#26431)

* fix list exception

* change param to enum

* fix lint error

* revert not working changes

* fix enum

* rearrange

---------

Co-authored-by: Chenghui Yu <chenghuiyu@microsoft.com>

* Enable dynamicJsonColumns for log analytics configuration (Azure#26432)

* Enable dynamicJsonColumn for log analysis configuration

* Add missed s

* Fix code style

* Update container app usages value to float (Azure#26448)

* update

* update

* update

* Fix App Resiliency retry example (Azure#26560)

Signed-off-by: Yash Nisar <yashnisar@microsoft.com>

* Fix lint warning for container app (Azure#26523)

* fix warning

* fix warning

* upate

---------

Signed-off-by: Bernd Verst <github@bernd.dev>
Signed-off-by: Hal Spang <halspang@microsoft.com>
Signed-off-by: Yash Nisar <yashnisar@microsoft.com>
Co-authored-by: zhenqxuMSFT <zhenqxu@microsoft.com>
Co-authored-by: yalixiang <88011184+yalixiang@users.noreply.github.com>
Co-authored-by: Paul Dorsch <107068277+pauld-msft@users.noreply.github.com>
Co-authored-by: Michael Dai <michaelkira@live.cn>
Co-authored-by: bgashirabake <85650284+bgashirabake@users.noreply.github.com>
Co-authored-by: bgashirabake@gmail.com <bgashirabake@microsoft.com>
Co-authored-by: Harry Li <110055355+harryli0108@users.noreply.github.com>
Co-authored-by: Paul Dorsch <pauldorsch@microsoft.com>
Co-authored-by: Bernd Verst <bernd.verst@microsoft.com>
Co-authored-by: Ahmed ElSayed <ahmed@elsayed.io>
Co-authored-by: Ahmed ElSayed <ahmels@microsoft.com>
Co-authored-by: halspang <70976921+halspang@users.noreply.github.com>
Co-authored-by: LaylaLiu-gmail <38268900+LaylaLiu-gmail@users.noreply.github.com>
Co-authored-by: michimune <michimune@outlook.com>
Co-authored-by: Michimune Kohno <mikono@microsoft.com>
Co-authored-by: Yash Nisar <yashnisar@microsoft.com>
Co-authored-by: Seris370 <38371667+Seris370@users.noreply.github.com>
Co-authored-by: Chenghui Yu <chenghuiyu@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alzimmermsft alzimmermsft alzimmermsft approved these changes

@saragluna saragluna saragluna approved these changes

@anuchandy anuchandy Awaiting requested review from anuchandy anuchandy is a code owner

@backwind1233 backwind1233 Awaiting requested review from backwind1233

@chenrujun chenrujun Awaiting requested review from chenrujun

@conniey conniey Awaiting requested review from conniey conniey is a code owner

@g2vinay g2vinay Awaiting requested review from g2vinay g2vinay is a code owner

@hui1110 hui1110 Awaiting requested review from hui1110

@jialigit jialigit Awaiting requested review from jialigit

@JonathanGiles JonathanGiles Awaiting requested review from JonathanGiles JonathanGiles is a code owner

@joshfree joshfree Awaiting requested review from joshfree joshfree is a code owner

@lmolkova lmolkova Awaiting requested review from lmolkova lmolkova is a code owner

@mrm9084 mrm9084 Awaiting requested review from mrm9084

@pallavit pallavit Awaiting requested review from pallavit

@samvaity samvaity Awaiting requested review from samvaity

@srnagar srnagar Awaiting requested review from srnagar srnagar is a code owner

@stliu stliu Awaiting requested review from stliu

@vcolin7 vcolin7 Awaiting requested review from vcolin7 vcolin7 is a code owner

@benbp benbp Awaiting requested review from benbp benbp is a code owner

@hallipr hallipr Awaiting requested review from hallipr hallipr is a code owner

@weshaggard weshaggard Awaiting requested review from weshaggard weshaggard is a code owner

Assignees
No one assigned
Labels
App Configuration Azure.ApplicationModel.Configuration azure-spring All azure-spring related issues KeyVault
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@yiliuTo @alzimmermsft @saragluna @azure-sdk