Skip to content

Test merging feature/spring-boot-3 branch to main branch#40700

Closed
rujche wants to merge 440 commits into
Azure:mainfrom
rujche:feature/spring-boot-3-prepare-merge-to-main
Closed

Test merging feature/spring-boot-3 branch to main branch#40700
rujche wants to merge 440 commits into
Azure:mainfrom
rujche:feature/spring-boot-3-prepare-merge-to-main

Conversation

@rujche

@rujche rujche commented Jun 19, 2024

Copy link
Copy Markdown
Member

Description

Draft PR, Don't review.
This PR is used to test merging feature/spring-boot-3 branch into main branch.

Preliminary conclusion:
The external dependencies managed by Spring Boot 3 cannot be used by all SDKs and make all pipelines work normally.
The following problems have been found:

  1. sdk/core, sdk/clientcore module tests depend on javax.servlet
  2. Some external dependencies are already jdk11 and jdk17 compilation requirements, such as: mockito-core: 5.11.0; org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.9; org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server:12.0.9
  3. slf4j-api: 2.0.13 module has deprecated the class org.slf4j.helpers.MarkerIgnoringBase has no replacement, see Replacement for deprecated LoggerFactoryBinder & MarkerIgnoringBase? qos-ch/logback#700
    4 Reactor-core: 3.6.6 bug, see Regression in 3.6.6 in cancellation route reactor/reactor-core#3839

I am going to use the versions managed by Spring Boot 3 for 'sdk/spring` external dependencies, and try to make all pipelines work normally. See more from the new PR #41026

All SDK Contribution checklist:

  • The pull request does not introduce [breaking changes]
  • CHANGELOG is updated for new features, bug fixes or other significant changes.
  • I have read the contribution guidelines.

General Guidelines and Best Practices

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

  • Pull request includes test coverage for the included changes.

