Skip to content

Commit 96bd961

Browse files
authored
Consolidate documentation into docs/ hub (#48730)
1 parent 12442c2 commit 96bd961

39 files changed

Lines changed: 4215 additions & 163 deletions

.vscode/cspell.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@
210210
],
211211
"words": [
212212
"adal",
213+
"adfs",
214+
"ADFS",
213215
"agentic",
214216
"akhtabar",
215217
"alzimmer",
@@ -234,6 +236,7 @@
234236
"Dartifact",
235237
"Dgpg",
236238
"Dremote",
239+
"Drevapi",
237240
"Dskip",
238241
"mvnw",
239242
"TBLPROPERTIES",
@@ -270,9 +273,16 @@
270273
"decryptor",
271274
"Deserialization",
272275
"destfile",
276+
"Dcheckstyle",
273277
"Dgenerate",
278+
"Dinclude",
274279
"Dincludes",
280+
"Djacoco",
281+
"Djava",
275282
"Dshade",
283+
"Dspotbugs",
284+
"Dsurefire",
285+
"Dtest",
276286
"Dverbose",
277287
"dicom",
278288
"doclint",
@@ -335,6 +345,7 @@
335345
"jtoken",
336346
"jtokkit",
337347
"keyvault",
348+
"kdbx",
338349
"kasobol",
339350
"knuddelsgmbh",
340351
"kube",
@@ -355,6 +366,9 @@
355366
"LOINC",
356367
"Lucene",
357368
"mgmt",
369+
"mqtt",
370+
"MQTT",
371+
"mypackage",
358372
"mibps",
359373
"Mirena",
360374
"Mockito",
@@ -418,6 +432,7 @@
418432
"substringof",
419433
"Sybase",
420434
"tcnative",
435+
"Temurin",
421436
"testdb",
422437
"TFVC",
423438
"timeframe",

CONTRIBUTING.md

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Thank you for your interest in contributing to Azure SDK for Java.
1111

1212
- After cloning the repo, copy the [pre-commit hooks file](https://github.com/Azure/azure-sdk-for-java/tree/main/eng/scripts/pre-commit) (located at `eng/scripts/pre-commit`) to your local `.git/hooks/` directory. This will run some validations before your changes are committed.
1313

14-
- Refer to the [wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Building#testing-for-spotbugs-and-checkstyle-issues) to learn about how Azure SDK for java generates CheckStyle, SpotBugs, Jacoco, and JavaDoc reports.
14+
- Refer to the [Code Quality guide](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/docs/contributor/code-quality.md) to learn about how Azure SDK for Java generates CheckStyle, SpotBugs, JaCoCo, and JavaDoc reports.
1515

16-
- There are two Maven projects in the repo. Refer to the [wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Building#pomclientxml-vs-pomdataxml) to learn about project structure for each.
16+
- There are two Maven projects in the repo. Refer to the [Building guide](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/docs/contributor/building.md) to learn about project structure for each.
1717

1818
Pull Requests
1919
-------------
@@ -46,11 +46,13 @@ Merging Pull Requests (for project contributors with write access)
4646

4747
### Pre-requisites
4848

49-
- Install Java Development Kit 8 or 11
49+
- Install Java Development Kit 8, 11, 17, or 21 (Java 21 LTS recommended for local development)
5050
- add `JAVA_HOME` to environment variables
5151
- Install [Maven](https://maven.apache.org/download.cgi)
5252
- add `MAVEN_HOME` to environment variables
5353

54+
See [Getting Started](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/docs/contributor/getting-started.md) for detailed environment setup instructions.
55+
5456
>**Note:** If you ran into "long path" issue on `Windows`, enable paths longer than 260 characters by: <br><br>
5557
1.- Run this as Administrator on a command prompt:<br>
5658
`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>
@@ -147,9 +149,9 @@ If you encounter a `401 Unauthorized` error when running Maven commands:
147149

148150
### Building and Unit Testing
149151

150-
Refer to the [build wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Building) for learning how to build Java SDKs
151-
and the [unit testing wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Unit-Testing) for guidelines on unit
152-
testing.
152+
Refer to the [Building guide](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/docs/contributor/building.md) for Maven commands to build the SDK,
153+
and the [Unit Testing guide](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/docs/contributor/unit-testing.md) for guidelines on writing and running unit tests.
154+
153155

154156
### Live testing
155157

@@ -162,7 +164,7 @@ To see what resources will be deployed for a live service, check the
162164
`test-resources.json` ARM template files in the service you wish to deploy for
163165
testing, for example `sdk\keyvault\test-resources.json`.
164166

165-
To deploy live resources for testing use the steps documented in [`Example 1 of New-TestResources.ps1`](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/common/TestResources/New-TestResources.ps1.md#example-1)
167+
To deploy live resources for testing use the steps documented in [`Example 1 of New-TestResources.ps1`](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/eng/common/TestResources/New-TestResources.ps1.md#example-1)
166168
to set up a service principal and deploy live testing resources.
167169

168170
The script will provide instructions for setting environment variables before
@@ -180,7 +182,7 @@ information or instructions.
180182

181183
## Versions and versioning
182184

183-
Tooling has been introduced to centralize versioning and help ease the pain of updating artifact versions in POM and README files. Under the eng\versioning directory there exists a version text file for libraries ([version_client.txt](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/versioning/version_client.txt)).
185+
Tooling has been introduced to centralize versioning and help ease the pain of updating artifact versions in POM and README files. Under the eng\versioning directory there exists a version text file for libraries ([version_client.txt](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/eng/versioning/version_client.txt)).
184186
The format of the version files is as follows:
185187

186188
`groupId:artifactId;dependency-version;current-version`
@@ -240,7 +242,7 @@ Similarly, libraries built as part of the same pipeline, that have interdependen
240242
azure-batch pipeline when `com.azure:azure-storage-blob` is declared as a dependency of `com.azure:azure-storage-blob-batch` it should be the *Current* version.
241243

242244
**An example of an Unreleased Dependency version:** Additive, not breaking, API changes have been made to `com.azure:azure-core`. `com.azure:azure-storage-blob` has a dependency on `com.azure:azure-core` and requires the additive
243-
API change that has not yet been released. An unreleased entry needs to be created in [version_client.txt](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/versioning/version_client.txt), under the unreleased section, with the following format: `unreleased_<groupId>:<artifactId>;dependency-version`,
245+
API change that has not yet been released. An unreleased entry needs to be created in [version_client.txt](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/eng/versioning/version_client.txt), under the unreleased section, with the following format: `unreleased_<groupId>:<artifactId>;dependency-version`,
244246
in this example that would be `unreleased_com.azure:azure-core;1.2.0` (this should match the 'current' version of core). The dependency update tags in the pom files that required this dependency would now reference
245247
`{x-version-update;unreleased_com.azure:azure-core;dependency}`. Once the updated library has been released the unreleased dependency version should be removed and the POM file update tags should be referencing the released version.
246248

@@ -284,7 +286,7 @@ Let's say we've GA'd and I need to tick up the version of azure-storage librarie
284286
1. I'd open up eng\versioning\version_client.txt and update the current-versions of the libraries that are built and released as part of the azure storage pipeline. This list can be found in pom.service.xml under the sdk/storage directory.
285287
It's worth noting that any module entry starting with "../" are external module dependencies and not something that's released as part of the pipeline. Dependencies for library components outside a given area would be downloading the
286288
appropriate dependency from Maven like we do for external dependencies.
287-
2. Execute the update_versions python script from the root of the enlistment. The exact syntax and commands will vary based upon what is being changed and some examples can be found in the use cases in the [update_versions.py](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/versioning/update_versions.py#L6) file.
289+
2. Execute the update_versions python script from the root of the enlistment. The exact syntax and commands will vary based upon what is being changed and some examples can be found in the use cases in the [update_versions.py](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/eng/versioning/update_versions.py#L6) file.
288290
3. Review and submit a PR with the modified files.
289291

290292
### Next steps: Management plane
@@ -296,11 +298,11 @@ Let's say we've GA'd and I need to tick up the version of azure-storage librarie
296298
This is where the `unreleased_` dependency tags come into play. Using the Unreleased Dependency example above, where `com.azure:azure-storage-blob` has a dependency on an unreleased `com.azure:azure-core`:
297299

298300
- [ ] Make the additive changes to `com.azure:azure-core`
299-
- [ ] In [version_client.txt](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/versioning/version_client.txt) add the entry for the unreleased azure core in the unreleased section at the bottom of the file. The entry would look like `unreleased_com.azure:azure-core;<version>`.
301+
- [ ] In [version_client.txt](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/eng/versioning/version_client.txt) add the entry for the unreleased azure core in the unreleased section at the bottom of the file. The entry would look like `unreleased_com.azure:azure-core;<version>`.
300302
Note: The version of the library referenced in the unreleased version tag should match the current version of that library.
301303
- [ ] In the pom.xml file for `com.azure:azure-storage-blob`, the dependency tag for `com.azure:azure-core` which was originally `{x-version-update;com.azure:azure-core-test;dependency}` would now become `{x-version-update;unreleased_com.azure:azure-core-test;dependency}`
302304
After the unreleased version of `com.azure:azure-core` was released but before `com.azure:azure-storage-blob` has been released.
303-
- [ ] In [version_client.txt](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/versioning/version_client.txt) the dependency version of `com.azure:azure-core` would become the released version and the "unreleased_" entry, at this time, would be removed.
305+
- [ ] In [version_client.txt](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/eng/versioning/version_client.txt) the dependency version of `com.azure:azure-core` would become the released version and the "unreleased_" entry, at this time, would be removed.
304306
- [ ] In the pom.xml file for `com.azure:azure-storage-blob`, the dependency tag for `com.azure:azure-core` would get changed back to `{x-version-update;com.azure:azure-core-test;dependency}`
305307

306308
## Packaging Versioning

README.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ Format of the release tags are `<package-name>_<package-version>`. For more info
6767

6868
For details on contributing to this repository, see the [contributing guide](https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md).
6969

70+
The consolidated documentation hub for contributors (building, testing, versioning, release checklist, etc.) is at [`docs/`](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/docs/README.md).
71+
7072
This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, view [Microsoft's CLA](https://cla.microsoft.com).
7173

7274
When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repositories using our CLA.
@@ -78,7 +80,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
7880
Many people all over the world have helped make this project better. You'll want to check out:
7981

8082
- [What are some good first issues for new contributors to the repo?](https://github.com/azure/azure-sdk-for-java/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
81-
- [How to build and test your change](https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md#developer-guide)
83+
- [How to build and test your change](https://github.com/g2vinay/azure-sdk-for-java/blob/consolidate-docs-v2/docs/contributor/building.md)
8284
- [How you can make a change happen!](https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md#pull-requests)
8385
- Frequently Asked Questions (FAQ) and Conceptual Topics in the detailed [Azure SDK for Java wiki](https://github.com/azure/azure-sdk-for-java/wiki).
8486

@@ -92,12 +94,7 @@ Azure SDK for Java is licensed under the [MIT](https://github.com/Azure/azure-sd
9294

9395
<!-- Links -->
9496
[java_guidelines]: https://azure.github.io/azure-sdk/java_introduction.html
95-
[latest_release_page]: https://azure.github.io/azure-sdk/releases/2020-03/java.html
96-
[feb_20_release_page]: https://azure.github.io/azure-sdk/releases/2020-02/java.html
97-
[jan_20_release_page]: https://azure.github.io/azure-sdk/releases/2020-01/java.html
98-
[dec_19_release_page]: https://azure.github.io/azure-sdk/releases/2019-12/java.html
99-
[nov_19_release_page]: https://azure.github.io/azure-sdk/releases/2019-11/java.html
100-
[oct_19_release_page]: https://azure.github.io/azure-sdk/releases/2019-10-11/java.html
97+
[latest_release_page]: https://azure.github.io/azure-sdk/releases/latest/java.html
10198
[sep_19_release_page]: https://azure.github.io/azure-sdk/releases/2019-09-17/java.html
10299
[aug_19_release_page]: https://azure.github.io/azure-sdk/releases/2019-08-06/java.html
103100
[jul_19_release_page]: https://azure.github.io/azure-sdk/releases/2019-07-10/java.html

doc/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

doc/deprecation_process.md

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)