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 @@ -259,6 +259,7 @@
<module>sdk/textanalytics</module>
<module>sdk/timeseriesinsights</module>
<module>sdk/tools</module>
<module>sdk/trafficmanager</module>
<module>sdk/translation</module>
<module>sdk/trustedsigning</module>
<module>sdk/vision</module>
Expand Down
2 changes: 1 addition & 1 deletion sdk/resourcemanager/api-specs.json
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
"args": "--tag=package-subscriptions-2016-06 --name-for-ungrouped-operations=ResourceName --stream-style-serialization=false --enable-sync-stack=false"
},
"trafficmanager": {
"dir": "azure-resourcemanager-trafficmanager",
"dir": "../trafficmanager/azure-resourcemanager-trafficmanager",
"source": "specification/trafficmanager/resource-manager/readme.md",
"package": "com.azure.resourcemanager.trafficmanager",
"args": "--tag=package-2022-04 --rename-model=EndpointType:EndpointTypes --enable-sync-stack=false"
Expand Down

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 @@ -176,7 +176,7 @@
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-trafficmanager</artifactId>
<version>2.54.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-trafficmanager;current} -->
<version>2.53.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-trafficmanager;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 @@ -23,7 +23,6 @@ trigger:
- sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml
- sdk/resourcemanager/azure-resourcemanager-sql/pom.xml
- sdk/resourcemanager/azure-resourcemanager-test/pom.xml
- sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml

pr:
branches:
Expand All @@ -49,7 +48,6 @@ pr:
- sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml
- sdk/resourcemanager/azure-resourcemanager-sql/pom.xml
- sdk/resourcemanager/azure-resourcemanager-test/pom.xml
- sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml

parameters:
- name: release_azureresourcemanager
Expand Down Expand Up @@ -88,10 +86,6 @@ parameters:
displayName: 'azure-resourcemanager-sql'
type: boolean
default: true
- name: release_azureresourcemanagertrafficmanager
displayName: 'azure-resourcemanager-trafficmanager'
type: boolean
default: true
- name: release_azureresourcemanagertest
displayName: 'azure-resourcemanager-test'
type: boolean
Expand Down Expand Up @@ -138,10 +132,6 @@ extends:
groupId: com.azure.resourcemanager
safeName: azureresourcemanagersql
releaseInBatch: ${{ parameters.release_azureresourcemanagersql }}
- name: azure-resourcemanager-trafficmanager
groupId: com.azure.resourcemanager
safeName: azureresourcemanagertrafficmanager
releaseInBatch: ${{ parameters.release_azureresourcemanagertrafficmanager }}
- name: azure-resourcemanager-test
groupId: com.azure.resourcemanager
safeName: azureresourcemanagertest
Expand Down
1 change: 0 additions & 1 deletion sdk/resourcemanager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<module>azure-resourcemanager-samples</module>
<module>azure-resourcemanager-servicebus</module>
<module>azure-resourcemanager-sql</module>
<module>azure-resourcemanager-trafficmanager</module>
<module>azure-resourcemanager-test</module>
</modules>
</project>
2 changes: 1 addition & 1 deletion sdk/spring/pipeline/ClientFromSourcePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<module>../../resourcemanager/azure-resourcemanager-sql/pom.xml</module>
<module>../../storage/azure-resourcemanager-storage/pom.xml</module>
<module>../../resourcemanager/azure-resourcemanager-test/pom.xml</module>
<module>../../resourcemanager/azure-resourcemanager-trafficmanager/pom.xml</module>
<module>../../trafficmanager/azure-resourcemanager-trafficmanager/pom.xml</module>
<module>../../resourcemanager/azure-resourcemanager/pom.xml</module>
<module>../../serialization/azure-json/pom.xml</module>
<module>../../serialization/azure-xml/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 @@ -59,6 +59,7 @@ jobs:
- 'sdk/servicebus'
- 'sdk/storage'
- 'sdk/tools'
- 'sdk/trafficmanager/azure-resourcemanager-trafficmanager'
- task: Maven@4
displayName: 'Install Unreleased Dependencies'
inputs:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "java",
"TagPrefix": "java/trafficmanager/azure-resourcemanager-trafficmanager",
"Tag": "java/trafficmanager/azure-resourcemanager-trafficmanager_46e6f1c0fb"
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<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>org.slf4j</groupId>
Expand Down Expand Up @@ -91,7 +91,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
44 changes: 44 additions & 0 deletions sdk/trafficmanager/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.

trigger:
branches:
include:
- main
- hotfix/*
- release/*
paths:
include:
- sdk/trafficmanager/
exclude:
- sdk/trafficmanager/pom.xml
- sdk/trafficmanager/azure-resourcemanager-trafficmanager/pom.xml

pr:
branches:
include:
- main
- feature/*
- hotfix/*
- release/*
paths:
include:
- sdk/trafficmanager/
exclude:
- sdk/trafficmanager/pom.xml
- sdk/trafficmanager/azure-resourcemanager-trafficmanager/pom.xml

parameters:
- name: release_azureresourcemanagertrafficmanager
displayName: 'azure-resourcemanager-trafficmanager'
type: boolean
default: false

extends:
template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
parameters:
ServiceDirectory: trafficmanager
Artifacts:
- name: azure-resourcemanager-trafficmanager
groupId: com.azure.resourcemanager
safeName: azureresourcemanagertrafficmanager
releaseInBatch: ${{ parameters.release_azureresourcemanagertrafficmanager }}
14 changes: 14 additions & 0 deletions sdk/trafficmanager/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-trafficmanager-service</artifactId>
<packaging>pom</packaging>
<version>1.0.0</version><!-- Need not change for every release-->
<modules>
<module>azure-resourcemanager-trafficmanager</module>
</modules>
</project>