merge common projects

1 files changed, 13 insertions, 13 deletions

diff --git a/build.gradle b/build.gradle
index 44c69936..91d6d56c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 }
 plugins {
-    id 'org.springframework.boot' version '2.0.0.RELEASE'
+    id 'org.springframework.boot' version '2.0.0.RELEASE' apply false
 }
 allprojects {
     repositories {
@@ -17,11 +17,15 @@ allprojects {
         maven { url "https://jitpack.io" }
         maven { url "https://repository.apache.org/content/repositories/snapshots/" }
     }
-    apply plugin: 'java'
-    apply plugin: 'org.springframework.boot'
+
     apply plugin: 'io.spring.dependency-management'
-    apply plugin: 'com.github.ben-manes.versions'
+    dependencyManagement {
+        imports {
+            mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES
+        }
+    }
 
+    apply plugin: 'com.github.ben-manes.versions'
     dependencyUpdates.resolutionStrategy = {
         componentSelection { rules ->
           rules.all { ComponentSelection selection ->
@@ -36,19 +40,15 @@ allprojects {
     }
 }
 
-repositories {
-    jcenter()
-}
+apply plugin: 'java'
+
 dependencies {
-    testCompile project(':juick-core')
-    testCompile project(':juick-www')
+    compile project(':juick-common')
 
     testCompile "org.json:json:20180130"
-    compile("org.springframework.boot:spring-boot-starter-jdbc")
-    compile("org.springframework.boot:spring-boot-starter-test")
+    testCompile("org.springframework.boot:spring-boot-starter-jdbc")
+    testCompile("org.springframework.boot:spring-boot-starter-test")
     testRuntime "mysql:mysql-connector-java:5.1.40"
     testRuntime "org.postgresql:postgresql:42.2.1"
 }
 
-compileJava.options.encoding = 'UTF-8'
-