Netyyyy and others added 30 commits June 14, 2023 14:08
* Make appconfig IT to be independent (Azure#35320)

* move appconfig IT
* Update tests.yml

* move appconfig IT
# Conflicts:
#	.github/CODEOWNERS
#	eng/code-quality-reports/pom.xml
#	eng/versioning/external_dependencies.txt
#	eng/versioning/version_client.txt
#	sdk/advisor/azure-resourcemanager-advisor/pom.xml
#	sdk/agrifood/azure-resourcemanager-agrifood/pom.xml
#	sdk/agrifood/azure-verticals-agrifood-farming/pom.xml
#	sdk/anomalydetector/azure-ai-anomalydetector/pom.xml
#	sdk/aot/azure-aot-graalvm-samples/pom.xml
#	sdk/aot/azure-aot-graalvm-support-netty/pom.xml
#	sdk/appcomplianceautomation/azure-resourcemanager-appcomplianceautomation/pom.xml
#	sdk/appconfiguration/azure-data-appconfiguration/pom.xml
#	sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml
#	sdk/appcontainers/azure-resourcemanager-appcontainers/pom.xml
#	sdk/attestation/azure-resourcemanager-attestation/pom.xml
#	sdk/attestation/azure-security-attestation/pom.xml
#	sdk/avs/azure-resourcemanager-avs/pom.xml
#	sdk/azurearcdata/azure-resourcemanager-azurearcdata/pom.xml
#	sdk/azurestack/azure-resourcemanager-azurestack/pom.xml
#	sdk/baremetalinfrastructure/azure-resourcemanager-baremetalinfrastructure/pom.xml
#	sdk/batch/azure-resourcemanager-batch/pom.xml
#	sdk/billing/azure-resourcemanager-billing/pom.xml
#	sdk/billingbenefits/azure-resourcemanager-billingbenefits/pom.xml
#	sdk/changeanalysis/azure-resourcemanager-changeanalysis/pom.xml
#	sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/pom.xml
#	sdk/commerce/azure-resourcemanager-commerce/pom.xml
#	sdk/communication/azure-communication-callautomation/pom.xml
#	sdk/communication/azure-communication-callingserver/pom.xml
#	sdk/communication/azure-communication-chat/pom.xml
#	sdk/communication/azure-communication-common/pom.xml
#	sdk/communication/azure-communication-email/pom.xml
#	sdk/communication/azure-communication-identity/pom.xml
#	sdk/communication/azure-communication-jobrouter/pom.xml
#	sdk/communication/azure-communication-networktraversal/pom.xml
#	sdk/communication/azure-communication-phonenumbers/pom.xml
#	sdk/communication/azure-communication-rooms/pom.xml
#	sdk/communication/azure-communication-sms/pom.xml
#	sdk/communication/azure-resourcemanager-communication/pom.xml
#	sdk/confidentialledger/azure-resourcemanager-confidentialledger/pom.xml
#	sdk/confidentialledger/azure-security-confidentialledger/pom.xml
#	sdk/containerregistry/azure-containers-containerregistry/pom.xml
#	sdk/core/azure-core-amqp-experimental/pom.xml
#	sdk/core/azure-core-amqp/pom.xml
#	sdk/core/azure-core-experimental/pom.xml
#	sdk/core/azure-core-http-jdk-httpclient/pom.xml
#	sdk/core/azure-core-http-netty/pom.xml
#	sdk/core/azure-core-http-okhttp/pom.xml
#	sdk/core/azure-core-http-vertx/pom.xml
#	sdk/core/azure-core-management/pom.xml
#	sdk/core/azure-core-metrics-opentelemetry/pom.xml
#	sdk/core/azure-core-perf/pom.xml
#	sdk/core/azure-core-serializer-avro-apache/pom.xml
#	sdk/core/azure-core-serializer-avro-jackson/pom.xml
#	sdk/core/azure-core-serializer-json-gson/pom.xml
#	sdk/core/azure-core-serializer-json-jackson/pom.xml
#	sdk/core/azure-core-test/pom.xml
#	sdk/core/azure-core-tracing-opentelemetry/pom.xml
#	sdk/core/azure-core-version-tests/pom.xml
#	sdk/core/azure-core/pom.xml
#	sdk/core/azure-json-gson/pom.xml
#	sdk/core/azure-json-reflect/pom.xml
#	sdk/core/azure-json/pom.xml
#	sdk/core/azure-xml/pom.xml
#	sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml
#	sdk/dashboard/azure-resourcemanager-dashboard/pom.xml
#	sdk/databox/azure-resourcemanager-databox/pom.xml
#	sdk/databoxedge/azure-resourcemanager-databoxedge/pom.xml
#	sdk/datadog/azure-resourcemanager-datadog/pom.xml
#	sdk/datafactory/azure-resourcemanager-datafactory/pom.xml
#	sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml
#	sdk/datalakestore/azure-resourcemanager-datalakestore/pom.xml
#	sdk/datamigration/azure-resourcemanager-datamigration/pom.xml
#	sdk/delegatednetwork/azure-resourcemanager-delegatednetwork/pom.xml
#	sdk/deploymentmanager/azure-resourcemanager-deploymentmanager/pom.xml
#	sdk/desktopvirtualization/azure-resourcemanager-desktopvirtualization/pom.xml
#	sdk/devcenter/azure-developer-devcenter/pom.xml
#	sdk/devcenter/azure-resourcemanager-devcenter/pom.xml
#	sdk/devhub/azure-resourcemanager-devhub/pom.xml
#	sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml
#	sdk/deviceupdate/azure-iot-deviceupdate/pom.xml
#	sdk/deviceupdate/azure-resourcemanager-deviceupdate/pom.xml
#	sdk/devspaces/azure-resourcemanager-devspaces/pom.xml
#	sdk/devtestlabs/azure-resourcemanager-devtestlabs/pom.xml
#	sdk/digitaltwins/azure-digitaltwins-core/pom.xml
#	sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml
#	sdk/dnsresolver/azure-resourcemanager-dnsresolver/pom.xml
#	sdk/education/azure-resourcemanager-education/pom.xml
#	sdk/elastic/azure-resourcemanager-elastic/pom.xml
#	sdk/elasticsan/azure-resourcemanager-elasticsan/pom.xml
#	sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml
#	sdk/eventgrid/azure-messaging-eventgrid/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs-track2-perf/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs/pom.xml
#	sdk/formrecognizer/azure-ai-formrecognizer/pom.xml
#	sdk/frontdoor/azure-resourcemanager-frontdoor/pom.xml
#	sdk/graphservices/azure-resourcemanager-graphservices/pom.xml
#	sdk/hanaonazure/azure-resourcemanager-hanaonazure/pom.xml
#	sdk/hdinsight/azure-resourcemanager-hdinsight/pom.xml
#	sdk/healthinsights/azure-health-insights-cancerprofiling/pom.xml
#	sdk/healthinsights/azure-health-insights-clinicalmatching/pom.xml
#	sdk/hybridcompute/azure-resourcemanager-hybridcompute/pom.xml
#	sdk/hybridcontainerservice/azure-resourcemanager-hybridcontainerservice/pom.xml
#	sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/pom.xml
#	sdk/hybridnetwork/azure-resourcemanager-hybridnetwork/pom.xml
#	sdk/identity/azure-identity-extensions/pom.xml
#	sdk/imagebuilder/azure-resourcemanager-imagebuilder/pom.xml
#	sdk/iothub/azure-resourcemanager-iothub/pom.xml
#	sdk/keyvault/azure-security-keyvault-administration/pom.xml
#	sdk/keyvault/azure-security-keyvault-certificates/pom.xml
#	sdk/keyvault/azure-security-keyvault-jca/pom.xml
#	sdk/keyvault/azure-security-keyvault-keys/pom.xml
#	sdk/keyvault/azure-security-keyvault-secrets/pom.xml
#	sdk/keyvault/azure-security-test-keyvault-jca/pom.xml
#	sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml
#	sdk/kusto/azure-resourcemanager-kusto/pom.xml
#	sdk/loadtesting/azure-developer-loadtesting/pom.xml
#	sdk/loadtesting/azure-resourcemanager-loadtesting/pom.xml
#	sdk/logic/azure-resourcemanager-logic/pom.xml
#	sdk/logz/azure-resourcemanager-logz/pom.xml
#	sdk/machinelearning/azure-resourcemanager-machinelearning/pom.xml
#	sdk/maintenance/azure-resourcemanager-maintenance/pom.xml
#	sdk/managedapplications/azure-resourcemanager-managedapplications/pom.xml
#	sdk/maps/azure-maps-elevation/pom.xml
#	sdk/maps/azure-maps-geolocation/pom.xml
#	sdk/maps/azure-maps-render/pom.xml
#	sdk/maps/azure-maps-route/pom.xml
#	sdk/maps/azure-maps-search/pom.xml
#	sdk/maps/azure-maps-timezone/pom.xml
#	sdk/maps/azure-maps-traffic/pom.xml
#	sdk/maps/azure-maps-weather/pom.xml
#	sdk/maps/azure-resourcemanager-maps/pom.xml
#	sdk/mariadb/azure-resourcemanager-mariadb/pom.xml
#	sdk/mediaservices/azure-resourcemanager-mediaservices/pom.xml
#	sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml
#	sdk/mixedreality/azure-mixedreality-authentication/pom.xml
#	sdk/mixedreality/azure-resourcemanager-mixedreality/pom.xml
#	sdk/modelsrepository/azure-iot-modelsrepository/pom.xml
#	sdk/monitor/azure-monitor-ingestion/pom.xml
#	sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml
#	sdk/monitor/azure-monitor-query/pom.xml
#	sdk/mysqlflexibleserver/azure-resourcemanager-mysqlflexibleserver/pom.xml
#	sdk/netapp/azure-resourcemanager-netapp/pom.xml
#	sdk/networkcloud/azure-resourcemanager-networkcloud/pom.xml
#	sdk/networkfunction/azure-resourcemanager-networkfunction/pom.xml
#	sdk/newrelicobservability/azure-resourcemanager-newrelicobservability/pom.xml
#	sdk/nginx/azure-resourcemanager-nginx/pom.xml
#	sdk/openai/azure-ai-openai/pom.xml
#	sdk/operationsmanagement/azure-resourcemanager-operationsmanagement/pom.xml
#	sdk/orbital/azure-resourcemanager-orbital/pom.xml
#	sdk/paloaltonetworks/azure-resourcemanager-paloaltonetworks-ngfw/pom.xml
#	sdk/peering/azure-resourcemanager-peering/pom.xml
#	sdk/personalizer/azure-ai-personalizer/pom.xml
#	sdk/policyinsights/azure-resourcemanager-policyinsights/pom.xml
#	sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/pom.xml
#	sdk/powerbidedicated/azure-resourcemanager-powerbidedicated/pom.xml
#	sdk/purview/azure-analytics-purview-administration/pom.xml
#	sdk/purview/azure-analytics-purview-catalog/pom.xml
#	sdk/purview/azure-analytics-purview-scanning/pom.xml
#	sdk/purview/azure-analytics-purview-sharing/pom.xml
#	sdk/purview/azure-analytics-purview-workflow/pom.xml
#	sdk/purview/azure-resourcemanager-purview/pom.xml
#	sdk/quantum/azure-quantum-jobs/pom.xml
#	sdk/qumulo/azure-resourcemanager-qumulo/pom.xml
#	sdk/quota/azure-resourcemanager-quota/pom.xml
#	sdk/recoveryservices/azure-resourcemanager-recoveryservices/pom.xml
#	sdk/recoveryservicesbackup/azure-resourcemanager-recoveryservicesbackup/pom.xml
#	sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml
#	sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml
#	sdk/reservations/azure-resourcemanager-reservations/pom.xml
#	sdk/resourceconnector/azure-resourcemanager-resourceconnector/pom.xml
#	sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml
#	sdk/resourcehealth/azure-resourcemanager-resourcehealth/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-compute/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-dns/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-msi/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-network/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-redis/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-resources/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-samples/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-search/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-sql/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-storage/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml
#	sdk/resourcemanager/azure-resourcemanager/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-appservice/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-authorization/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-compute/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-containerregistry/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-containerservice/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-dns/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-eventhubs/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-keyvault/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-monitor/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-network/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-resources/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-storage/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager/pom.xml
#	sdk/resourcemover/azure-resourcemanager-resourcemover/pom.xml
#	sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml
#	sdk/schemaregistry/azure-data-schemaregistry/pom.xml
#	sdk/search/azure-search-documents/pom.xml
#	sdk/security/azure-resourcemanager-security/pom.xml
#	sdk/securitydevops/azure-resourcemanager-securitydevops/pom.xml
#	sdk/selfhelp/azure-resourcemanager-selfhelp/pom.xml
#	sdk/servicebus/azure-messaging-servicebus/pom.xml
#	sdk/servicefabric/azure-resourcemanager-servicefabric/pom.xml
#	sdk/servicenetworking/azure-resourcemanager-servicenetworking/pom.xml
#	sdk/signalr/azure-resourcemanager-signalr/pom.xml
#	sdk/spring/CHANGELOG.md
#	sdk/spring/azure-spring-data-cosmos/CHANGELOG.md
#	sdk/spring/azure-spring-data-cosmos/pom.xml
#	sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/BasicItem.java
#	sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml
#	sdk/spring/spring-cloud-azure-core/pom.xml
#	sdk/spring/spring-cloud-azure-feature-management/pom.xml
#	sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml
#	sdk/spring/spring-cloud-azure-resourcemanager/pom.xml
#	sdk/spring/spring-cloud-azure-service/pom.xml
#	sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml
#	sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml
#	sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml
#	sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml
#	sdk/spring/spring-integration-azure-core/pom.xml
#	sdk/spring/spring-integration-azure-eventhubs/pom.xml
#	sdk/spring/spring-integration-azure-servicebus/pom.xml
#	sdk/spring/spring-integration-azure-storage-queue/pom.xml
#	sdk/spring/spring-messaging-azure-eventhubs/pom.xml
#	sdk/spring/spring-messaging-azure-servicebus/pom.xml
#	sdk/spring/spring-messaging-azure-storage-queue/pom.xml
#	sdk/spring/spring-reference.yml
#	sdk/spring/tests.yml
#	sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/pom.xml
#	sdk/storage/azure-storage-blob-cryptography/pom.xml
#	sdk/storage/azure-storage-blob-nio/pom.xml
#	sdk/storage/azure-storage-common/pom.xml
#	sdk/storage/azure-storage-internal-avro/pom.xml
#	sdk/storage/azure-storage-queue/pom.xml
#	sdk/storagecache/azure-resourcemanager-storagecache/pom.xml
#	sdk/storageimportexport/azure-resourcemanager-storageimportexport/pom.xml
#	sdk/storagemover/azure-resourcemanager-storagemover/pom.xml
#	sdk/storagepool/azure-resourcemanager-storagepool/pom.xml
#	sdk/subscription/azure-resourcemanager-subscription/pom.xml
#	sdk/support/azure-resourcemanager-support/pom.xml
#	sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml
#	sdk/synapse/azure-analytics-synapse-artifacts/pom.xml
#	sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml
#	sdk/synapse/azure-analytics-synapse-monitoring/pom.xml
#	sdk/synapse/azure-analytics-synapse-spark/pom.xml
#	sdk/synapse/azure-resourcemanager-synapse/pom.xml
#	sdk/tables/azure-data-tables/pom.xml
#	sdk/template/azure-sdk-template-three/pom.xml
#	sdk/template/azure-sdk-template-two/pom.xml
#	sdk/template/azure-sdk-template/pom.xml
#	sdk/textanalytics/azure-ai-textanalytics/pom.xml
#	sdk/timeseriesinsights/azure-resourcemanager-timeseriesinsights/pom.xml
#	sdk/tools/azure-sdk-build-tool/pom.xml
#	sdk/translation/azure-ai-documenttranslator/pom.xml
#	sdk/translation/azure-ai-translation-text/pom.xml
#	sdk/videoanalyzer/azure-media-videoanalyzer-edge/pom.xml
#	sdk/vmwarecloudsimple/azure-resourcemanager-vmwarecloudsimple/pom.xml
#	sdk/voiceservices/azure-resourcemanager-voiceservices/pom.xml
#	sdk/webpubsub/azure-messaging-webpubsub-client/pom.xml
#	sdk/webpubsub/azure-messaging-webpubsub/pom.xml
#	sdk/webpubsub/azure-resourcemanager-webpubsub/pom.xml
#	sdk/workloads/azure-resourcemanager-workloads/pom.xml
* Updated spring CI (Azure#35453)

* Updated spring CI

* Update ci.yml

Attempting to fix CI run with stages.

* Update ci.yml

Attempting to fix CI issues.

* Update ci.yml

Reverting attempt.

* Update ci.yml

Reverting changes to spring/si.yml

* Update ci.yml

Reverting syntax.

* Create ci.cosmos.yml

Adding new yaml for cosmos emulator.

* Update ci.cosmos.yml

Removing un-needed code.

* Update ci.cosmos.yml

Adding artifacts.

* Update ci.cosmos.yml

Working on getting the new pipeline running.

* Update ci.cosmos.yml

Small change to restart pipeline

* Update ci.cosmos.yml

Fixing syntax.

* Update ci.cosmos.yml

Removing artifact.

* Update ci.cosmos.yml

Adding filter to only run spring tests.

* Update ci.cosmos.yml

Fixing syntax.

* Update ci.cosmos.yml

Fixing matrix filter.

* Update ci.cosmos.yml

Working on matrix filter.

* Update ci.cosmos.yml

Working on matrix filters.

* Updating ci logic.

Working on fixing MatrixFilters.

* Update cosmos-sdk-client.yml

Fixing matrix filter.

* Update ci.cosmos.yml

Fixing CI issue.

* Update ci.cosmos.yml

Changing to only run for azure-spring-data-cosmos

---------

Co-authored-by: Trevor Anderson <63077034+trande4884@users.noreply.github.com>
Co-authored-by: Trevor Anderson <trande@microsoft.com>

* Update ci.cosmos.yml

Adding Java Version Matrix Filter.

* Update cosmos-sdk-client.yml

Fixing java 1.8 and 1.11 issues.

* Spring ci fixing matrix filter (Azure#35485)

* Merging

* Updating yaml filters to have a new param to support dynamic filtering in SB3.

* Fix spring tests emulator (Azure#35404)

* Updated release versions to 4.46.0 for azure-cosmos and 4.19.0 for spark connector

* Updated spark readme files

* Updated quick start files

* Fixed spring tests for emulator

* Fix imports

* Added a dummy commit to run Java cosmos CI

* change to log4j-slf4j2-impl to run the ci pipelines

---------

Co-authored-by: Kushagra Thapar <kuthapar@microsoft.com>
Co-authored-by: Xiaolu Dai <xiada@microsoft.com>
* Fixing Push Refresh issue

* Fixed Typo

* Update README.md
# Conflicts:
#	common/perf-test-core/pom.xml
#	eng/versioning/external_dependencies.txt
#	eng/versioning/version_client.txt
#	sdk/aot/azure-aot-graalvm-support-netty/pom.xml
#	sdk/core/azure-core-http-netty/pom.xml
#	sdk/core/azure-core-perf/pom.xml
#	sdk/core/azure-core-test/pom.xml
#	sdk/core/azure-core-version-tests/pom.xml
#	sdk/core/azure-core/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml
#	sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml
#	sdk/spring/spring-cloud-azure-core/pom.xml
#	sdk/spring/spring-cloud-azure-feature-management/pom.xml
#	sdk/spring/spring-cloud-azure-starter-redis/pom.xml
#	sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml
#	sdk/webpubsub/azure-messaging-webpubsub-client/pom.xml
* Support passwordless connections for JMS ServiceBus in Spring (Azure#33489)
* fix differences in two versions
---------

Co-authored-by: zhihaoguo <zhihaoguo@microsoft.com>
* update compatibility for 3.1.x
* update redis
* update enum values to be upper case
* move AzurePasswordlessPropertiesMapping to implementation package
* refactor passwordless properties to reduce duplication
* remove the germany cloud type scopes

---------

Co-authored-by: zhihaoguo <zhihaoguo@microsoft.com>
…ctories (Azure#35717)

* fix AzureMessagingListenerAutoConfiguration
# Conflicts:
#	.github/CODEOWNERS
#	eng/code-quality-reports/src/main/resources/revapi/revapi.json
#	eng/jacoco-test-coverage/pom.xml
#	eng/versioning/external_dependencies.txt
#	eng/versioning/version_client.txt
#	sdk/appconfiguration/azure-data-appconfiguration/pom.xml
#	sdk/boms/spring-cloud-azure-dependencies/pom.xml
#	sdk/communication/azure-communication-callautomation/pom.xml
#	sdk/communication/azure-communication-callingserver/pom.xml
#	sdk/communication/azure-communication-common/pom.xml
#	sdk/communication/azure-communication-identity/pom.xml
#	sdk/communication/azure-communication-jobrouter/pom.xml
#	sdk/communication/azure-communication-networktraversal/pom.xml
#	sdk/communication/azure-communication-phonenumbers/pom.xml
#	sdk/communication/azure-communication-rooms/pom.xml
#	sdk/communication/azure-communication-sms/pom.xml
#	sdk/containerregistry/azure-containers-containerregistry/pom.xml
#	sdk/core/azure-core-amqp-experimental/pom.xml
#	sdk/core/azure-core-amqp/pom.xml
#	sdk/core/azure-core-experimental/pom.xml
#	sdk/core/azure-core-http-jdk-httpclient/pom.xml
#	sdk/core/azure-core-http-netty/pom.xml
#	sdk/core/azure-core-http-okhttp/pom.xml
#	sdk/core/azure-core-http-vertx/pom.xml
#	sdk/core/azure-core-management/pom.xml
#	sdk/core/azure-core-perf/pom.xml
#	sdk/core/azure-core-serializer-avro-apache/pom.xml
#	sdk/core/azure-core-serializer-avro-jackson/pom.xml
#	sdk/core/azure-core-serializer-json-gson/pom.xml
#	sdk/core/azure-core-serializer-json-jackson/pom.xml
#	sdk/core/azure-core-test/pom.xml
#	sdk/core/azure-core-version-tests/pom.xml
#	sdk/core/azure-core/pom.xml
#	sdk/cosmos/azure-cosmos-benchmark/pom.xml
#	sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml
#	sdk/cosmos/azure-cosmos-encryption/pom.xml
#	sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml
#	sdk/cosmos/azure-cosmos-tests/pom.xml
#	sdk/cosmos/azure-cosmos/pom.xml
#	sdk/e2e/pom.xml
#	sdk/eventgrid/azure-messaging-eventgrid/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs-stress/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs/pom.xml
#	sdk/identity/azure-identity/pom.xml
#	sdk/keyvault/azure-security-keyvault-administration/pom.xml
#	sdk/keyvault/azure-security-keyvault-certificates/pom.xml
#	sdk/keyvault/azure-security-keyvault-keys/pom.xml
#	sdk/keyvault/azure-security-keyvault-secrets/pom.xml
#	sdk/keyvault/azure-security-test-keyvault-jca/pom.xml
#	sdk/maps/azure-maps-elevation/pom.xml
#	sdk/maps/azure-maps-geolocation/pom.xml
#	sdk/maps/azure-maps-render/pom.xml
#	sdk/maps/azure-maps-route/pom.xml
#	sdk/maps/azure-maps-search/pom.xml
#	sdk/maps/azure-maps-timezone/pom.xml
#	sdk/maps/azure-maps-traffic/pom.xml
#	sdk/maps/azure-maps-weather/pom.xml
#	sdk/mixedreality/azure-mixedreality-authentication/pom.xml
#	sdk/monitor/azure-monitor-ingestion/pom.xml
#	sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-resources/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-samples/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-resources/pom.xml
#	sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml
#	sdk/schemaregistry/azure-data-schemaregistry/pom.xml
#	sdk/search/azure-search-documents/pom.xml
#	sdk/servicebus/azure-messaging-servicebus-stress/pom.xml
#	sdk/servicebus/azure-messaging-servicebus/pom.xml
#	sdk/spring/README.md
#	sdk/spring/azure-spring-data-cosmos/CHANGELOG.md
#	sdk/spring/azure-spring-data-cosmos/README.md
#	sdk/spring/azure-spring-data-cosmos/pom.xml
#	sdk/spring/scripts/spring_boot_2.7.13_managed_external_dependencies.txt
#	sdk/spring/spring-cloud-azure-actuator-autoconfigure/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml
#	sdk/spring/spring-cloud-azure-actuator/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-actuator/pom.xml
#	sdk/spring/spring-cloud-azure-appconfiguration-config-web/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml
#	sdk/spring/spring-cloud-azure-appconfiguration-config/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml
#	sdk/spring/spring-cloud-azure-autoconfigure/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-autoconfigure/pom.xml
#	sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventgrid/AzureEventGridAutoConfiguration.java
#	sdk/spring/spring-cloud-azure-autoconfigure/src/main/resources/META-INF/spring.factories
#	sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventgrid/AzureEventGridAutoConfigurationTests.java
#	sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/useragent/http/EventGridUserAgentTests.java
#	sdk/spring/spring-cloud-azure-core/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-core/pom.xml
#	sdk/spring/spring-cloud-azure-feature-management-web/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-feature-management-web/pom.xml
#	sdk/spring/spring-cloud-azure-feature-management/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-feature-management/pom.xml
#	sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml
#	sdk/spring/spring-cloud-azure-integration-tests/pom.xml
#	sdk/spring/spring-cloud-azure-resourcemanager/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-resourcemanager/pom.xml
#	sdk/spring/spring-cloud-azure-service/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-service/pom.xml
#	sdk/spring/spring-cloud-azure-service/src/test/java/com/azure/spring/cloud/service/implementation/eventgrid/EventGridPublisherClientBuilderFactoryTests.java
#	sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml
#	sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml
#	sdk/spring/spring-cloud-azure-starter-actuator/pom.xml
#	sdk/spring/spring-cloud-azure-starter-appconfiguration-config/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-starter-appconfiguration-config/README.md
#	sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml
#	sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml
#	sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml
#	sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml
#	sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml
#	sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml
#	sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml
#	sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml
#	sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml
#	sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml
#	sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml
#	sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml
#	sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml
#	sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml
#	sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml
#	sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml
#	sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml
#	sdk/spring/spring-cloud-azure-starter-storage-file-share/pom.xml
#	sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml
#	sdk/spring/spring-cloud-azure-starter-storage/pom.xml
#	sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml
#	sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml
#	sdk/spring/spring-cloud-azure-starter/pom.xml
#	sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml
#	sdk/spring/spring-cloud-azure-stream-binder-eventhubs/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml
#	sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml
#	sdk/spring/spring-cloud-azure-stream-binder-servicebus/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml
#	sdk/spring/spring-cloud-azure-trace-sleuth/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml
#	sdk/spring/spring-integration-azure-core/CHANGELOG.md
#	sdk/spring/spring-integration-azure-core/pom.xml
#	sdk/spring/spring-integration-azure-eventhubs/CHANGELOG.md
#	sdk/spring/spring-integration-azure-eventhubs/pom.xml
#	sdk/spring/spring-integration-azure-servicebus/CHANGELOG.md
#	sdk/spring/spring-integration-azure-servicebus/pom.xml
#	sdk/spring/spring-integration-azure-storage-queue/CHANGELOG.md
#	sdk/spring/spring-integration-azure-storage-queue/pom.xml
#	sdk/spring/spring-messaging-azure-eventhubs/CHANGELOG.md
#	sdk/spring/spring-messaging-azure-eventhubs/pom.xml
#	sdk/spring/spring-messaging-azure-servicebus/CHANGELOG.md
#	sdk/spring/spring-messaging-azure-servicebus/pom.xml
#	sdk/spring/spring-messaging-azure-storage-queue/CHANGELOG.md
#	sdk/spring/spring-messaging-azure-storage-queue/pom.xml
#	sdk/spring/spring-messaging-azure/CHANGELOG.md
#	sdk/spring/spring-messaging-azure/pom.xml
#	sdk/spring/spring-reference.yml
#	sdk/storage/azure-storage-blob-batch/pom.xml
#	sdk/storage/azure-storage-blob-changefeed/pom.xml
#	sdk/storage/azure-storage-blob-nio/pom.xml
#	sdk/storage/azure-storage-blob/pom.xml
#	sdk/storage/azure-storage-common/pom.xml
#	sdk/storage/azure-storage-file-datalake/pom.xml
#	sdk/storage/azure-storage-file-share/pom.xml
#	sdk/storage/azure-storage-internal-avro/pom.xml
#	sdk/storage/azure-storage-queue/pom.xml
#	sdk/tables/azure-data-tables/pom.xml
#	sdk/webpubsub/azure-messaging-webpubsub/pom.xml
* Added spring boot 3 support to changelog

* Updated spring data cosmos chagelog
* try to fix the circular reference
* add test for @EnableCosmosAuditing
---------

Co-authored-by: Muyao <v-muyaofeng@microsoft.com>
* Client Level Diagnostics for Spring SDK (Azure#35546)

* Merging

* Revert "Merging"

This reverts commit ade7932.

* Exposing diagnostic threshold's at the client level in Spring SDK.

* Revert "Revert "Merging""

This reverts commit 6bab94e.

* Updating changelog.

* Removing unused import.

* Adding defaults to application.properties

* Fixing copy/paste error in code.

* Fixing PR comments.

* Fixing PR comments.

* Fixing PR comments.

* Adding test case.

* Adding javaagent sample to readme.

* Updating readme wording.

* Removing unused imports.

* Fixing bad merge resolution.

* Update sdk/spring/azure-spring-data-cosmos/CHANGELOG.md

Changing wording.

Co-authored-by: Kushagra Thapar <kushuthapar@gmail.com>

* Update sdk/spring/azure-spring-data-cosmos/README.md

Wording change.

Co-authored-by: Kushagra Thapar <kushuthapar@gmail.com>

---------

Co-authored-by: Kushagra Thapar <kushuthapar@gmail.com>

* Update sdk/spring/azure-spring-data-cosmos/CHANGELOG.md

Co-authored-by: Kushagra Thapar <kushuthapar@gmail.com>

* Update README.md

Adding readme file changes.

Co-Authored-By: Kushagra Thapar <kushuthapar@gmail.com>

* Update README.md

Adding changes to readme file

---------

Co-authored-by: Kushagra Thapar <kushuthapar@gmail.com>
* fix native bean registration
* add test for BeanRegistrationExcludeFilter

---------

Co-authored-by: Muyao <v-muyaofeng@microsoft.com>
# Conflicts:
#	.github/CODEOWNERS
#	eng/code-quality-reports/src/main/resources/revapi/revapi.json
#	eng/versioning/external_dependencies.txt
#	eng/versioning/version_client.txt
#	sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml
#	sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml
#	sdk/spring/CHANGELOG.md
#	sdk/spring/azure-spring-data-cosmos/CHANGELOG.md
#	sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/repository/ReactiveTeacherRepository.java
#	sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml
#	sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/configuration/AadWebApplicationConfiguration.java
#	sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java
#	sdk/spring/spring-cloud-azure-feature-management-web/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-feature-management/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-starter-appconfiguration-config/CHANGELOG.md
#	sdk/spring/spring-cloud-azure-starter-redis/pom.xml
#	sdk/tools/azure-sdk-build-tool/pom.xml
…6213)

* Prepare for Spring Cloud Azure 5.4.0 release (Azure#36210)

* update version manually

* update version/changelog/readme

* Increment versions for spring releases (Azure#36211)

* Increment package versions for spring releases

* Update version_client.txt

* Update pom.xml

---------

Co-authored-by: Muyao Feng <92105726+Netyyyy@users.noreply.github.com>

---------

Co-authored-by: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
…rry pick from main) (Azure#36267)

* Fixed when IN query statement didn't work with Long values (Azure#36249)

* Fixed when IN query statement didn't work with Long values

* Warn fix

* Build warnings were fixed

* Added more tests + resolved PR comments

* Fixed typo in CHANGELOG + dummy change in test to trigger CI pipeline (Azure#36255)

* Fixed PR link
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@moarychan

Copy link
Copy Markdown
Member

/azp run java - spring - tests

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@moarychan

Copy link
Copy Markdown
Member

/azp run java - spring - tests

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@moarychan

Copy link
Copy Markdown
Member

/azp run java - spring - tests

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@anuchandy

Copy link
Copy Markdown
Member

Hi, @anuchandy

My purpose

Could you please help to fix the unit test failure in current PR's pipeline:

WindowedSubscriberFluxWindowTest.shouldCancelWorkOnEmptyWindowTruncation:405 expected: but was:

More details

  1. This PR is used to merge feature/spring-boot-3 branch into main branch.
  2. The only change in sdk/core folder is external dependency version update.
  3. Because there is too many files (1300+) changed in this PR, the Files Changed tab in current page is hard to use. You can use Intellij IDEA to view the changes. Here are the screenshots about how to do this:

image
image

Another topic

This is another topic, if you don't know the answer, please skip this part, it's not necessary to spend much time to investigate this.

To let you easy reproduce the issue, I created another PR: #40756, which just change the pom files in sdk/core folder like this PR did. But the pipeline failed with another issue. It failed in Build for non-From Source run, so the Run Tests is skipped. Here are the screenshots:

image

I confirmed that the maven command is exactly the same:

image
image

I don't know why one is failed by warnings and another one is not:

image

As I said before, please help to fix the pipeline failure first, ignore the Another topic part if you don't know the reason.

Hello @rujche, @moarychan, I looked into this and seems a regression in reactor-core 3.6.6, reported it here reactor/reactor-core#3839

@moarychan

Copy link
Copy Markdown
Member

Hi @alzimmermsft , there's some build failures for deprecation usage, I tried to copy the class MarkerIgnoringBase, and now there's new failure for test com.azure.core.http.policy.HttpLoggingPolicyTests#loggingIncludesRetryCountSync . Could you help provide a replacement for class MarkerIgnoringBase and make the test passed? please find the pipeline test failures in another PR #40756. Thanks.

@moarychan

Copy link
Copy Markdown
Member

I have made a summary in the PR description, closing it now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done
Status: Done

Development

Successfully merging this pull request may close these issues.