aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-03-16 00:16:48 +0300
committerGravatar Vitaly Takmazov2018-03-16 00:16:48 +0300
commit7cadae166b103182d7d1daaafe602cd8fb145c53 (patch)
tree3ec1072caadce30821588828412d9400ffeb32bd
parent4f0fb934c083accf522d7cfc7082a9ea292d9955 (diff)
boot: jackson is in spring-boot-starter-json
-rw-r--r--build.gradle35
-rw-r--r--juick-core/build.gradle6
-rw-r--r--juick-server-core/build.gradle7
-rw-r--r--juick-server-jdbc/build.gradle6
-rw-r--r--juick-server-web/build.gradle5
5 files changed, 14 insertions, 45 deletions
diff --git a/build.gradle b/build.gradle
index 26bde551..44c69936 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,15 @@
+buildscript {
+ repositories {
+ mavenCentral()
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
+ }
+}
+plugins {
+ id 'org.springframework.boot' version '2.0.0.RELEASE'
+}
allprojects {
repositories {
mavenCentral()
@@ -9,6 +21,7 @@ allprojects {
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
apply plugin: 'com.github.ben-manes.versions'
+
dependencyUpdates.resolutionStrategy = {
componentSelection { rules ->
rules.all { ComponentSelection selection ->
@@ -23,36 +36,14 @@ allprojects {
}
}
-project.ext {
- springBootVersion = '2.0.0.RELEASE'
- jacksonVersion = '2.9.4'
-}
-
-buildscript {
- repositories {
- mavenCentral()
- jcenter()
- }
- dependencies {
- classpath "org.springframework.boot:spring-boot-gradle-plugin:2.0.0.RELEASE"
- classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
- }
-}
-
repositories {
jcenter()
}
-dependencyManagement {
- imports { mavenBom("org.springframework.boot:spring-boot-dependencies:${rootProject.springBootVersion}") }
-}
dependencies {
testCompile project(':juick-core')
testCompile project(':juick-www')
testCompile "org.json:json:20180130"
- testCompile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
- testCompile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
- testCompile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}"
compile("org.springframework.boot:spring-boot-starter-jdbc")
compile("org.springframework.boot:spring-boot-starter-test")
testRuntime "mysql:mysql-connector-java:5.1.40"
diff --git a/juick-core/build.gradle b/juick-core/build.gradle
index 2df3f402..431847a8 100644
--- a/juick-core/build.gradle
+++ b/juick-core/build.gradle
@@ -1,5 +1,5 @@
dependencies {
- compile "com.fasterxml.jackson.core:jackson-annotations:${rootProject.jacksonVersion}"
+ compile("org.springframework.boot:spring-boot-starter-json")
compile 'org.apache.commons:commons-lang3:3.7'
compile "commons-codec:commons-codec:1.11"
compile 'org.apache.commons:commons-collections4:4.1'
@@ -9,9 +9,5 @@ dependencies {
compile 'com.google.code.findbugs:jsr305:3.0.2'
testCompile("org.springframework.boot:spring-boot-starter-test")
- testCompile "com.fasterxml.jackson.core:jackson-core:${rootProject.jacksonVersion}"
- testCompile "com.fasterxml.jackson.core:jackson-databind:${rootProject.jacksonVersion}"
- testCompile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}"
- testCompile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${rootProject.jacksonVersion}"
testCompile "rocks.xmpp:xmpp-core-client:0.7.5"
}
diff --git a/juick-server-core/build.gradle b/juick-server-core/build.gradle
index a03f88da..55d31c42 100644
--- a/juick-server-core/build.gradle
+++ b/juick-server-core/build.gradle
@@ -4,13 +4,6 @@ sourceCompatibility = 1.8
dependencies {
compile project(':juick-core')
-
- compile "com.fasterxml.jackson.core:jackson-core:${rootProject.jacksonVersion}"
- compile "com.fasterxml.jackson.core:jackson-databind:${rootProject.jacksonVersion}"
- compile "com.fasterxml.jackson.core:jackson-annotations:${rootProject.jacksonVersion}"
- compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}"
- compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${rootProject.jacksonVersion}"
-
providedCompile "org.apache.commons:commons-lang3:3.7"
providedCompile "org.apache.commons:commons-collections4:4.1"
providedCompile "commons-io:commons-io:2.6"
diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle
index 84b14c93..3db97bfa 100644
--- a/juick-server-jdbc/build.gradle
+++ b/juick-server-jdbc/build.gradle
@@ -6,12 +6,6 @@ sourceCompatibility = 1.8
dependencies {
compile project(':juick-server-core')
- compile "com.fasterxml.jackson.core:jackson-core:${rootProject.jacksonVersion}"
- compile "com.fasterxml.jackson.core:jackson-databind:${rootProject.jacksonVersion}"
- compile "com.fasterxml.jackson.core:jackson-annotations:${rootProject.jacksonVersion}"
- compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}"
- compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${rootProject.jacksonVersion}"
-
compile "org.apache.commons:commons-lang3:3.7"
compile "org.apache.commons:commons-collections4:4.1"
diff --git a/juick-server-web/build.gradle b/juick-server-web/build.gradle
index 390b8e5a..eeccbdbc 100644
--- a/juick-server-web/build.gradle
+++ b/juick-server-web/build.gradle
@@ -1,10 +1,5 @@
dependencies {
compile project(':juick-server-core')
- compile "com.fasterxml.jackson.core:jackson-core:${rootProject.jacksonVersion}"
- compile "com.fasterxml.jackson.core:jackson-databind:${rootProject.jacksonVersion}"
- compile "com.fasterxml.jackson.core:jackson-annotations:${rootProject.jacksonVersion}"
- compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}"
- compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${rootProject.jacksonVersion}"
compile 'com.github.ben-manes.caffeine:caffeine:2.6.2'
compile("org.springframework.boot:spring-boot-starter-cache")