Merge pull request #10 from lospejos/master

Updated libraries versions, fixed small issues with Lombok
This commit is contained in:
aisensiy 2018-09-28 10:07:43 +08:00 committed by GitHub
commit 8ff3a372f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 9 deletions

View File

@ -1,6 +1,6 @@
buildscript { buildscript {
ext { ext {
springBootVersion = '2.0.2.RELEASE' springBootVersion = '2.0.5.RELEASE'
} }
repositories { repositories {
mavenCentral() mavenCentral()
@ -24,7 +24,8 @@ dependencyManagement {
} }
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8 sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
repositories { repositories {
mavenCentral() mavenCentral()
@ -43,13 +44,13 @@ dependencies {
compile('org.springframework.boot:spring-boot-starter-hateoas') compile('org.springframework.boot:spring-boot-starter-hateoas')
compile('org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2') compile('org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2')
compile('org.springframework.boot:spring-boot-starter-web') 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('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') compileOnly('org.projectlombok:lombok')
runtime('com.h2database:h2') runtime('com.h2database:h2')
testCompile 'io.rest-assured:rest-assured:3.1.0' testCompile 'io.rest-assured:rest-assured:3.1.1'
testCompile 'io.rest-assured:spring-mock-mvc:3.1.0' testCompile 'io.rest-assured:spring-mock-mvc:3.1.1'
testCompile 'org.springframework.security:spring-security-test' testCompile 'org.springframework.security:spring-security-test'
testCompile('org.springframework.boot:spring-boot-starter-test') testCompile('org.springframework.boot:spring-boot-starter-test')
testCompile('org.springframework.restdocs:spring-restdocs-mockmvc') testCompile('org.springframework.restdocs:spring-restdocs-mockmvc')

View File

@ -4,9 +4,9 @@ import lombok.Data;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data @Data
@Getter @Getter
@NoArgsConstructor
public class Page { public class Page {
private static final int MAX_LIMIT = 100; private static final int MAX_LIMIT = 100;
private int offset = 0; private int offset = 0;

View File

@ -6,8 +6,8 @@ import lombok.NoArgsConstructor;
import java.util.UUID; import java.util.UUID;
@Data
@NoArgsConstructor @NoArgsConstructor
@Data
@EqualsAndHashCode(of = "name") @EqualsAndHashCode(of = "name")
public class Tag { public class Tag {
private String id; private String id;

View File

@ -3,8 +3,8 @@ package io.spring.core.user;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor @NoArgsConstructor
@Data
public class FollowRelation { public class FollowRelation {
private String userId; private String userId;
private String targetId; private String targetId;