[servicecomb-java-chassis] branch master updated: [SCB-1882]dependency update: spring data remove from DM and add version for provided

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new 528d9ef  [SCB-1882]dependency update: spring data remove from DM and add version for provided
528d9ef is described below

commit 528d9ef7fe3532ac823e139a058eb82ed188ee9c
Author: liubao <bi...@qq.com>
AuthorDate: Thu May 7 14:50:10 2020 +0800

    [SCB-1882]dependency update: spring data remove from DM and add version for provided
---
 dependencies/default/pom.xml                                        | 6 ------
 swagger/swagger-generator/generator-spring-data/pom.xml             | 2 ++
 .../swagger/generator/springdata/TestPageResponseTypeProcessor.java | 6 +++++-
 .../generator-spring-data/src/test/resources/pageSchema.yaml        | 6 ++++++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index 24ebbfe..ecc7041 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -102,7 +102,6 @@
     <spring.version>5.1.8.RELEASE</spring.version>
     <spring-boot.version>2.1.6.RELEASE</spring-boot.version>
     <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
-    <spring-data.version>2.0.9.RELEASE</spring-data.version>
     <stax2-api.version>4.2</stax2-api.version>
     <swagger.version>1.5.22</swagger.version>
     <swagger2markup.version>1.3.3</swagger2markup.version>
@@ -726,11 +725,6 @@
         <version>${jettison.version}</version>
         <scope>runtime</scope>
       </dependency>
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-commons</artifactId>
-        <version>${spring-data.version}</version>
-      </dependency>
 
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
diff --git a/swagger/swagger-generator/generator-spring-data/pom.xml b/swagger/swagger-generator/generator-spring-data/pom.xml
index 1945644..37a4bf5 100644
--- a/swagger/swagger-generator/generator-spring-data/pom.xml
+++ b/swagger/swagger-generator/generator-spring-data/pom.xml
@@ -40,6 +40,8 @@
       <!-- based on business project dependency -->
       <optional>true</optional>
       <scope>provided</scope>
+      <!-- This is provided scope, better not add to dependency management, so add version here -->
+      <version>2.1.9.RELEASE</version>
     </dependency>
 
   </dependencies>
diff --git a/swagger/swagger-generator/generator-spring-data/src/test/java/org/apache/servicecomb/swagger/generator/springdata/TestPageResponseTypeProcessor.java b/swagger/swagger-generator/generator-spring-data/src/test/java/org/apache/servicecomb/swagger/generator/springdata/TestPageResponseTypeProcessor.java
index 98262af..48dd495 100644
--- a/swagger/swagger-generator/generator-spring-data/src/test/java/org/apache/servicecomb/swagger/generator/springdata/TestPageResponseTypeProcessor.java
+++ b/swagger/swagger-generator/generator-spring-data/src/test/java/org/apache/servicecomb/swagger/generator/springdata/TestPageResponseTypeProcessor.java
@@ -43,7 +43,11 @@ public class TestPageResponseTypeProcessor {
     Page<?> page = Json.mapper().readValue(json, Page.class);
 
     Assert.assertEquals(
-        "{\"content\":[\"c1\",\"c2\"],\"pageable\":{\"offset\":2,\"pageNumber\":1,\"pageSize\":2,\"paged\":true,\"sort\":{\"sorted\":false,\"unsorted\":true},\"unpaged\":false},\"first\":false,\"last\":true,\"number\":1,\"numberOfElements\":2,\"size\":2,\"sort\":{\"sorted\":false,\"unsorted\":true},\"totalElements\":4,\"totalPages\":2}",
+        "{\"content\":[\"c1\",\"c2\"],\"pageable\":{\"offset\":2,\"pageNumber\":1,\"pageSize\":2,"
+            + "\"paged\":true,\"sort\":{\"empty\":true,\"sorted\":false,\"unsorted\":true},"
+            + "\"unpaged\":false},\"empty\":false,\"first\":false,\"last\":true,\"number\":1,"
+            + "\"numberOfElements\":2,\"size\":2,\"sort\":{\"empty\":true,\"sorted\":false,"
+            + "\"unsorted\":true},\"totalElements\":4,\"totalPages\":2}",
         Json.mapper().writeValueAsString(page));
   }
 }
diff --git a/swagger/swagger-generator/generator-spring-data/src/test/resources/pageSchema.yaml b/swagger/swagger-generator/generator-spring-data/src/test/resources/pageSchema.yaml
index beec271..762d576 100644
--- a/swagger/swagger-generator/generator-spring-data/src/test/resources/pageSchema.yaml
+++ b/swagger/swagger-generator/generator-spring-data/src/test/resources/pageSchema.yaml
@@ -49,6 +49,8 @@ definitions:
         type: "array"
         items:
           type: "object"
+      empty:
+        type: "boolean"
       first:
         type: "boolean"
       last:
@@ -80,6 +82,8 @@ definitions:
         type: "array"
         items:
           type: "string"
+      empty:
+        type: "boolean"
       first:
         type: "boolean"
       last:
@@ -126,6 +130,8 @@ definitions:
   Sort:
     type: "object"
     properties:
+      empty:
+        type: "boolean"
       sorted:
         type: "boolean"
       unsorted: