From a357fb9a9adbc98b1d1d0e4caba781ff785da5bf Mon Sep 17 00:00:00 2001
From: Rustam Ismailov <ri@cashup.com.ua>
Date: Thu, 27 Sep 2018 21:22:10 +0400
Subject: [PATCH] Updated libraries versions, fixed small issues with Lombok

---
 build.gradle                                        | 13 +++++++------
 src/main/java/io/spring/application/Page.java       |  2 +-
 src/main/java/io/spring/core/article/Tag.java       |  2 +-
 .../java/io/spring/core/user/FollowRelation.java    |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index ff5c6cb..62d7690 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.2.RELEASE'
+		springBootVersion = '2.0.5.RELEASE'
 	}
 	repositories {
 		mavenCentral()
@@ -24,7 +24,8 @@ dependencyManagement {
 }
 
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
 	mavenCentral()
@@ -43,13 +44,13 @@ dependencies {
 	compile('org.springframework.boot:spring-boot-starter-hateoas')
 	compile('org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2')
 	compile('org.springframework.boot:spring-boot-starter-web')
-	compile('io.jsonwebtoken:jjwt:0.9.0')
+	compile('io.jsonwebtoken:jjwt:0.9.1')
     compile('org.springframework.boot:spring-boot-starter-security')
-	compile('joda-time:joda-time:2.9.9')
+	compile('joda-time:joda-time:2.10')
     compileOnly('org.projectlombok:lombok')
 	runtime('com.h2database:h2')
-    testCompile 'io.rest-assured:rest-assured:3.1.0'
-	testCompile 'io.rest-assured:spring-mock-mvc:3.1.0'
+    testCompile 'io.rest-assured:rest-assured:3.1.1'
+	testCompile 'io.rest-assured:spring-mock-mvc:3.1.1'
 	testCompile 'org.springframework.security:spring-security-test'
 	testCompile('org.springframework.boot:spring-boot-starter-test')
 	testCompile('org.springframework.restdocs:spring-restdocs-mockmvc')
diff --git a/src/main/java/io/spring/application/Page.java b/src/main/java/io/spring/application/Page.java
index 536c04a..e5bf6fb 100644
--- a/src/main/java/io/spring/application/Page.java
+++ b/src/main/java/io/spring/application/Page.java
@@ -4,9 +4,9 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+@NoArgsConstructor
 @Data
 @Getter
-@NoArgsConstructor
 public class Page {
     private static final int MAX_LIMIT = 100;
     private int offset = 0;
diff --git a/src/main/java/io/spring/core/article/Tag.java b/src/main/java/io/spring/core/article/Tag.java
index adefda5..94bfb9d 100644
--- a/src/main/java/io/spring/core/article/Tag.java
+++ b/src/main/java/io/spring/core/article/Tag.java
@@ -6,8 +6,8 @@ import lombok.NoArgsConstructor;
 
 import java.util.UUID;
 
-@Data
 @NoArgsConstructor
+@Data
 @EqualsAndHashCode(of = "name")
 public class Tag {
     private String id;
diff --git a/src/main/java/io/spring/core/user/FollowRelation.java b/src/main/java/io/spring/core/user/FollowRelation.java
index c9471a1..cbb28e6 100644
--- a/src/main/java/io/spring/core/user/FollowRelation.java
+++ b/src/main/java/io/spring/core/user/FollowRelation.java
@@ -3,8 +3,8 @@ package io.spring.core.user;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-@Data
 @NoArgsConstructor
+@Data
 public class FollowRelation {
     private String userId;
     private String targetId;