From f8d77ab47060d42e837181f05f0c4f3610e542bb Mon Sep 17 00:00:00 2001 From: zhihaoguo Date: Tue, 8 Feb 2022 16:06:20 +0800 Subject: [PATCH 1/7] - update links --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7bb34b41..13bc87bef 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ [spring-cloud-azure-appconfiguration-config:1.3.0]: https://search.maven.org/artifact/com.microsoft.azure/spring-cloud-azure-appconfiguration-config/1.3.0/jar [spring-cloud-starter-azure-appconfiguration-config:1.3.0]: https://search.maven.org/artifact/com.microsoft.azure/spring-cloud-starter-azure-appconfiguration-config/1.3.0/jar [spring-cloud-azure-starter-keyvault-secrets:4.0.0-beta.2]: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-starter-keyvault-secrets/4.0.0-beta.2/jar -[azure-spring-boot-starter-keyvault-certificates:3.2.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-keyvault-certificates/3.10.0/jar +[azure-spring-boot-starter-keyvault-certificates:3.10.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-keyvault-certificates/3.10.0/jar [spring-cloud-azure-stream-binder-eventhubs:4.0.0-beta.2]: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-stream-binder-eventhubs/4.0.0-beta.2/jar [spring-cloud-azure-starter-integration-eventhubs:4.0.0-beta.2]: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-starter-integration-eventhubs/4.0.0-beta.2/jar [spring-cloud-azure-stream-binder-servicebus:4.0.0-beta.2]: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-stream-binder-servicebus/4.0.0-beta.2/jar From 9faf3e2177565ec7f2140a80391d907eedc921d1 Mon Sep 17 00:00:00 2001 From: zhihaoguo Date: Tue, 8 Feb 2022 16:49:49 +0800 Subject: [PATCH 2/7] - update root README.md --- README.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/README.md b/README.md index 13bc87bef..b73a5a8cf 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ +# Spring Cloud Azure Samples +This is a sample project for demonstration purposes. +The project demonstrates how to use Spring Cloud Azure to develop applications. +The sample project contains 42 samples, and it still grows. +The samples are grouped by Azure services and Spring Cloud Azure libraries. +For example: [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces), it located in the path [/servicebus/spring-cloud-azure-starter-integration-servicebus]. + ## Current Branch Supported versions - [spring-boot-dependencies:2.5.2](https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-dependencies/2.5.2/spring-boot-dependencies-2.5.2.pom). @@ -53,6 +60,26 @@ | Storage | [spring-cloud-azure-starter-integration-storage-queue:4.0.0-beta.2] | [storage-queue-integration](storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration) | | Storage | [spring-cloud-azure-starter-integration-storage-queue:4.0.0-beta.2] | [storage-queue-operation](storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation) | +## Running Samples +With terraform scripts and default Token Credential, most samples in the project can be run with the same 4 steps below: + +```shell +# Step1 Initialize Terraform +terraform -chdir=./terraform init + +# Step2 Apply your Terraform Configuration +terraform -chdir=./terraform apply -auto-approve + +# Step3 Export Environment Valuables +source ./terraform/setup_env.sh + +# Step4 Run With Maven +mvn clean spring-boot:run +``` +It supports both Bash environment and PowerShell environment. +Please refer to README.md under each sample for detailed information. + + ### [azure-spring-boot-starter-cosmos:3.9.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-cosmos/3.9.0/jar [spring-cloud-azure-feature-management:1.3.0]: https://search.maven.org/artifact/com.microsoft.azure/spring-cloud-azure-feature-management/1.3.0/jar From cd412dd351b71bf31aa877c756327941644661a6 Mon Sep 17 00:00:00 2001 From: zhihaoguo Date: Tue, 8 Feb 2022 17:00:15 +0800 Subject: [PATCH 3/7] - update links root README.md --- README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b73a5a8cf..4770809af 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,14 @@ # Spring Cloud Azure Samples This is a sample project for demonstration purposes. -The project demonstrates how to use Spring Cloud Azure to develop applications. +The project demonstrates how to use [Spring Cloud Azure](https://microsoft.github.io/spring-cloud-azure/current/reference/html/index.html) to develop applications. The sample project contains 42 samples, and it still grows. -The samples are grouped by Azure services and Spring Cloud Azure libraries. -For example: [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces), it located in the path [/servicebus/spring-cloud-azure-starter-integration-servicebus]. +These samples are grouped by Azure services and Spring Cloud Azure libraries. + +> For example: [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces), it located in the path `/servicebus/spring-cloud-azure-starter-integration-servicebus`. +> +> **servicebus**: The Azure service [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces) integrated with. +> +> **spring-cloud-azure-starter-integration-servicebus**: the dependency [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces) depends on. ## Current Branch Supported versions @@ -61,7 +66,7 @@ For example: [single-namespaces](servicebus/spring-cloud-azure-starter-integrati | Storage | [spring-cloud-azure-starter-integration-storage-queue:4.0.0-beta.2] | [storage-queue-operation](storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation) | ## Running Samples -With terraform scripts and default Token Credential, most samples in the project can be run with the same 4 steps below: +With [terraform](https://www.terraform.io/) scripts and [DefaultAzureCredential](https://microsoft.github.io/spring-cloud-azure/current/reference/html/index.html#defaultazurecredential), most samples in the project can be run with the same 4 steps below: ```shell # Step1 Initialize Terraform @@ -76,8 +81,8 @@ source ./terraform/setup_env.sh # Step4 Run With Maven mvn clean spring-boot:run ``` -It supports both Bash environment and PowerShell environment. -Please refer to README.md under each sample for detailed information. +It supports both Bash environment and [PowerShell](https://docs.microsoft.com/en-us/powershell/) environment. +Please refer to [README.md](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/README.md) under each sample for detailed information. ### From 55eba0889ab188f416aa99cb4a35c419fd082df0 Mon Sep 17 00:00:00 2001 From: zhihaoguo Date: Tue, 8 Feb 2022 17:03:30 +0800 Subject: [PATCH 4/7] - update format in README.md --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 4770809af..829fb9e14 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ # Spring Cloud Azure Samples -This is a sample project for demonstration purposes. -The project demonstrates how to use [Spring Cloud Azure](https://microsoft.github.io/spring-cloud-azure/current/reference/html/index.html) to develop applications. -The sample project contains 42 samples, and it still grows. -These samples are grouped by Azure services and Spring Cloud Azure libraries. - -> For example: [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces), it located in the path `/servicebus/spring-cloud-azure-starter-integration-servicebus`. -> -> **servicebus**: The Azure service [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces) integrated with. -> -> **spring-cloud-azure-starter-integration-servicebus**: the dependency [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces) depends on. +- This is a sample project for demonstration purposes. +- The project demonstrates how to use [Spring Cloud Azure](https://microsoft.github.io/spring-cloud-azure/current/reference/html/index.html) to develop applications. +- The sample project contains 42 samples, and it still grows. +- These samples are grouped by Azure services and Spring Cloud Azure libraries. + > For example: [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces), it located in the path `/servicebus/spring-cloud-azure-starter-integration-servicebus`. + > + > **servicebus**: The Azure service [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces) integrated with. + > + > **spring-cloud-azure-starter-integration-servicebus**: the dependency [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces) depends on. + ## Current Branch Supported versions - [spring-boot-dependencies:2.5.2](https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-dependencies/2.5.2/spring-boot-dependencies-2.5.2.pom). @@ -65,7 +65,7 @@ These samples are grouped by Azure services and Spring Cloud Azure libraries. | Storage | [spring-cloud-azure-starter-integration-storage-queue:4.0.0-beta.2] | [storage-queue-integration](storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration) | | Storage | [spring-cloud-azure-starter-integration-storage-queue:4.0.0-beta.2] | [storage-queue-operation](storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation) | -## Running Samples +## Running Samples With Terraform With [terraform](https://www.terraform.io/) scripts and [DefaultAzureCredential](https://microsoft.github.io/spring-cloud-azure/current/reference/html/index.html#defaultazurecredential), most samples in the project can be run with the same 4 steps below: ```shell From 3ffe3586da5179b1fa4b1cfc625b2d5133529c42 Mon Sep 17 00:00:00 2001 From: zhihaoguo Date: Tue, 8 Feb 2022 17:07:42 +0800 Subject: [PATCH 5/7] - update link in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 829fb9e14..3ed481208 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ - This is a sample project for demonstration purposes. - The project demonstrates how to use [Spring Cloud Azure](https://microsoft.github.io/spring-cloud-azure/current/reference/html/index.html) to develop applications. - The sample project contains 42 samples, and it still grows. -- These samples are grouped by Azure services and Spring Cloud Azure libraries. +- These samples are grouped by Azure services and [Spring Cloud Azure libraries](https://github.com/Azure/azure-sdk-for-java/tree/feature/azure-spring-cloud-4.0/sdk/spring). > For example: [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces), it located in the path `/servicebus/spring-cloud-azure-starter-integration-servicebus`. > From 3bd9d1b95c101647e9dd8a1691ba5c2976e8f78f Mon Sep 17 00:00:00 2001 From: zhihaoguo Date: Wed, 9 Feb 2022 10:08:05 +0800 Subject: [PATCH 6/7] replace single-namespaces with single-namespace --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3ed481208..c2a74ecf0 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ - The sample project contains 42 samples, and it still grows. - These samples are grouped by Azure services and [Spring Cloud Azure libraries](https://github.com/Azure/azure-sdk-for-java/tree/feature/azure-spring-cloud-4.0/sdk/spring). - > For example: [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces), it located in the path `/servicebus/spring-cloud-azure-starter-integration-servicebus`. + > For example: [single-namespace](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace), it located in the path `/servicebus/spring-cloud-azure-starter-integration-servicebus`. > - > **servicebus**: The Azure service [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces) integrated with. + > **servicebus**: The Azure service [single-namespace](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace) integrated with. > - > **spring-cloud-azure-starter-integration-servicebus**: the dependency [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces) depends on. + > **spring-cloud-azure-starter-integration-servicebus**: the dependency [single-namespace](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace) depends on. ## Current Branch Supported versions @@ -55,7 +55,7 @@ | Key Vault | [spring-cloud-azure-starter-keyvault-secrets:4.0.0-beta.2] | [keyvault-secrets](keyvault/spring-cloud-azure-starter-keyvault-secrets/keyvault-secrets) | | Service Bus | [spring-cloud-azure-starter-servicebus-jms:4.0.0-beta.2] | [servicebus-jms-queue](servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue) | | Service Bus | [spring-cloud-azure-starter-servicebus-jms:4.0.0-beta.2] | [servicebus-jms-topic](servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic) | -| Service Bus | [spring-cloud-azure-starter-integration-servicebus:4.0.0-beta.2] | [single-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespaces) | +| Service Bus | [spring-cloud-azure-starter-integration-servicebus:4.0.0-beta.2] | [single-namespace](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace) | | Service Bus | [spring-cloud-azure-starter-integration-servicebus:4.0.0-beta.2] | [multiple-namespaces](servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces) | | Service Bus | [spring-cloud-azure-stream-binder-servicebus:4.0.0-beta.2] | [servicebus-queue-binder](servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder) | | Service Bus | [spring-cloud-azure-stream-binder-servicebus:4.0.0-beta.2] | [servicebus-queue-multibinders](servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-multibinders) | From 32b30b9bf20cdfaed7275f8073a43afd4ea92e41 Mon Sep 17 00:00:00 2001 From: zhihaoguo Date: Wed, 9 Feb 2022 14:06:55 +0800 Subject: [PATCH 7/7] change some words --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c2a74ecf0..91994b1de 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ - The sample project contains 42 samples, and it still grows. - These samples are grouped by Azure services and [Spring Cloud Azure libraries](https://github.com/Azure/azure-sdk-for-java/tree/feature/azure-spring-cloud-4.0/sdk/spring). - > For example: [single-namespace](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace), it located in the path `/servicebus/spring-cloud-azure-starter-integration-servicebus`. + > For example: [Use Spring Integration with single Azure Service Bus namespace](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace), it located in the path `/servicebus/spring-cloud-azure-starter-integration-servicebus`. > - > **servicebus**: The Azure service [single-namespace](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace) integrated with. + > **servicebus**: The Azure service that the sample integrated with. > - > **spring-cloud-azure-starter-integration-servicebus**: the dependency [single-namespace](servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace) depends on. + > **spring-cloud-azure-starter-integration-servicebus**: The dependency that the sample depends on. ## Current Branch Supported versions