Release/2.1.7 (microsoft#703)

* change version to 2.1.7 * change spring dependency version * update readme for jms samples * correct README.md of azure-sqlserver-spring-boot-starter. There is no samples code of this starter. So delete the related part of the doc. * update version * update readme for keyvault sample * The test case in AADAuthenticationFilterTest is out of date, so ignore it in case of hindering current release. I will add a new test case later. * correct checkstyle error * upgrade gradlew version * lombok support in gradle 5
bcannariato · Aug 20, 2019 · c76a748 · c76a748
1 parent c0dc9e6
commit c76a748
Show file tree

Hide file tree

Showing 32 changed files with 68 additions and 46 deletions.
diff --git a/azure-spring-boot-bom/pom.xml b/azure-spring-boot-bom/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-spring-boot-bom</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.7</version>
     <packaging>pom</packaging>
 
     <name>Azure Spring Boot BOM</name>
@@ -46,12 +46,25 @@
     </scm>
 
     <properties>
-        <azure.spring.boot.version>2.1.7-SNAPSHOT</azure.spring.boot.version>
-        <azure.dependencies.bom.version>2.1.0.M5</azure.dependencies.bom.version>
+        <azure.spring.boot.version>2.1.7</azure.spring.boot.version>
+        <azure.dependencies.bom.version>2.1.0.M6</azure.dependencies.bom.version>
+        <spring.data.cosmosdb.version>2.1.7</spring.data.cosmosdb.version>
+        <spring.data.gremlin.version>2.1.7</spring.data.gremlin.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.microsoft.azure</groupId>
+                <artifactId>spring-data-cosmosdb</artifactId>
+                <version>${spring.data.cosmosdb.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.microsoft.spring.data.gremlin</groupId>
+                <artifactId>spring-data-gremlin</artifactId>
+                <version>${spring.data.gremlin.version}</version>
+            </dependency>
+
             <!-- Azure Dependencies Bom -->
             <dependency>
                 <groupId>com.microsoft.azure</groupId>

diff --git a/azure-spring-boot-parent/pom.xml b/azure-spring-boot-parent/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-bom</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../azure-spring-boot-bom/pom.xml</relativePath>
     </parent>
 
@@ -27,19 +27,19 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring.boot.version>2.1.0.RELEASE</spring.boot.version>
+        <spring.boot.version>2.1.7.RELEASE</spring.boot.version>
         <findbugs.annotations.version>2.0.1</findbugs.annotations.version>
         <nimbus.jose.jwt.version>4.39.2</nimbus.jose.jwt.version>
         <mockito.core.version>2.8.9</mockito.core.version>
         <azuremonitor.micrometer.registry.version>1.1.0</azuremonitor.micrometer.registry.version>
         <micrometer.core.version>1.1.0</micrometer.core.version>
-        <spring-boot-actuator-autoconfigure.version>2.1.0.RELEASE</spring-boot-actuator-autoconfigure.version>
+        <spring-boot-actuator-autoconfigure.version>2.1.7.RELEASE</spring-boot-actuator-autoconfigure.version>
         <maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
         <wiremock-standalone.version>2.19.0</wiremock-standalone.version>
         <commons-io.version>2.3</commons-io.version>
         <hibernate.validator.version>6.0.9.Final</hibernate.validator.version>
         <javax.jms-api.version>2.0.1</javax.jms-api.version>
-        <spring-jms.version>5.1.8.RELEASE</spring-jms.version>
+        <spring-jms.version>5.1.9.RELEASE</spring-jms.version>
         <qpid-jms-client.version>0.43.0</qpid-jms-client.version>
         <junit-params.version>1.1.1</junit-params.version>
     </properties>

diff --git a/azure-spring-boot-samples/azure-cosmosdb-spring-boot-sample/build.gradle b/azure-spring-boot-samples/azure-cosmosdb-spring-boot-sample/build.gradle
@@ -1,9 +1,8 @@
-plugins {
-    id 'io.franzbecker.gradle-lombok' version '1.8'
-}
 
 description = 'Azure Document DB Spring Boot Starter Sample'
 
 dependencies {
     compile group: 'com.microsoft.azure', name: 'azure-cosmosdb-spring-boot-starter', version:"${azureSpringBootStartersVersion}"
+    compileOnly "org.projectlombok:lombok"
+    annotationProcessor "org.projectlombok:lombok"
 }
diff --git a/azure-spring-boot-samples/azure-keyvault-secrets-spring-boot-sample/README.md b/azure-spring-boot-samples/azure-keyvault-secrets-spring-boot-sample/README.md
@@ -55,7 +55,7 @@ If you are using Maven, add the following dependency.
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-secrets-spring-boot-starter</artifactId>
-    <version>0.2.3</version>
+    <version>2.1.7</version>
 </dependency>
 ```
 

diff --git a/azure-spring-boot-samples/azure-servicebus-jms-queue-spring-boot-sample/pom.xml b/azure-spring-boot-samples/azure-servicebus-jms-queue-spring-boot-sample/pom.xml
@@ -38,13 +38,13 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test-autoconfigure</artifactId>
-            <version>2.1.2.RELEASE</version>
+            <version>2.1.7.RELEASE</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>5.1.4.RELEASE</version>
+            <version>5.1.9.RELEASE</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/azure-spring-boot-samples/azure-servicebus-jms-topic-spring-boot-sample/pom.xml b/azure-spring-boot-samples/azure-servicebus-jms-topic-spring-boot-sample/pom.xml
@@ -38,13 +38,13 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test-autoconfigure</artifactId>
-            <version>2.1.2.RELEASE</version>
+            <version>2.1.7.RELEASE</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>5.1.4.RELEASE</version>
+            <version>5.1.9.RELEASE</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/azure-spring-boot-samples/azure-servicebus-spring-boot-sample/README.md b/azure-spring-boot-samples/azure-servicebus-spring-boot-sample/README.md
@@ -38,7 +38,7 @@ This sample project demonstrates how to use Service Bus via Spring Boot Starter
    - Use Gradle 
    
      ```
-     gradle bootRepackage
+     gradle bootJar
      java -jar build/libs/azure-servicebus-spring-boot-sample-0.0.1-SNAPSHOT.jar
      ```
 

diff --git a/azure-spring-boot-samples/build.gradle b/azure-spring-boot-samples/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        springBootVersion = '2.0.1.RELEASE'
+        springBootVersion = '2.1.7.RELEASE'
     }
     repositories {
         mavenCentral()
@@ -18,7 +18,7 @@ allprojects {
     version = '0.0.1-SNAPSHOT'
 
     ext {
-        azureSpringBootStartersVersion = '2.0.7'
+        azureSpringBootStartersVersion = '2.1.7'
         commonsioVersion = '2.3'
     }
 }

diff --git a/azure-spring-boot-samples/gradle/wrapper/gradle-wrapper.jar b/azure-spring-boot-samples/gradle/wrapper/gradle-wrapper.jar
diff --git a/azure-spring-boot-samples/gradle/wrapper/gradle-wrapper.properties b/azure-spring-boot-samples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
diff --git a/azure-spring-boot-samples/pom.xml b/azure-spring-boot-samples/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.1.7.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -66,7 +66,7 @@
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-spring-boot-bom</artifactId>
-                <version>2.1.7-SNAPSHOT</version>
+                <version>2.1.7</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/azure-spring-boot-starters/azure-active-directory-b2c-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-active-directory-b2c-spring-boot-starter/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>azure-active-directory-b2c-spring-boot-starter</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.7</version>
 
     <name>Azure AD B2C Spring Security Integration Spring Boot Starter</name>
     <description>Spring Boot Starter for Azure AD B2C and Spring Security Integration</description>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-spring-boot</artifactId>
-            <version>2.1.7-SNAPSHOT</version>
+            <version>2.1.7</version>
         </dependency>
         <!-- Below poms will be replaced to azure-spring-boot-starter pom when no milestone tag. -->
 

diff --git a/azure-spring-boot-starters/azure-active-directory-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-active-directory-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/azure-spring-boot-starters/azure-cosmosdb-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-cosmosdb-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/azure-spring-boot-starters/azure-keyvault-secrets-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-keyvault-secrets-spring-boot-starter/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/azure-spring-boot-starters/azure-mediaservices-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-mediaservices-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/azure-spring-boot-starters/azure-servicebus-jms-spring-boot-starter/README.md b/azure-spring-boot-starters/azure-servicebus-jms-spring-boot-starter/README.md
@@ -15,7 +15,7 @@ Add the following dependency to your project:
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-servicebus-jms-spring-boot-starter</artifactId>
-    <version>2.0.4</version>
+    <version>2.1.7</version>
 </dependency>
 ```
 

diff --git a/azure-spring-boot-starters/azure-servicebus-jms-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-servicebus-jms-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/azure-spring-boot-starters/azure-servicebus-spring-boot-starter/README.md b/azure-spring-boot-starters/azure-servicebus-spring-boot-starter/README.md
@@ -10,12 +10,12 @@ Add the following dependency to your project:
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-servicebus-spring-boot-starter</artifactId>
-    <version>2.0.4</version>
+    <version>2.1.7</version>
 </dependency>
 ```
 
 *Gradle*<br>
-```compile 'com.microsoft.azure:azure-servicebus-spring-boot-starter:2.0.4'```
+```compile 'com.microsoft.azure:azure-servicebus-spring-boot-starter:2.1.7'```
 
 ### Add the property setting
 

diff --git a/azure-spring-boot-starters/azure-servicebus-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-servicebus-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/azure-spring-boot-starters/azure-spring-boot-metrics-starter/pom.xml b/azure-spring-boot-starters/azure-spring-boot-metrics-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/azure-spring-boot-starters/azure-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/azure-spring-boot-starters/azure-sqlserver-spring-boot-starter/README.md b/azure-spring-boot-starters/azure-sqlserver-spring-boot-starter/README.md
@@ -2,9 +2,6 @@
 
 [Azure SQL DB Always Encrypted](https://docs.microsoft.com/en-us/azure/sql-database/sql-database-always-encrypted) feature allows to encrypt data in SQL and store master keys in Azure KeyVault
 
-## Sample Code
-Please refer to [sample project here](../../azure-spring-boot-samples/azure-sqlserver-spring-boot-sample).
-
 ## Quick Start
 
 ### Add the dependency

diff --git a/azure-spring-boot-starters/azure-sqlserver-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-sqlserver-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/azure-spring-boot-starters/azure-storage-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-storage-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/azure-spring-boot-starters/pom.xml b/azure-spring-boot-starters/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/azure-spring-boot-starters/spring-data-gremlin-boot-starter/pom.xml b/azure-spring-boot-starters/spring-data-gremlin-boot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/azure-spring-boot/pom.xml b/azure-spring-boot/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.7</version>
         <relativePath>../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 
@@ -219,6 +219,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+	                <groupId>com.vaadin.external.google</groupId>
+	                <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/...n/java/com/microsoft/azure/spring/autoconfigure/cosmosdb/DocumentDBAutoConfiguration.java b/...n/java/com/microsoft/azure/spring/autoconfigure/cosmosdb/DocumentDBAutoConfiguration.java
@@ -14,6 +14,7 @@
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
@@ -30,8 +31,8 @@ public DocumentDBAutoConfiguration(DocumentDBProperties properties,
         configConnectionPolicy(properties, policy);
     }
 
-    @Override
-    public DocumentDBConfig getConfig() {
+    @Bean
+    public DocumentDBConfig documentDbConfig() {
         final DocumentDBConfig config = DocumentDBConfig.builder(
                 properties.getUri(), properties.getKey(), properties.getDatabase())
                 .consistencyLevel(properties.getConsistencyLevel())