upgraded spring-boot 2.2.0

rocketbase-io · Oct 25, 2019 · f728677 · f728677
1 parent 9f7e7f9
commit f728677
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/commons-rest-sample/pom.xml b/commons-rest-sample/pom.xml
@@ -17,8 +17,8 @@
         <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
 
         <!-- dep versions -->
-        <spring-boot.version>2.1.8.RELEASE</spring-boot.version>
-        <mapstruct.version>1.3.0.Final</mapstruct.version>
+        <spring-boot.version>2.2.0.RELEASE</spring-boot.version>
+        <mapstruct.version>1.3.1.Final</mapstruct.version>
         <commons-rest.version>LATEST-SNAPSHOT</commons-rest.version>
     </properties>
 

diff --git a/...ommons-rest-server/src/test/java/io/rocketbase/commons/controller/BaseControllerTest.java b/...ommons-rest-server/src/test/java/io/rocketbase/commons/controller/BaseControllerTest.java
@@ -93,8 +93,8 @@ public void parseSort() {
         Sort sort = getTestController().parseSort(map, "sort");
 
         // then
-        assertThat(sort.getOrderFor("foo"), equalTo(new Sort.Order(Sort.Direction.DESC, "foo")));
-        assertThat(sort.getOrderFor("bla"), equalTo(new Sort.Order("bla")));
+        assertThat(sort.getOrderFor("foo"), equalTo(Sort.Order.desc("foo")));
+        assertThat(sort.getOrderFor("bla"), equalTo(Sort.Order.asc("bla")));
         assertThat(StreamSupport.stream(sort.spliterator(), false).count(), equalTo(2L));
     }
 

diff --git a/commons-rest/pom.xml b/commons-rest/pom.xml
@@ -94,9 +94,9 @@ SOFTWARE.
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <spring-boot.version>2.1.9.RELEASE</spring-boot.version>
+        <spring-boot.version>2.2.0.RELEASE</spring-boot.version>
         <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
-        <jacoco.version>0.8.4</jacoco.version>
+        <jacoco.version>0.8.5</jacoco.version>
         <hashids.version>1.0.3</hashids.version>
     </properties>