Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
<module>sdk/mongocluster</module>
<module>sdk/mongodbatlas</module>
<module>sdk/monitor</module>
<module>sdk/msi</module>
<module>sdk/mysql</module>
<module>sdk/mysqlflexibleserver</module>
<module>sdk/neonpostgres</module>
Expand Down
6 changes: 6 additions & 0 deletions sdk/msi/azure-resourcemanager-msi/assets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "java",
"TagPrefix": "java/msi/azure-resourcemanager-msi",
"Tag": "java/msi/azure-resourcemanager-msi_dd4ddd6b42"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) Microsoft Corporation. All rights reserved.
Licensed under the MIT License. See License.txt in the project root for
license information.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Expand Down Expand Up @@ -57,12 +61,12 @@
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-resources</artifactId>
<version>2.54.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
<version>2.53.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-authorization</artifactId>
<version>2.54.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-authorization;current} -->
<version>2.53.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-authorization;dependency} -->
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -95,7 +99,7 @@
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-test</artifactId>
<version>2.0.0-beta.3</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-test;current} -->
<version>2.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-test;dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
38 changes: 38 additions & 0 deletions sdk/msi/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.

trigger:
branches:
include:
- main
- hotfix/*
- release/*
paths:
include:
- sdk/msi/

pr:
branches:
include:
- main
- feature/*
- hotfix/*
- release/*
paths:
include:
- sdk/msi/

parameters:
- name: release_azureresourcemanagermsi
displayName: 'azure-resourcemanager-msi'
type: boolean
default: false

extends:
template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
parameters:
ServiceDirectory: msi
Artifacts:
- name: azure-resourcemanager-msi
groupId: com.azure.resourcemanager
safeName: azureresourcemanagermsi
releaseInBatch: ${{ parameters.release_azureresourcemanagermsi }}
14 changes: 14 additions & 0 deletions sdk/msi/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!-- Copyright (c) Microsoft Corporation. All rights reserved.
Licensed under the MIT License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.azure</groupId>
<artifactId>azure-msi-service</artifactId>
<packaging>pom</packaging>
<version>1.0.0</version><!-- Need not change for every release-->

<modules>
<module>azure-resourcemanager-msi</module>
</modules>
</project>
2 changes: 1 addition & 1 deletion sdk/resourcemanager/api-specs.json
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@
"args": "--tag=package-2022-04 --rename-model=EndpointType:EndpointTypes --enable-sync-stack=false"
},
"msi": {
"dir": "azure-resourcemanager-msi",
"dir": "../msi/azure-resourcemanager-msi",
"source": "specification/msi/resource-manager/readme.md",
"package": "com.azure.resourcemanager.msi",
"args": "--tag=package-2024-11-30 --add-client-flatten=Identity --enable-sync-stack=false"
Expand Down
6 changes: 0 additions & 6 deletions sdk/resourcemanager/azure-resourcemanager-msi/assets.json

This file was deleted.

2 changes: 1 addition & 1 deletion sdk/resourcemanager/azure-resourcemanager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-msi</artifactId>
<version>2.54.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;current} -->
<version>2.53.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;dependency} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
Expand Down
10 changes: 0 additions & 10 deletions sdk/resourcemanager/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ trigger:
- sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml
- sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml
- sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml
- sdk/resourcemanager/azure-resourcemanager-msi/pom.xml
- sdk/resourcemanager/azure-resourcemanager-perf/pom.xml
- sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml
- sdk/resourcemanager/azure-resourcemanager-redis/pom.xml
Expand Down Expand Up @@ -46,7 +45,6 @@ pr:
- sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml
- sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml
- sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml
- sdk/resourcemanager/azure-resourcemanager-msi/pom.xml
- sdk/resourcemanager/azure-resourcemanager-perf/pom.xml
- sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml
- sdk/resourcemanager/azure-resourcemanager-redis/pom.xml
Expand Down Expand Up @@ -82,10 +80,6 @@ parameters:
displayName: 'azure-resourcemanager-monitor'
type: boolean
default: true
- name: release_azureresourcemanagermsi
displayName: 'azure-resourcemanager-msi'
type: boolean
default: true
- name: release_azureresourcemanagerprivatedns
displayName: 'azure-resourcemanager-privatedns'
type: boolean
Expand Down Expand Up @@ -144,10 +138,6 @@ extends:
groupId: com.azure.resourcemanager
safeName: azureresourcemanagermonitor
releaseInBatch: ${{ parameters.release_azureresourcemanagermonitor }}
- name: azure-resourcemanager-msi
groupId: com.azure.resourcemanager
safeName: azureresourcemanagermsi
releaseInBatch: ${{ parameters.release_azureresourcemanagermsi }}
- name: azure-resourcemanager-privatedns
groupId: com.azure.resourcemanager
safeName: azureresourcemanagerprivatedns
Expand Down
1 change: 0 additions & 1 deletion sdk/resourcemanager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<module>azure-resourcemanager-cosmos</module>
<module>azure-resourcemanager-eventhubs</module>
<module>azure-resourcemanager-monitor</module>
<module>azure-resourcemanager-msi</module>
<module>azure-resourcemanager-perf</module>
<module>azure-resourcemanager-privatedns</module>
<module>azure-resourcemanager-resources</module>
Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/pipeline/ClientFromSourcePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<module>../../resourcemanager/azure-resourcemanager-eventhubs/pom.xml</module>
<module>../../keyvault/azure-resourcemanager-keyvault/pom.xml</module>
<module>../../resourcemanager/azure-resourcemanager-monitor/pom.xml</module>
<module>../../resourcemanager/azure-resourcemanager-msi/pom.xml</module>
<module>../../msi/azure-resourcemanager-msi/pom.xml</module>
<module>../../network/azure-resourcemanager-network/pom.xml</module>
<module>../../resourcemanager/azure-resourcemanager-privatedns/pom.xml</module>
<module>../../resourcemanager/azure-resourcemanager-redis/pom.xml</module>
Expand Down
1 change: 1 addition & 0 deletions sdk/spring/pipeline/compatibility-tests-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
- 'sdk/jdbc'
- 'sdk/keyvault'
- 'sdk/monitor'
- 'sdk/msi/azure-resourcemanager-msi'
- 'sdk/network'
- 'sdk/spring'
- 'sdk/parents/azure-client-sdk-parent'
Expand Down
Loading