Skip to content

Commit 5c3dac3

Browse files
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-java into users/fabianm/TestImprovements
2 parents 8c70464 + 5734d0a commit 5c3dac3

File tree

304 files changed

+7297
-5518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+7297
-5518
lines changed

eng/lintingconfigs/revapi/track2/revapi.json

Lines changed: 53 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -654,14 +654,6 @@
654654
"old": "method java.util.Map<java.lang.String, java.util.List<com.azure.search.documents.models.FacetResult>> com.azure.search.documents.util.SearchPagedResponse::getFacets()",
655655
"justification": "Non-breaking change as class is final."
656656
},
657-
{
658-
"code": "java.field.enumConstantOrderChanged",
659-
"old": {
660-
"matcher": "regex",
661-
"match": "field com\\.azure\\.resourcemanager\\.storage\\.models\\.ProvisioningState\\.(CANCELED|DELETING|FAILED)"
662-
},
663-
"justification": "Add Accepted to ProvisioningState."
664-
},
665657
{
666658
"code": "java.method.varargOverloadsOnlyDifferInVarargParameter",
667659
"old": {
@@ -703,6 +695,59 @@
703695
"code": "java.method.removed",
704696
"old": "method com.azure.resourcemanager.monitor.models.AutoscaleNotification com.azure.resourcemanager.monitor.models.AutoscaleNotification::withOperation(java.lang.String)",
705697
"justification": "The property is a constant, and hence not settable."
698+
},
699+
{
700+
"ignore": true,
701+
"code": "java.class.removed",
702+
"old" : {
703+
"matcher": "regex",
704+
"match": "class com\\.azure\\.resourcemanager\\.keyvault\\.models\\..*ListResult"
705+
},
706+
"justification": "Pageable models moved to implementation package. Unlikely used by user."
707+
},
708+
{
709+
"ignore": true,
710+
"code": "java.method.visibilityReduced",
711+
"old" : {
712+
"matcher": "regex",
713+
"match": "method void com\\.azure\\.resourcemanager\\.keyvault\\.models\\..*\\:\\:\\<init\\>\\(\\)"
714+
},
715+
"justification": "Output-only immutable models' constructors are now private."
716+
},
717+
{
718+
"ignore": true,
719+
"code": "java.method.removed",
720+
"old" : {
721+
"matcher": "regex",
722+
"match": "method .* com\\.azure\\.resourcemanager\\.keyvault\\.models\\..*\\:\\:with.*\\(.*\\).*"
723+
},
724+
"justification": "Output-only immutable models' setters are now package-private if it's being used by child class."
725+
},
726+
{
727+
"ignore": true,
728+
"code": "java.method.visibilityReduced",
729+
"old" : {
730+
"matcher": "regex",
731+
"match": "method .* com\\.azure\\.resourcemanager\\.keyvault\\.models\\..*\\:\\:with.*\\(.*\\).*"
732+
},
733+
"justification": "Output-only immutable models' setters are removed if no explicit usage."
734+
},
735+
{
736+
"regex": true,
737+
"code": "java\\.missing\\.(oldSuperType|newSuperType)",
738+
"old" : "class com\\.azure\\.resourcemanager\\.keyvault\\.models\\..*Resource",
739+
"justification": "TypeSpec fix for base resource class."
740+
},
741+
{
742+
"code": "java.class.removed",
743+
"old" : "class com.azure.resourcemanager.keyvault.models.ProxyResourceWithoutSystemData",
744+
"justification": "TypeSpec fix for base resource class."
745+
},
746+
{
747+
"regex": true,
748+
"code": ".*",
749+
"old": ".*com.azure.resourcemanager.keyvault.models.Reason.*",
750+
"justification": "\"Reason\" enum has changed from sealed to expandable."
706751
}
707752
]
708753
}

eng/versioning/version_client.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ com.azure.resourcemanager:azure-resourcemanager-containerservice;2.55.1;2.56.0-b
281281
com.azure.resourcemanager:azure-resourcemanager-cosmos;2.53.4;2.54.0-beta.1
282282
com.azure.resourcemanager:azure-resourcemanager-dns;2.53.4;2.54.0-beta.1
283283
com.azure.resourcemanager:azure-resourcemanager-eventhubs;2.53.4;2.54.0-beta.1
284-
com.azure.resourcemanager:azure-resourcemanager-keyvault;2.53.4;2.54.0-beta.1
284+
com.azure.resourcemanager:azure-resourcemanager-keyvault;2.54.0;2.55.0-beta.1
285285
com.azure.resourcemanager:azure-resourcemanager-monitor;2.53.4;2.54.0-beta.2
286286
com.azure.resourcemanager:azure-resourcemanager-msi;2.53.4;2.54.0-beta.1
287287
com.azure.resourcemanager:azure-resourcemanager-network;2.55.0;2.56.0-beta.1

