Skip to content

Commit cb7dcf0

Browse files
committed
Merge remote-tracking branch 'origin/copilot/update-spring-boot-version-again' into copilot/update-spring-boot-version-again
2 parents 0ad7863 + f6c37cb commit cb7dcf0

File tree

19 files changed

+162
-205
lines changed

19 files changed

+162
-205
lines changed

eng/automation/parameters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
SDK_ROOT = "../../" # related to file dir
1919
AUTOREST_CORE_VERSION = "3.9.7"
20-
AUTOREST_JAVA = "@autorest/[email protected].60"
20+
AUTOREST_JAVA = "@autorest/[email protected].62"
2121
DEFAULT_VERSION = "1.0.0-beta.1"
2222
GROUP_ID = "com.azure.resourcemanager"
2323
API_SPECS_FILE = "api-specs.yaml"

eng/common/tsp-client/package-lock.json

Lines changed: 16 additions & 104 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/tsp-client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"dependencies": {
3-
"@azure-tools/typespec-client-generator-cli": "0.30.0"
3+
"@azure-tools/typespec-client-generator-cli": "0.31.0"
44
}
55
}

eng/scripts/Compare-CurrentToCodegeneration.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,7 @@ $generateScript = {
181181
}
182182

183183
# Update code snippets before comparing the diff
184-
# TODO: remove spotless:apply when issue fixed in emitter
185-
$mvnOutput = (& mvn --no-transfer-progress codesnippet:update-codesnippet spotless:apply 2>&1)
184+
$mvnOutput = (& mvn --no-transfer-progress codesnippet:update-codesnippet 2>&1)
186185
if ($LastExitCode -ne 0) {
187186
Write-Host "$separatorBar`nError updating TypeSpec codesnippets in directory $directory`n$([String]::Join("`n", $mvnOutput))`n$separatorBar"
188187
throw

eng/versioning/version_client.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ com.azure.resourcemanager:azure-resourcemanager-authorization;2.53.6;2.54.0-beta
277277
com.azure.resourcemanager:azure-resourcemanager-cdn;2.53.5;2.54.0-beta.1
278278
com.azure.resourcemanager:azure-resourcemanager-compute;2.55.1;2.56.0-beta.1
279279
com.azure.resourcemanager:azure-resourcemanager-containerinstance;2.53.6;2.54.0-beta.1
280-
com.azure.resourcemanager:azure-resourcemanager-containerregistry;2.54.1;2.55.0-beta.1
280+
com.azure.resourcemanager:azure-resourcemanager-containerregistry;2.54.1;2.55.0-beta.2
281281
com.azure.resourcemanager:azure-resourcemanager-containerservice;2.56.1;2.57.0-beta.2
282282
com.azure.resourcemanager:azure-resourcemanager-cosmos;2.54.0;2.55.0-beta.1
283283
com.azure.resourcemanager:azure-resourcemanager-dns;2.53.5;2.54.0-beta.1
@@ -311,7 +311,7 @@ com.azure.resourcemanager:azure-resourcemanager-eventgrid;1.2.0;1.3.0-beta.2
311311
com.azure.resourcemanager:azure-resourcemanager-healthbot;1.1.0;1.2.0-beta.1
312312
com.azure.resourcemanager:azure-resourcemanager-confluent;1.2.0;1.3.0-beta.1
313313
com.azure.resourcemanager:azure-resourcemanager-digitaltwins;1.3.0;1.4.0-beta.1
314-
com.azure.resourcemanager:azure-resourcemanager-netapp;2.0.0;2.1.0-beta.1
314+
com.azure.resourcemanager:azure-resourcemanager-netapp;2.0.0;2.1.0-beta.2
315315
com.azure.resourcemanager:azure-resourcemanager-storagecache;1.1.0;1.2.0-beta.1
316316
com.azure.resourcemanager:azure-resourcemanager-redisenterprise;2.1.0;2.2.0-beta.1
317317
com.azure.resourcemanager:azure-resourcemanager-hybridkubernetes;1.0.0;1.1.0-beta.2

sdk/containerregistry/azure-containers-containerregistry-perf/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>com.azure.resourcemanager</groupId>
5555
<artifactId>azure-resourcemanager-containerregistry</artifactId>
56-
<version>2.55.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;current} -->
56+
<version>2.55.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;current} -->
5757
</dependency>
5858
<dependency>
5959
<groupId>com.azure</groupId>

sdk/containerregistry/azure-containers-containerregistry/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>com.azure.resourcemanager</groupId>
7171
<artifactId>azure-resourcemanager-containerregistry</artifactId>
72-
<version>2.55.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;current} -->
72+
<version>2.55.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;current} -->
7373
<scope>test</scope>
7474
</dependency>
7575
<dependency>

sdk/containerregistry/azure-resourcemanager-containerregistry/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.55.0-beta.1 (Unreleased)
3+
## 2.55.0-beta.2 (Unreleased)
44

55
### Features Added
66

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

1111
### Other Changes
1212

13+
## 2.55.0-beta.1 (2025-12-04)
14+
15+
### Other Changes
16+
17+
#### Dependency Updates
18+
19+
- Updated `RegistryTasks` to `2025-03-01-preview`.
20+
1321
## 2.54.1 (2025-11-24)
1422

1523
### Other Changes

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<groupId>com.azure.resourcemanager</groupId>
1212
<artifactId>azure-resourcemanager-containerregistry</artifactId>
13-
<version>2.55.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;current} -->
13+
<version>2.55.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;current} -->
1414
<packaging>jar</packaging>
1515

1616
<name>Microsoft Azure SDK for Container Registry Management</name>

sdk/monitor/azure-resourcemanager-monitor/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/monitor/azure-resourcemanager-monitor",
5-
"Tag": "java/monitor/azure-resourcemanager-monitor_fb1a47b010"
5+
"Tag": "java/monitor/azure-resourcemanager-monitor_28c5828c2d"
66
}

0 commit comments

Comments
 (0)