diff --git a/HowToContribute.md b/HowToContribute.md index 08f819305..7cd0c4678 100644 --- a/HowToContribute.md +++ b/HowToContribute.md @@ -15,7 +15,7 @@ mvnw clean install ``` ## Test -There're 2 profiles: `dev` and `integration-test`. Default profile is `dev`. Profile `integration-test` will trigger integration test execution. +There're 2 profiles: `dev` and `integration-test-azure`. Default profile is `dev`. Profile `integration-test-azure` will trigger integration test execution. - Run unit tests ```bash @@ -24,19 +24,19 @@ mvnw clean install - Run unit tests and integration tests - >**NOTE** Please note that integration-test will automatically create a Azure Cosmos DB Document API in your Azure subscription, then there will be **Azure usage fee.** + >**NOTE** Please note that integration test will automatically create a Azure Cosmos DB Document API in your Azure subscription, then there will be **Azure usage fee.** Integration tests will require a Azure Subscription. If you don't already have an Azure subscription, you can activate your [MSDN subscriber benefits](https://azure.microsoft.com/en-us/pricing/member-offers/msdn-benefits-details/) or sign up for a [free Azure account](https://azure.microsoft.com/en-us/free/). 1. Create a service principal by using Azure Cli or by [Azure Portal](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal). 2. After service principal ready, set environment variables CLIENT_ID, CLIENT_KEY and TENANT_ID, where value of them are service principal id, key and tenant id. - 3. Run maven command with `integration-test` profile. + 3. Run maven command with `integration-test-azure` profile. ```bash set CLIENT_ID=your-azure-service-principal-id set CLIENT_KEY=your-azure-service-principal-key set TENANT_ID=your-azure-subscription-tenant-id -mvnw -P integration-test clean install +mvnw -P integration-test-azure clean install ``` - Skip tests execution @@ -44,10 +44,16 @@ mvnw -P integration-test clean install mvnw clean install -DskipTests ``` +## Version management +Developing version naming convention is like `0.1.5-beta`. Release version naming convention is like `0.1.4`. Please don't update version if no release plan. + +## CI +Both [travis](https://travis-ci.org/Microsoft/azure-spring-boot-starters) and [appveyor](https://ci.appveyor.com/project/yungez/azure-spring-boot-starters) CI is enabled. + ## Contribute to code Code contribution is welcome. To contribute to existing code or add new Starter, please make sure below check list are checked. -- [ ] Build pass. checkstyle and findbugs is enabled by default. +- [ ] Build pass. checkstyle and findbugs is enabled by default. Please check [checkstyle.xml](./common/config/checkstyle.xml) to learn detail checkstyle configuration. - [ ] Documents are updated to aligning with code. - [ ] New starter must have sample folder contains sample code and corresponding readme file. -- [ ] Code coverage for new codes >= 65% +- [ ] Code coverage for new codes >= 65%. Code coverage check is enabled with 65% bar. diff --git a/activedirectory/azure-ad-integration-spring-boot-autoconfigure/pom.xml b/activedirectory/azure-ad-integration-spring-boot-autoconfigure/pom.xml index d806345c8..2b5d8ef43 100644 --- a/activedirectory/azure-ad-integration-spring-boot-autoconfigure/pom.xml +++ b/activedirectory/azure-ad-integration-spring-boot-autoconfigure/pom.xml @@ -5,7 +5,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml 4.0.0 diff --git a/cloudfoundry/azure-cloud-foundry-service-sample/pom.xml b/cloudfoundry/azure-cloud-foundry-service-sample/pom.xml index 78137eb99..debbf984d 100644 --- a/cloudfoundry/azure-cloud-foundry-service-sample/pom.xml +++ b/cloudfoundry/azure-cloud-foundry-service-sample/pom.xml @@ -55,7 +55,7 @@ com.microsoft.azure azure-spring-boot-starter-bom - 0.1.5-beta + 0.1.5 pom import diff --git a/cloudfoundry/azure-cloud-foundry-service/pom.xml b/cloudfoundry/azure-cloud-foundry-service/pom.xml index afc7eca04..677827202 100644 --- a/cloudfoundry/azure-cloud-foundry-service/pom.xml +++ b/cloudfoundry/azure-cloud-foundry-service/pom.xml @@ -6,7 +6,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/common/azure-spring-boot-starter-parent/pom.xml b/common/azure-spring-boot-starter-parent/pom.xml index 832deb6df..71b9eb3c8 100644 --- a/common/azure-spring-boot-starter-parent/pom.xml +++ b/common/azure-spring-boot-starter-parent/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-bom - 0.1.5-beta + 0.1.5 ../../pom.xml @@ -226,6 +226,9 @@ com/microsoft/azure/spring/common/GetHashMac.class com/microsoft/azure/**/Constants.class + com/microsoft/azure/**/AzureADJwtTokenFilter.class + com/microsoft/azure/**/AzureADGraphClient.class + com/microsoft/azure/**/Userprincipal.class diff --git a/common/azure-spring-common/pom.xml b/common/azure-spring-common/pom.xml index 160879fe8..1921ba3fc 100644 --- a/common/azure-spring-common/pom.xml +++ b/common/azure-spring-common/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../azure-spring-boot-starter-parent/pom.xml diff --git a/documentdb/azure-documentdb-spring-boot-autoconfigure-sample/pom.xml b/documentdb/azure-documentdb-spring-boot-autoconfigure-sample/pom.xml index bba2bd104..d73197c07 100644 --- a/documentdb/azure-documentdb-spring-boot-autoconfigure-sample/pom.xml +++ b/documentdb/azure-documentdb-spring-boot-autoconfigure-sample/pom.xml @@ -46,7 +46,7 @@ com.microsoft.azure azure-spring-boot-starter-bom - 0.1.5-beta + 0.1.5 pom import diff --git a/documentdb/azure-documentdb-spring-boot-autoconfigure/README.md b/documentdb/azure-documentdb-spring-boot-autoconfigure/README.md index 48e27e071..349a82dec 100644 --- a/documentdb/azure-documentdb-spring-boot-autoconfigure/README.md +++ b/documentdb/azure-documentdb-spring-boot-autoconfigure/README.md @@ -9,7 +9,7 @@ If you are using Maven, add the following dependency. com.microsoft.azure azure-documentdb-spring-boot-autoconfigure - 0.1.4 + 0.1.5 ``` diff --git a/documentdb/azure-documentdb-spring-boot-autoconfigure/pom.xml b/documentdb/azure-documentdb-spring-boot-autoconfigure/pom.xml index c836603bc..ead489434 100644 --- a/documentdb/azure-documentdb-spring-boot-autoconfigure/pom.xml +++ b/documentdb/azure-documentdb-spring-boot-autoconfigure/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/documentdb/azure-documentdb-spring-boot-autoconfigure/src/main/java/com/microsoft/azure/autoconfigure/documentdb/DocumentDBAutoConfiguration.java b/documentdb/azure-documentdb-spring-boot-autoconfigure/src/main/java/com/microsoft/azure/autoconfigure/documentdb/DocumentDBAutoConfiguration.java index fd0d7dbac..177cec5b9 100644 --- a/documentdb/azure-documentdb-spring-boot-autoconfigure/src/main/java/com/microsoft/azure/autoconfigure/documentdb/DocumentDBAutoConfiguration.java +++ b/documentdb/azure-documentdb-spring-boot-autoconfigure/src/main/java/com/microsoft/azure/autoconfigure/documentdb/DocumentDBAutoConfiguration.java @@ -35,7 +35,7 @@ @EnableConfigurationProperties(DocumentDBProperties.class) public class DocumentDBAutoConfiguration { private static final Logger LOG = LoggerFactory.getLogger(DocumentDBAutoConfiguration.class); - private static final String USER_AGENT_SUFFIX = "spring-boot-starter/0.1.5-beta"; + private static final String USER_AGENT_SUFFIX = "spring-boot-starter/0.1.5"; private final DocumentDBProperties properties; private final ConnectionPolicy connectionPolicy; diff --git a/documentdb/azure-documentdb-spring-boot-autoconfigure/src/test/java/com/microsoft/azure/autoconfigure/documentdb/PropertySettingUtil.java b/documentdb/azure-documentdb-spring-boot-autoconfigure/src/test/java/com/microsoft/azure/autoconfigure/documentdb/PropertySettingUtil.java index f2b2ca6f6..7f3c9d70a 100644 --- a/documentdb/azure-documentdb-spring-boot-autoconfigure/src/test/java/com/microsoft/azure/autoconfigure/documentdb/PropertySettingUtil.java +++ b/documentdb/azure-documentdb-spring-boot-autoconfigure/src/test/java/com/microsoft/azure/autoconfigure/documentdb/PropertySettingUtil.java @@ -25,7 +25,7 @@ public class PropertySettingUtil { public static final int MAX_POOL_SIZE = 1; public static final int IDLE_CONNECTION_TIMEOUT = 2; public static final String USER_AGENT_SUFFIX = "suffix"; - public static final String DEFAULT_USER_AGENT_SUFFIX = "spring-boot-starter/0.1.5-beta"; + public static final String DEFAULT_USER_AGENT_SUFFIX = "spring-boot-starter/0.1.5"; public static final int RETRY_OPTIONS_MAX_RETRY_ATTEMPTS_ON_THROTTLED_REQUESTS = 5; public static final int RETRY_OPTIONS_MAX_RETRY_WAIT_TIME_IN_SECONDS = 6; public static final boolean ENABLE_ENDPOINT_DISCOVERY = false; diff --git a/documentdb/azure-documentdb-spring-boot-starter-sample/pom.xml b/documentdb/azure-documentdb-spring-boot-starter-sample/pom.xml index c68bc0ea2..fc845d9f9 100644 --- a/documentdb/azure-documentdb-spring-boot-starter-sample/pom.xml +++ b/documentdb/azure-documentdb-spring-boot-starter-sample/pom.xml @@ -52,7 +52,7 @@ com.microsoft.azure azure-spring-boot-starter-bom - 0.1.5-beta + 0.1.5 pom import diff --git a/documentdb/azure-documentdb-spring-boot-starter/README.md b/documentdb/azure-documentdb-spring-boot-starter/README.md index 2027574f2..f71941f41 100644 --- a/documentdb/azure-documentdb-spring-boot-starter/README.md +++ b/documentdb/azure-documentdb-spring-boot-starter/README.md @@ -32,7 +32,7 @@ If you are using Maven, add the following dependency. com.microsoft.azure azure-documentdb-spring-boot-starter - 0.1.4 + 0.1.5 ``` diff --git a/documentdb/azure-documentdb-spring-boot-starter/pom.xml b/documentdb/azure-documentdb-spring-boot-starter/pom.xml index c9a56df8a..f2076c3e0 100644 --- a/documentdb/azure-documentdb-spring-boot-starter/pom.xml +++ b/documentdb/azure-documentdb-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/documentdb/spring-data-azure-documentdb-sample/pom.xml b/documentdb/spring-data-azure-documentdb-sample/pom.xml index 069d66a4e..aeadafca6 100644 --- a/documentdb/spring-data-azure-documentdb-sample/pom.xml +++ b/documentdb/spring-data-azure-documentdb-sample/pom.xml @@ -47,7 +47,7 @@ com.microsoft.azure azure-spring-boot-starter-bom - 0.1.5-beta + 0.1.5 pom import diff --git a/documentdb/spring-data-azure-documentdb/README.md b/documentdb/spring-data-azure-documentdb/README.md index 40bd9c2b2..cda211c4a 100644 --- a/documentdb/spring-data-azure-documentdb/README.md +++ b/documentdb/spring-data-azure-documentdb/README.md @@ -29,7 +29,7 @@ If you are using Maven, add the following dependency. com.microsoft.azure spring-data-azure-documentdb - 0.1.4 + 0.1.5 ``` diff --git a/documentdb/spring-data-azure-documentdb/pom.xml b/documentdb/spring-data-azure-documentdb/pom.xml index bfc6f41f7..1cd857378 100644 --- a/documentdb/spring-data-azure-documentdb/pom.xml +++ b/documentdb/spring-data-azure-documentdb/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/documentdb/spring-data-azure-documentdb/src/main/java/com/microsoft/azure/spring/data/documentdb/DocumentDbFactory.java b/documentdb/spring-data-azure-documentdb/src/main/java/com/microsoft/azure/spring/data/documentdb/DocumentDbFactory.java index bd2d43d51..3c4b1dff3 100644 --- a/documentdb/spring-data-azure-documentdb/src/main/java/com/microsoft/azure/spring/data/documentdb/DocumentDbFactory.java +++ b/documentdb/spring-data-azure-documentdb/src/main/java/com/microsoft/azure/spring/data/documentdb/DocumentDbFactory.java @@ -14,7 +14,7 @@ public class DocumentDbFactory { - private static final String USER_AGENT_SUFFIX = "spring-data/0.1.5-beta"; + private static final String USER_AGENT_SUFFIX = "spring-data/0.1.5"; private DocumentClient documentClient; diff --git a/keyvault/azure-keyvault-secrets-spring-boot-starter-sample/pom.xml b/keyvault/azure-keyvault-secrets-spring-boot-starter-sample/pom.xml index 7e9c800b6..7e4467938 100644 --- a/keyvault/azure-keyvault-secrets-spring-boot-starter-sample/pom.xml +++ b/keyvault/azure-keyvault-secrets-spring-boot-starter-sample/pom.xml @@ -46,7 +46,7 @@ com.microsoft.azure azure-spring-boot-starter-bom - 0.1.5-beta + 0.1.5 pom import diff --git a/keyvault/azure-keyvault-secrets-spring-boot-starter/pom.xml b/keyvault/azure-keyvault-secrets-spring-boot-starter/pom.xml index c3936320b..8812783bd 100644 --- a/keyvault/azure-keyvault-secrets-spring-boot-starter/pom.xml +++ b/keyvault/azure-keyvault-secrets-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/keyvault/azure-keyvault-secrets-spring-boot/pom.xml b/keyvault/azure-keyvault-secrets-spring-boot/pom.xml index 3ede5d2f9..ae7011c56 100644 --- a/keyvault/azure-keyvault-secrets-spring-boot/pom.xml +++ b/keyvault/azure-keyvault-secrets-spring-boot/pom.xml @@ -11,7 +11,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/mediaservices/azure-mediaservices-spring-boot-autoconfigure/pom.xml b/mediaservices/azure-mediaservices-spring-boot-autoconfigure/pom.xml index 90240cb2b..038945116 100644 --- a/mediaservices/azure-mediaservices-spring-boot-autoconfigure/pom.xml +++ b/mediaservices/azure-mediaservices-spring-boot-autoconfigure/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/mediaservices/azure-mediaservices-spring-boot-starter-sample/pom.xml b/mediaservices/azure-mediaservices-spring-boot-starter-sample/pom.xml index a33a6d42a..94759e0a6 100644 --- a/mediaservices/azure-mediaservices-spring-boot-starter-sample/pom.xml +++ b/mediaservices/azure-mediaservices-spring-boot-starter-sample/pom.xml @@ -47,7 +47,7 @@ com.microsoft.azure azure-spring-boot-starter-bom - 0.1.5-beta + 0.1.5 pom import diff --git a/mediaservices/azure-mediaservices-spring-boot-starter/pom.xml b/mediaservices/azure-mediaservices-spring-boot-starter/pom.xml index 3a5c54126..5801913d5 100644 --- a/mediaservices/azure-mediaservices-spring-boot-starter/pom.xml +++ b/mediaservices/azure-mediaservices-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/microsoft-graph/microsoft-graph-spring-boot-autoconfigure/pom.xml b/microsoft-graph/microsoft-graph-spring-boot-autoconfigure/pom.xml index 93171f400..8d2ee4aa5 100644 --- a/microsoft-graph/microsoft-graph-spring-boot-autoconfigure/pom.xml +++ b/microsoft-graph/microsoft-graph-spring-boot-autoconfigure/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/microsoft-graph/microsoft-graph-spring-social-starter-sample/pom.xml b/microsoft-graph/microsoft-graph-spring-social-starter-sample/pom.xml index 4d7e34090..af965cd35 100644 --- a/microsoft-graph/microsoft-graph-spring-social-starter-sample/pom.xml +++ b/microsoft-graph/microsoft-graph-spring-social-starter-sample/pom.xml @@ -47,7 +47,7 @@ com.microsoft.azure azure-spring-boot-starter-bom - 0.1.5-beta + 0.1.5 pom import diff --git a/microsoft-graph/microsoft-graph-spring-social-starter/pom.xml b/microsoft-graph/microsoft-graph-spring-social-starter/pom.xml index 45586b857..fe939e224 100644 --- a/microsoft-graph/microsoft-graph-spring-social-starter/pom.xml +++ b/microsoft-graph/microsoft-graph-spring-social-starter/pom.xml @@ -7,7 +7,7 @@ azure-spring-boot-starter-parent com.microsoft.azure - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/microsoft-graph/spring-social-microsoft-graph/pom.xml b/microsoft-graph/spring-social-microsoft-graph/pom.xml index 9c83f4779..9e5646e56 100644 --- a/microsoft-graph/spring-social-microsoft-graph/pom.xml +++ b/microsoft-graph/spring-social-microsoft-graph/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/pom.xml b/pom.xml index 459f3fefd..0b20f6af8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.microsoft.azure azure-spring-boot-starter-bom - 0.1.5-beta + 0.1.5 pom Azure Spring Boot Starter BOM @@ -50,7 +50,7 @@ 1.5.4.RELEASE 1.8 - 0.1.5-beta + 0.1.5 ${bom.version} ${bom.version} diff --git a/servicebus/azure-servicebus-spring-boot-autoconfigure/pom.xml b/servicebus/azure-servicebus-spring-boot-autoconfigure/pom.xml index a2e0db619..9e668bfda 100644 --- a/servicebus/azure-servicebus-spring-boot-autoconfigure/pom.xml +++ b/servicebus/azure-servicebus-spring-boot-autoconfigure/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/servicebus/azure-servicebus-spring-boot-starter-sample/pom.xml b/servicebus/azure-servicebus-spring-boot-starter-sample/pom.xml index dc152849c..ea1ce2d57 100644 --- a/servicebus/azure-servicebus-spring-boot-starter-sample/pom.xml +++ b/servicebus/azure-servicebus-spring-boot-starter-sample/pom.xml @@ -47,7 +47,7 @@ com.microsoft.azure azure-spring-boot-starter-bom - 0.1.5-beta + 0.1.5 pom import diff --git a/servicebus/azure-servicebus-spring-boot-starter/pom.xml b/servicebus/azure-servicebus-spring-boot-starter/pom.xml index 739431e95..c09001071 100644 --- a/servicebus/azure-servicebus-spring-boot-starter/pom.xml +++ b/servicebus/azure-servicebus-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ azure-spring-boot-starter-parent com.microsoft.azure - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/storage/azure-storage-spring-boot-autoconfigure/pom.xml b/storage/azure-storage-spring-boot-autoconfigure/pom.xml index afda3158e..d778f7061 100644 --- a/storage/azure-storage-spring-boot-autoconfigure/pom.xml +++ b/storage/azure-storage-spring-boot-autoconfigure/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml diff --git a/storage/azure-storage-spring-boot-starter-sample/pom.xml b/storage/azure-storage-spring-boot-starter-sample/pom.xml index de5eeb1dd..8894e758d 100644 --- a/storage/azure-storage-spring-boot-starter-sample/pom.xml +++ b/storage/azure-storage-spring-boot-starter-sample/pom.xml @@ -47,7 +47,7 @@ com.microsoft.azure azure-spring-boot-starter-bom - 0.1.5-beta + 0.1.5 pom import diff --git a/storage/azure-storage-spring-boot-starter/pom.xml b/storage/azure-storage-spring-boot-starter/pom.xml index 2749d7ce3..c39236ce8 100644 --- a/storage/azure-storage-spring-boot-starter/pom.xml +++ b/storage/azure-storage-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ com.microsoft.azure azure-spring-boot-starter-parent - 0.1.5-beta + 0.1.5 ../../common/azure-spring-boot-starter-parent/pom.xml