Skip to content

Commit

Permalink
Merge branch 'main' into mgmt_avs-via-tsp
Browse files Browse the repository at this point in the history
  • Loading branch information
weidongxu-microsoft committed Jul 22, 2024
2 parents e8b4ca4 + bf4b084 commit be5fd0f
Show file tree
Hide file tree
Showing 7,851 changed files with 265,639 additions and 184,479 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
18 changes: 14 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
# ServiceOwners: @bingisbestest @nerajput1607

# ServiceLabel: %Cognitive - Translator
# ServiceOwners: @swmachan
# ServiceOwners: @swmachan @MikeyMCZ

# ServiceLabel: %Cognitive - Speech
# ServiceOwners: @rhurey
Expand Down Expand Up @@ -458,6 +458,10 @@
# PRLabel: %Event Hubs
/sdk/eventhubs/microsoft-azure-eventhubs/ @sjkwak

# ServiceLabel: %Cognitive - Face
# PRLabel: %Cognitive - Face
/sdk/face/azure-ai-vision-face/ @leareai

# ServiceLabel: %Functions
# ServiceOwners: @ahmedelnably @fabiocav

Expand Down Expand Up @@ -513,8 +517,6 @@
# PRLabel: %Load Testing
/sdk/loadtesting/ @Harshan01 @prativen

/sdk/loganalytics/microsoft-azure-loganalytics/ @ischrei

# ServiceLabel: %Logic App
# ServiceOwners: @Azure/azure-logicapps-team

Expand Down Expand Up @@ -773,6 +775,10 @@
# AzureSdkOwners: @jairmyree
# ServiceOwners: @klaaslanghout

# ServiceLabel: %Text Translation
# PRLabel: %Text Translation
/sdk/translation/azure-ai-translation-text/ @MikeyMCZ

# PRLabel: %EngSys
/sdk/template/ @hallipr @weshaggard @JimSuplizio

Expand Down Expand Up @@ -860,13 +866,14 @@
# ######## Eng Sys ########

/eng/ @hallipr @weshaggard @benbp @JimSuplizio
/eng/automation/ @weidongxu-microsoft @haolingdong-msft @XiaofeiCao @arthurma1978 @hallipr @weshaggard @benbp @JimSuplizio
/eng/bomgenerator/ @vcolin7 @alzimmermsft @srnagar @jonathangiles
/eng/code-quality-reports/ @mssfang @JonathanGiles @alzimmermsft @srnagar
/eng/common/ @Azure/azure-sdk-eng
/eng/mgmt/ @weidongxu-microsoft @haolingdong-msft @XiaofeiCao @arthurma1978 @hallipr @weshaggard @benbp @JimSuplizio
/eng/spotbugs-aggregate-report/ @srnagar @JonathanGiles
/eng/versioning/ @alzimmermsft @samvaity @g2vinay @JimSuplizio
/eng/versioning/external_dependencies.txt @alzimmermsft @samvaity @g2vinay @jonathangiles @rujche @netyyyy @saragluna @moarychan
/.github/workflows/ @Azure/azure-sdk-eng

# Removing owners for these files to not require codeowner approval for changes to them given they are shared with project
/eng/versioning/version_client.txt
Expand All @@ -875,3 +882,6 @@
# Add owners for notifications for specific pipelines
/eng/pipelines/aggregate-reports.yml @joshfree @jonathangiles
/eng/common/pipelines/codeowners-linter.yml @alzimmermsft @srnagar @lmolkova