sdk/appplatform/azure-resourcemanager-appplatform/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<dependency>
116116
<groupId>com.azure.resourcemanager</groupId>
117117
<artifactId>azure-resourcemanager-keyvault</artifactId>
118-
<version>2.53.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;dependency} -->
118+
<version>2.54.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;dependency} -->
119119
<scope>test</scope>
120120
</dependency>
121121
<dependency>

sdk/appservice/azure-resourcemanager-appservice/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<dependency>
8080
<groupId>com.azure.resourcemanager</groupId>
8181
<artifactId>azure-resourcemanager-keyvault</artifactId>
82-
<version>2.53.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;dependency} -->
82+
<version>2.54.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;dependency} -->
8383
</dependency>
8484
<dependency>
8585
<groupId>com.azure.resourcemanager</groupId>

sdk/chaos/azure-resourcemanager-chaos/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<dependency>
9898
<groupId>com.azure.resourcemanager</groupId>
9999
<artifactId>azure-resourcemanager-keyvault</artifactId>
100-
<version>2.53.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;dependency} -->
100+
<version>2.54.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;dependency} -->
101101
<scope>test</scope>
102102
</dependency>
103103
<dependency>

sdk/compute/azure-resourcemanager-compute/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<dependency>
121121
<groupId>com.azure.resourcemanager</groupId>
122122
<artifactId>azure-resourcemanager-keyvault</artifactId>
123-
<version>2.53.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;dependency} -->
123+
<version>2.54.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;dependency} -->
124124
<scope>test</scope>
125125
</dependency>
126126
<dependency>

sdk/keyvault/azure-resourcemanager-keyvault/CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Release History
22

3-
## 2.54.0-beta.1 (Unreleased)
3+
## 2.55.0-beta.1 (Unreleased)
44

55
### Features Added
66

@@ -10,6 +10,14 @@
1010

1111
### Other Changes
1212

13+
## 2.54.0 (2025-11-10)
14+
15+
### Other Changes
16+
17+
#### Dependency Updates
18+
19+
- Updated `api-version` to `2025-05-01`.
20+
1321
## 2.53.4 (2025-10-27)
1422

1523
### Other Changes

sdk/keyvault/azure-resourcemanager-keyvault/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ For documentation on how to use this package, please see [Azure Management Libra
1818
<dependency>
1919
<groupId>com.azure.resourcemanager</groupId>
2020
<artifactId>azure-resourcemanager-keyvault</artifactId>
21-
<version>2.53.1</version>
21+
<version>2.54.0</version>
2222
</dependency>
2323
```
2424
[//]: # ({x-version-update-end})

sdk/keyvault/azure-resourcemanager-keyvault/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "java",
44
"TagPrefix": "java/keyvault/azure-resourcemanager-keyvault",
5-
"Tag": "java/keyvault/azure-resourcemanager-keyvault_bc88138bf3"
5+
"Tag": "java/keyvault/azure-resourcemanager-keyvault_055c9278d0"
66
}

sdk/keyvault/azure-resourcemanager-keyvault/customization/src/main/java/KeyVaultCustomization.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ public void customize(LibraryCustomization customization, Logger logger) {
1818
// change base class from `ProxyResource` to `Resource`, to avoid breaking changes and compilation errors
1919
customizeResourceBaseClass(fluentModelsPackage.getClass("VaultInner"));
2020
customizeResourceBaseClass(fluentModelsPackage.getClass("ManagedHsmInner"));
21+
customizeResourceBaseClass(fluentModelsPackage.getClass("KeyInner"));
22+
customizeResourceBaseClass(fluentModelsPackage.getClass("SecretInner"));
23+
customizeResourceBaseClass(fluentModelsPackage.getClass("PrivateEndpointConnectionInner"));
24+
25+
PackageCustomization modelsPackage = customization.getPackage("com.azure.resourcemanager.keyvault.models");
26+
27+
addBackClientDefaultValueForSku(modelsPackage.getClass("Sku"));
2128
}
2229

2330
/**
@@ -35,4 +42,21 @@ private static void customizeResourceBaseClass(ClassCustomization customization)
3542
});
3643
});
3744
}
45+
46+
/**
47+
* Add back client-default-value for Sku.SkuFamily.
48+
*/
49+
private void addBackClientDefaultValueForSku(ClassCustomization customization) {
50+
customization.customizeAst(ast -> {
51+
ast.getClassByName(customization.getClassName()).ifPresent(clazz -> {
52+
clazz.getFieldByName("family").ifPresent(skuFamily -> {
53+
skuFamily.getVariables().forEach(var -> {
54+
if (var.getNameAsString().equals("family")) {
55+
var.setInitializer("SkuFamily.A");
56+
}
57+
});
58+
});
59+
});
60+
});
61+
}
3862
}

0 commit comments

Comments
 (0)