Merge pull request #43 from wreulicke/feature/update-deps

dai0304 · web-flow · commit cb6de5c6109d · 2018-06-22T10:55:34.000+09:00
Apply dependency management
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ bin/
 .settings
 .idea
 *.iml
+out/
diff --git a/build.gradle b/build.gradle
@@ -11,6 +11,7 @@ buildscript {
 		classpath "com.diffplug.spotless:spotless-plugin-gradle:3.13.0"
 		classpath "de.thetaphi:forbiddenapis:2.2"
 		classpath "de.aaschmid:gradle-cpd-plugin:1.0"
+		classpath "io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE"
 	}
 }
 
@@ -39,9 +40,16 @@ description "Support library for Spring framework, AWS Java SDK and the others."
 
 subprojects {
 	apply plugin: "java"
+	apply plugin: "io.spring.dependency-management"
 	apply plugin: "maven"
 	apply plugin: "maven-publish"
 	apply plugin: "com.jfrog.bintray"
+
+	dependencyManagement {
+		imports {
+			mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion"
+		}
+	}
 	
 	sourceCompatibility = targetCompatibility = 1.8
 	
@@ -53,7 +61,7 @@ subprojects {
 	apply plugin: "jacoco"
 	apply plugin: "de.thetaphi.forbiddenapis"
 	apply plugin: "com.diffplug.gradle.spotless"
-	
+
 	// code quality configuration
 	apply from: "${rootProject.projectDir}/gradle/quality/checkstyle.gradle"
 	apply from: "${rootProject.projectDir}/gradle/quality/findbugs.gradle"
@@ -86,13 +94,14 @@ subprojects {
 	}
 	
 	dependencies {
-		compile "org.slf4j:slf4j-api:$slf4jVersion"
+		compile "org.slf4j:slf4j-api"
 		compileOnly "org.projectlombok:lombok:$lombokVersion"
-		testCompile "org.slf4j:jul-to-slf4j:$slf4jVersion"
-		testCompile "ch.qos.logback:logback-classic:$logbackVersion"
+		testCompile "org.slf4j:jul-to-slf4j"
+		testCompile "org.slf4j:jcl-over-slf4j"
+		testCompile "ch.qos.logback:logback-classic"
 		testCompile "junit:junit:$junitVersion"
 		testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
-		testCompile "org.mockito:mockito-core:$mockitoCoreVersion"
+		testCompile "org.mockito:mockito-core"
 	}
 	
 	
diff --git a/gradle.properties b/gradle.properties
@@ -1,20 +1,11 @@
 # dependency versions
 springBootVersion = 1.5.9.RELEASE
-springVersion = 4.3.13.RELEASE
-springSecurityVersion = 4.2.3.RELEASE
-springRetryVersion = 1.2.1.RELEASE
 springSecurityOauth2Version = 2.2.1.RELEASE
-springDataVersion = 1.12.11.RELEASE
-springHateoasVersion = 0.19.0.RELEASE
 awsJavaSdkVersion = 1.11.233
-jacksonVersion = 2.7.2
 
 lombokVersion = 1.16.18
 baseunitsVersion = 2.14
 
-slf4jVersion = 1.7.25
-logbackVersion = 1.1.11
-
 junitVersion = 4.12
 hamcrestVersion = 1.3
-mockitoCoreVersion = 1.9.5
+mockito.version = 2.19.0
diff --git a/spar-wings-aws-essential/build.gradle b/spar-wings-aws-essential/build.gradle
@@ -3,6 +3,6 @@
 description "Essential support library for AWS Java SDK in Spring framework environment."
 
 dependencies {
-	compile "org.springframework:spring-beans:$springVersion"
+	compile "org.springframework:spring-beans"
 	compile "com.amazonaws:aws-java-sdk-core:$awsJavaSdkVersion"
 }
diff --git a/spar-wings-aws-logging/build.gradle b/spar-wings-aws-logging/build.gradle
@@ -3,7 +3,8 @@
 description "Servlet filter which adds EC2 instance metadata to SLF4J MDC."
 
 dependencies {
-	compile "javax.servlet:javax.servlet-api:3.1.0"
-	compile "org.springframework:spring-web:$springVersion"
+	compileOnly "javax.servlet:javax.servlet-api"
+	compile "org.springframework:spring-web"
+	compile "org.springframework:spring-context"
 	compile project(":spar-wings-aws-essential")
 }
diff --git a/spar-wings-awscli-config/src/test/java/jp/xet/sparwings/aws/auth/AwsCliConfigFileTest.java b/spar-wings-awscli-config/src/test/java/jp/xet/sparwings/aws/auth/AwsCliConfigFileTest.java
@@ -26,7 +26,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
diff --git a/spar-wings-awscli-config/src/test/java/jp/xet/sparwings/aws/auth/AwsCliConfigProfileCredentialsProviderTest.java b/spar-wings-awscli-config/src/test/java/jp/xet/sparwings/aws/auth/AwsCliConfigProfileCredentialsProviderTest.java
@@ -17,7 +17,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSCredentialsProvider;
diff --git a/spar-wings-dynamodb-json-patch/build.gradle b/spar-wings-dynamodb-json-patch/build.gradle
@@ -3,7 +3,7 @@
 description "Support library for DynamoDB to support JSON Patch (RFC 6902) request."
 
 dependencies {
-//	compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+//	compile "com.fasterxml.jackson.core:jackson-databind"
 	compile "com.github.fge:jackson-coreutils:1.6"
 	compile "com.amazonaws:aws-java-sdk-dynamodb:$awsJavaSdkVersion"
 	
diff --git a/spar-wings-event/build.gradle b/spar-wings-event/build.gradle
@@ -3,9 +3,9 @@
 description "Support library to emit event in JSON"
 
 dependencies {
-	compile "org.springframework:spring-context:$springVersion"
+	compile "org.springframework:spring-context"
 	compile "com.amazonaws:aws-java-sdk-sns:$awsJavaSdkVersion"
-	compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+	compile "com.fasterxml.jackson.core:jackson-databind"
 	compile "jp.xet:baseunits:$baseunitsVersion"
 	
 	testCompile 'com.jayway.jsonpath:json-path-assert:2.2.0'
diff --git a/spar-wings-http-dump/build.gradle b/spar-wings-http-dump/build.gradle
@@ -3,6 +3,6 @@
 description "Servlet filter implementation which dump every HTTP request and response."
 
 dependencies {
-	compile "javax.servlet:javax.servlet-api:3.1.0"
-	compile "org.springframework:spring-web:$springVersion"
+	compileOnly "javax.servlet:javax.servlet-api"
+	compile "org.springframework:spring-web"
 }
diff --git a/spar-wings-httpexceptions/build.gradle b/spar-wings-httpexceptions/build.gradle
@@ -3,5 +3,5 @@
 description "Exceptions for Spring MVC framework to return error HTTP statuses."
 
 dependencies {
-	compile "org.springframework:spring-web:$springVersion"
+	compile "org.springframework:spring-web"
 }
diff --git a/spar-wings-jackson-essential/build.gradle b/spar-wings-jackson-essential/build.gradle
@@ -3,6 +3,6 @@
 description "Essential support library for Jackson v2."
 
 dependencies {
-	compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+	compile "com.fasterxml.jackson.core:jackson-databind"
 	testCompile "com.jayway.jsonpath:json-path-assert:2.2.0"
 }
diff --git a/spar-wings-json-patch/build.gradle b/spar-wings-json-patch/build.gradle
@@ -3,6 +3,6 @@
 description "Support library for Spring MVC to support JSON Patch (RFC 6902) request."
 
 dependencies {
-	compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+	compile "com.fasterxml.jackson.core:jackson-databind"
 	compile "com.github.fge:json-patch:1.9"
 }
diff --git a/spar-wings-monolith/build.gradle b/spar-wings-monolith/build.gradle
@@ -2,28 +2,25 @@
 
 dependencies {
 	compile "com.google.guava:guava:18.0"
-	compile "jp.xet:baseunits:2.13"
-	compile "javax.servlet:javax.servlet-api:3.1.0"
+	compile "jp.xet:baseunits:$baseunitsVersion"
+	compileOnly "javax.servlet:javax.servlet-api"
 	compile "com.googlecode.htmlcompressor:htmlcompressor:1.5.2"
 	
-	compile "javax.json:javax.json-api:1.0"
-	compile "org.glassfish:javax.json:1.0.4"
-	
 	compile "com.amazonaws:aws-java-sdk-dynamodb:$awsJavaSdkVersion"
 	compile "com.amazonaws:aws-java-sdk-sns:$awsJavaSdkVersion"
 	
-	compile "org.springframework:spring-web:$springVersion"
-	compile "org.springframework:spring-webmvc:$springVersion"
-	compile "org.springframework.security:spring-security-core:$springSecurityVersion"
-	compile "org.springframework.security:spring-security-config:$springSecurityVersion"
-	compile "org.springframework.security:spring-security-web:$springSecurityVersion"
+	compile "org.springframework:spring-web"
+	compile "org.springframework:spring-webmvc"
+	compile "org.springframework.security:spring-security-core"
+	compile "org.springframework.security:spring-security-config"
+	compile "org.springframework.security:spring-security-web"
 	compile "org.springframework.security.oauth:spring-security-oauth2:$springSecurityOauth2Version"
-	compile "org.springframework.retry:spring-retry:$springRetryVersion"
-	compile "org.springframework.data:spring-data-commons:$springDataVersion"
-	compile "org.springframework.data:spring-data-redis:1.7.11.RELEASE"
+	compile "org.springframework.retry:spring-retry"
+	compile "org.springframework.data:spring-data-commons"
+	compile "org.springframework.data:spring-data-redis"
 	compile "redis.clients:jedis:2.5.2"
 	
-	compile "org.springframework.boot:spring-boot-autoconfigure:1.2.5.RELEASE"
+	compile "org.springframework.boot:spring-boot-autoconfigure"
 	
 	compile project(":spar-wings-httpexceptions")
 	compile project(":spar-wings-aws-essential")
diff --git a/spar-wings-ratelimiter/build.gradle b/spar-wings-ratelimiter/build.gradle
@@ -3,9 +3,9 @@
 description "Support library for Spring MVC to support HTTP request rate limiter."
 
 dependencies {
-	compile "javax.servlet:javax.servlet-api:3.1.0"
-	compile "org.springframework:spring-webmvc:$springVersion"
-	compile "org.springframework.security:spring-security-core:$springSecurityVersion"
+	compileOnly "javax.servlet:javax.servlet-api"
+	compile "org.springframework:spring-webmvc"
+	compile "org.springframework.security:spring-security-core"
 	compile "org.springframework.data:spring-data-redis:1.7.11.RELEASE"
 	compile "redis.clients:jedis:2.5.2"
 	compile "jp.xet:baseunits:$baseunitsVersion"
diff --git a/spar-wings-ratelimiter/src/test/java/jp/xet/sparwings/spring/web/ratelimiter/InMemoryRateLimitServiceTest.java b/spar-wings-ratelimiter/src/test/java/jp/xet/sparwings/spring/web/ratelimiter/InMemoryRateLimitServiceTest.java
@@ -33,7 +33,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import jp.xet.baseunits.time.TimePoint;
 import jp.xet.baseunits.timeutil.Clock;
@@ -44,7 +44,7 @@
  * TODO for daisuke
  */
 @Slf4j
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class InMemoryRateLimitServiceTest {
 	
 	@Mock
diff --git a/spar-wings-ratelimiter/src/test/java/jp/xet/sparwings/spring/web/ratelimiter/RedisRateLimitServiceTest.java b/spar-wings-ratelimiter/src/test/java/jp/xet/sparwings/spring/web/ratelimiter/RedisRateLimitServiceTest.java
@@ -38,7 +38,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import jp.xet.baseunits.time.TimePoint;
 import jp.xet.baseunits.timeutil.Clock;
@@ -49,7 +49,7 @@
  * TODO for daisuke
  */
 @Slf4j
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class RedisRateLimitServiceTest {
 	
 	@Mock
diff --git a/spar-wings-request-id/build.gradle b/spar-wings-request-id/build.gradle
@@ -3,6 +3,7 @@
 description "Servlet filter implementation which issues request ID for every HTTP request."
 
 dependencies {
-	compile "javax.servlet:javax.servlet-api:3.1.0"
-	compile "org.springframework:spring-web:$springVersion"
+	compileOnly "javax.servlet:javax.servlet-api"
+	compile "org.springframework:spring-web"
+	compile "org.springframework:spring-context"
 }
diff --git a/spar-wings-sns-notification/build.gradle b/spar-wings-sns-notification/build.gradle
@@ -4,7 +4,7 @@ description "Amazon SNS client wrapper to notify messages to developers or opera
 
 dependencies {
 	compile "com.amazonaws:aws-java-sdk-sns:$awsJavaSdkVersion"
-	testCompile "org.springframework:spring-context:$springVersion"
+	testCompile "org.springframework:spring-context"
 	compile project(":spar-wings-spring-essential")
 	compile project(":spar-wings-aws-essential")
 }
diff --git a/spar-wings-spring-data-chunk/build.gradle b/spar-wings-spring-data-chunk/build.gradle
@@ -3,11 +3,12 @@
 description "Spring data support library to enable Chunk (like Page) feature."
 
 dependencies {
-	compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
-	compile "org.springframework.data:spring-data-commons:$springDataVersion"
-	compile "org.springframework:spring-web:$springVersion"
-	compileOnly "org.springframework:spring-tx:$springVersion"
+	compile "com.fasterxml.jackson.core:jackson-databind"
+	compile "org.springframework.data:spring-data-commons"
+	compile "org.springframework:spring-web"
+	compile "org.springframework:spring-context"
+	compileOnly "org.springframework:spring-tx"
 	
-	testCompile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+	testCompile "com.fasterxml.jackson.core:jackson-databind"
 	testCompile "com.jayway.jsonpath:json-path-assert:2.2.0"
 }
diff --git a/spar-wings-spring-data-chunk/src/test/java/jp/xet/sparwings/spring/data/web/ChunkableHandlerMethodArgumentResolverTest.java b/spar-wings-spring-data-chunk/src/test/java/jp/xet/sparwings/spring/data/web/ChunkableHandlerMethodArgumentResolverTest.java
@@ -21,7 +21,7 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/spar-wings-spring-essential/build.gradle b/spar-wings-spring-essential/build.gradle
@@ -3,5 +3,5 @@
 description "Essential support library for Spring framework."
 
 dependencies {
-	compile "org.springframework:spring-beans:$springVersion"
+	compile "org.springframework:spring-beans"
 }
diff --git a/spar-wings-spring-s3/build.gradle b/spar-wings-spring-s3/build.gradle
@@ -3,8 +3,8 @@
 description "Support library for Spring framework to use S3 objects as resources."
 
 dependencies {
-	compile "org.springframework:spring-web:$springVersion"
-	compile "org.springframework:spring-webmvc:$springVersion"
+	compile "org.springframework:spring-web"
+	compile "org.springframework:spring-webmvc"
 	compile "com.amazonaws:aws-java-sdk-s3:$awsJavaSdkVersion"
-	compile "javax.servlet:javax.servlet-api:3.1.0"
+	compile "javax.servlet:javax.servlet-api"
 }
diff --git a/spar-wings-spring-s3/src/test/java/jp/xet/sparwings/spring/s3/S3AssetsResolverTest.java b/spar-wings-spring-s3/src/test/java/jp/xet/sparwings/spring/s3/S3AssetsResolverTest.java
@@ -18,19 +18,19 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import org.springframework.core.io.Resource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Test for {@link S3AssetsResolver}.
- * 
+ *
  * @since 0.12
  * @author fd0
  */
diff --git a/spar-wings-spring-s3/src/test/java/jp/xet/sparwings/spring/s3/S3ObjectResourceLoaderTest.java b/spar-wings-spring-s3/src/test/java/jp/xet/sparwings/spring/s3/S3ObjectResourceLoaderTest.java
@@ -17,7 +17,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
@@ -29,7 +29,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.amazonaws.services.s3.AmazonS3;
 
diff --git a/spar-wings-spring-s3/src/test/java/jp/xet/sparwings/spring/s3/S3ObjectResourceTest.java b/spar-wings-spring-s3/src/test/java/jp/xet/sparwings/spring/s3/S3ObjectResourceTest.java
@@ -18,7 +18,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -29,7 +29,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.model.AmazonS3Exception;
diff --git a/spar-wings-spring-security-essential/build.gradle b/spar-wings-spring-security-essential/build.gradle
diff --git a/spar-wings-sqs-poller/build.gradle b/spar-wings-sqs-poller/build.gradle
diff --git a/spar-wings-sqs-poller/src/test/java/jp/xet/sparwings/aws/sqs/SqsMessagePollerTest.java b/spar-wings-sqs-poller/src/test/java/jp/xet/sparwings/aws/sqs/SqsMessagePollerTest.java
diff --git a/spar-wings-testing-uri-matcher/build.gradle b/spar-wings-testing-uri-matcher/build.gradle

-Original file line number
+Diff line change
 .settings
 .idea
 *.iml
 +out/
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`description "Essential support library for AWS Java SDK in Spring framework environment."`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- compile "org.springframework:spring-beans:$springVersion"`
	`6`	`+ compile "org.springframework:spring-beans"`
`7`	`7`	`compile "com.amazonaws:aws-java-sdk-core:$awsJavaSdkVersion"`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`description "Servlet filter implementation which dump every HTTP request and response."`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- compile "javax.servlet:javax.servlet-api:3.1.0"`
`7`		`- compile "org.springframework:spring-web:$springVersion"`
	`6`	`+ compileOnly "javax.servlet:javax.servlet-api"`
	`7`	`+ compile "org.springframework:spring-web"`
`8`	`8`	`}`