# Add Cosmos source owners as the owners of their specialized matrix
/eng/pipelines/templates/stages/cosmos-emulator-matrix.json @kushagraThapar @FabianMeiswinkel @kirankumarkolli @xinlian12 @milismsft @aayush3011 @simorenoh @jeet1995 @Pilchie
4 changes: 2 additions & 2 deletions .github/workflows/event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240610.2
--version 1.0.0-dev.20240708.1
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240610.2
--version 1.0.0-dev.20240708.1
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240610.2
--version 1.0.0-dev.20240708.1
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
97 changes: 83 additions & 14 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
"sdk/appconfiguration/azure-spring-cloud-feature-management-web/**",
"sdk/appconfiguration/azure-spring-cloud-feature-management/**",
"sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/**",
"sdk/appconfiguration/azure-data-appconfiguration/**",
"sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/**",
"sdk/boms/azure-sdk-bom/**",
"sdk/boms/azure-sdk-template-bom/**",
Expand Down Expand Up @@ -161,7 +160,8 @@
"sdk/keyvault/azure-security-keyvault-keys/**",
"sdk/keyvault/azure-security-keyvault-secrets/**",
"sdk/keyvault/azure-security-test-keyvault-jca/**",
"sdk/keyvault/test-resources.json",
"sdk/keyvault/test-resources/test-resources.json",
"sdk/keyvault/test-resources-jca/test-resources.json",
"sdk/formrecognizer/azure-ai-formrecognizer/**",
"sdk/core/azure-core/**",
"sdk/documentintelligence/azure-ai-documentintelligence/**",
Expand Down Expand Up @@ -969,11 +969,13 @@
"Milli",
"qpid",
"unretriable"
]
]
},
{
"filename": "sdk/spring/scripts/**",
"words": [
"agroal",
"alluxio",
"antlr",
"arquillian",
"aspectj",
Expand All @@ -982,37 +984,55 @@
"aspectjweaver",
"assertj",
"astbuilder",
"asyncer",
"athenz",
"atomikos",
"awaitility",
"awspring",
"bcfips",
"Borca",
"brotli",
"bson",
"cbor",
"chromadb",
"cockroachdb",
"codehaus",
"collectd",
"crac",
"cratedb",
"cyclonedx",
"datastax",
"dbcp",
"debezium",
"deser",
"dynalite",
"dynatrace",
"ecwid",
"ehcache",
"epoll",
"fcgi",
"flywaydb",
"gcloud",
"gimap",
"ginq",
"groovysh",
"guice",
"Hikari",
"hikaricp",
"hivemq",
"hocon",
"hornetq",
"hppc",
"hqclient",
"hsqldb",
"humio",
"hystrix",
"inmemory",
"infinispan",
"informix",
"integ",
"iostreams",
"istack",
"istio",
"itest",
"itests",
Expand All @@ -1024,6 +1044,8 @@
"jaxrs",
"jaxws",
"jcache",
"jcloud",
"jclouds",
"jdbi",
"jdom",
"jgit",
Expand All @@ -1033,37 +1055,54 @@
"johnzon",
"jooq",
"jpamodelgen",
"jspc",
"jstl",
"jtds",
"jvnet",
"kahadb",
"kairos",
"karaf",
"knative",
"kotlinx",
"kqueue",
"kryo",
"kustomize",
"ldif",
"leveldb",
"liquibase",
"milvus",
"minio",
"mockmvc",
"moshi",
"moxy",
"mqtt",
"mrbean",
"mssql",
"mssqlserver",
"mxab",
"nekohtml",
"nosql",
"ocsp",
"ojdbc",
"okcurl",
"okio",
"ollama",
"openfga",
"openmldb",
"opentsdb",
"orai",
"orientdb",
"osdt",
"osgi",
"otel",
"otlp",
"pcollections",
"proxool",
"qdrant",
"qpack",
"quarkus",
"questdb",
"quic",
"rabbitmq",
"reactivex",
"remoting",
Expand All @@ -1081,26 +1120,61 @@
"specto",
"squareup",
"statsd",
"stax",
"staxex",
"stree",
"sybasease",
"tcnative",
"tekton",
"testng",
"tidb",
"tmatesoft",
"toxiproxy",
"trino",
"trogdor",
"txwc",
"uberjar",
"ultraq",
"unboundid",
"vavr",
"vertx",
"vibur",
"wadl",
"weaviate",
"webmvc",
"xerial",
"xmpp",
"xsom",
"yasson",
"yugabytedb",
"zaxxer"
]
},
{
"filename": "sdk/spring/**.md",
"words": [
"Dcheckstyle",
"Dcodesnippet",
"Djacoco",
"Dparallel",
"Drevapi",
"Dskip",
"Dspotbugs",
"Pdev"
]
},
{
"filename": "sdk/spring/**/*.xml",
"words": [
"failondeprecatedstatus"
]
},
{
"filename": "sdk/spring/**.yml",
"words": [
"failondeprecatedstatus"
]
},
{
"filename": "sdk/spring/**",
"words": [
Expand Down Expand Up @@ -1143,21 +1217,16 @@
"VCAP",
"xiada",
"yiliu",
"usgovcloudapi"
"usgovcloudapi",
"Pnative",
"Djava",
"sbmvn"
]
},
{
"filename": "sdk/spring/**.md",
"filename": "sdk/spring/spring-cloud-azure-starter-monitor/**.md",
"words": [
"Dcheckstyle",
"Dcodesnippet",
"Djacoco",
"Dparallel",
"Drevapi",
"Dskip",
"Dspotbugs",
"Pdev",
"Djava"
"Djava"
]
},
{
Expand Down
31 changes: 27 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ Merging Pull Requests (for project contributors with write access)
- add `MAVEN_HOME` to environment variables

>**Note:** If you ran into "long path" issue on `Windows`, enable paths longer than 260 characters by: <br><br>
1.- Run this as Administrator on a command prompt:<br>
1.- Run this as Administrator on a command prompt:<br>
`REG ADD HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t REG_DWORD /d 1`<br>*(might need to type `yes` to override key if it already exists)*<br><br>
2.- Set up `git` by running:<br> `git config --system core.longpaths true`
### Building and Unit Testing

Refer to the [build wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Building) for learning how to build Java SDKs
and the [unit testing wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Unit-Testing) for guidelines on unit
and the [unit testing wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Unit-Testing) for guidelines on unit
testing.

### Live testing
Expand Down Expand Up @@ -93,7 +93,7 @@ When building locally you might run into a Checkstyle such as the following:

```
Execution default of goal org.apache.maven.plugins:maven-checkstyle-plugin:3.1.0:check failed:
Plugin org.apache.maven.plugins:maven-checkstyle-plugin:3.1.0 or one of its dependencies could not be resolved:
Plugin org.apache.maven.plugins:maven-checkstyle-plugin:3.1.0 or one of its dependencies could not be resolved:
Could not find artifact com.azure:sdk-build-tools:jar:1.0.0 in ossrh (https://oss.sonatype.org/content/repositories/snapshots/)
```

Expand All @@ -115,6 +115,29 @@ The dependency-version should be set to the most recent released version and the

Note: In the case of a new artifact both versions will be the same. In the case of a released artifact, the dependecny version should be the latest released version.

### Supported GroupIds and publishing

We no longer publish directly to Maven Central, any publishing is done through ESRP. Libraries published need to conform to one of the groupIds that we can publish to. Here is the list of accepted groupdIs:

- "com.microsoft"
- "com.azure.*"
- "com.azure"
- "com.microsoft.azure"
- "com.microsoft.azure.cognitiveservices"
- "com.microsoft.azure.functions"
- "com.microsoft.azure.kusto"
- "com.microsoft.azure.sdk.iot"
- "com.microsoft.azure.sdk.iot.provisioning"
- "com.microsoft.commondatamodel"
- "com.windowsazure"
- "com.microsoft.sqlserver"
- "com.microsoft.spring"
- "com.microsoft.servicefabric"
- "com.microsoft.rest"
- "io.clientcore"

Note: This list will be replaced with a link to a page created by ESRP providing a UI where GroupIds can be cheked and new ones requested if needed.

### Libraries vs External Dependencies

Libraries refer to things that are built and released as part of the Azure SDK. Libraries have a current version and a dependency version.
Expand Down Expand Up @@ -193,7 +216,7 @@ After the unreleased version of `com.azure:azure-core` was released but before `

For general packaging versioning policies see [Package Versioning](https://azure.github.io/azure-sdk/policies_releases.html#package-versioning) and see [Java](https://azure.github.io/azure-sdk/policies_releases.html#java) for specific rules used in this repo.

While some Java projects use SNAPSHOT versions for nightly builds, we have opted not to use that convention because it has proven to be very unreliable in our scenarios. For example, if we use SNAPSHOT versions in our pom.xml files that usually ends up becoming viral throughout our entire repo and we want to more tightly control our versioning, especially our dependency versioning. On top of the viral nature, we have experienced a lot of network reliability issues when consuming SNAPSHOT versions from Maven central so we want to avoid this reliability issue in our build pipelines.
While some Java projects use SNAPSHOT versions for nightly builds, we have opted not to use that convention because it has proven to be very unreliable in our scenarios. For example, if we use SNAPSHOT versions in our pom.xml files that usually ends up becoming viral throughout our entire repo and we want to more tightly control our versioning, especially our dependency versioning. On top of the viral nature, we have experienced a lot of network reliability issues when consuming SNAPSHOT versions from Maven central so we want to avoid this reliability issue in our build pipelines.

Given we don't use SNAPSHOT versions in our pom.xml files we generally have the version currently under development committed to the repo in the pom.xml file. This means if you are looking at our active development code for the version you will see a version that is not yet published to Maven central. If you want to try out our packages under development, you should look for our latest alpha build (see Dev Feed section below).

Expand Down
Loading

0 comments on commit be5fd0f

Please sign in to comment.