From 677471013442bcb5455d4c827d7a13a17392fc8f Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 2 Dec 2016 23:37:04 +0300 Subject: move project dependencies versions definitions to the root project --- build.gradle | 17 ++++++++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- juick-api/build.gradle | 9 +++---- juick-core/build.gradle | 7 ++---- juick-crosspost/build.gradle | 4 +--- juick-notifications/build.gradle | 4 +--- juick-server/build.gradle | 40 ++++++++++++++------------------ juick-spring-www/build.gradle | 5 ++-- juick-ws/build.gradle | 8 +++---- juick-www/build.gradle | 4 +--- juick-xmpp-bot/build.gradle | 4 +--- juick-xmpp-ft/build.gradle | 4 +--- juick-xmpp/build.gradle | 14 ++++------- settings.gradle | 2 ++ 14 files changed, 53 insertions(+), 71 deletions(-) diff --git a/build.gradle b/build.gradle index 3af0fdae..a32de4f1 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,15 @@ allprojects { maven { url "https://jitpack.io" } } } + +project.ext { + springFrameworkVersion = '4.3.4.RELEASE' + springSecurityVersion = '4.2.0.RELEASE' + jacksonVersion = '2.8.5' + slf4jVersion = '1.7.21' + logbackVersion = '1.1.7' +} + buildscript { repositories { mavenCentral() @@ -24,11 +33,11 @@ dependencies { testCompile project(':juick-www') testCompile project(':juick-xmpp') testCompile 'org.json:json:20160810' - testCompile 'com.fasterxml.jackson.core:jackson-core:2.8.1' - testCompile 'com.fasterxml.jackson.core:jackson-databind:2.8.1' - testCompile 'org.springframework:spring-jdbc:4.3.4.RELEASE' + testCompile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" + testCompile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" + testCompile "org.springframework:spring-jdbc:${springFrameworkVersion}" testCompile 'ch.vorburger.mariaDB4j:mariaDB4j:2.2.2' - testCompile 'org.slf4j:slf4j-api:1.7.21' + testCompile "org.slf4j:slf4j-api:${slf4jVersion}" testCompile 'junit:junit:4.12' testRuntime 'mysql:mysql-connector-java:5.1.40' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 22638eef..dc982772 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip diff --git a/juick-api/build.gradle b/juick-api/build.gradle index 203130b2..8b6dd0e6 100644 --- a/juick-api/build.gradle +++ b/juick-api/build.gradle @@ -9,13 +9,10 @@ apply plugin: 'war' apply plugin: 'org.akhikhl.gretty' apply plugin: 'com.github.ben-manes.versions' -def springFrameworkVersion = "4.3.4.RELEASE" -def springSecurityVersion = "4.2.0.RELEASE" - dependencies { compile project(':juick-server') - compile "org.springframework:spring-webmvc:${springFrameworkVersion}" + compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}" compile 'com.github.pengrad:java-telegram-bot-api:2.3.0' compile 'org.msbotframework4j:msbotframework4j-builder:0.1.4' @@ -26,8 +23,8 @@ dependencies { testCompile "junit:junit:4.12" testCompile "org.hamcrest:hamcrest-all:1.3" testCompile "org.mockito:mockito-core:1.+" - testCompile "org.springframework:spring-test:${springFrameworkVersion}" - testCompile "org.springframework.security:spring-security-test:${springSecurityVersion}" + testCompile "org.springframework:spring-test:${rootProject.springFrameworkVersion}" + testCompile "org.springframework.security:spring-security-test:${rootProject.springSecurityVersion}" testRuntime 'com.jayway.jsonpath:json-path:2.2.0' } diff --git a/juick-core/build.gradle b/juick-core/build.gradle index 295a22d3..8a7e00b6 100644 --- a/juick-core/build.gradle +++ b/juick-core/build.gradle @@ -1,12 +1,9 @@ apply plugin: 'java' apply plugin: 'com.github.ben-manes.versions' -def slf4jVersion = '1.7.21' -def jacksonVersion = '2.8.5' - dependencies { - compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" - compile "org.slf4j:slf4j-api:${slf4jVersion}" + compile "com.fasterxml.jackson.core:jackson-annotations:${rootProject.jacksonVersion}" + compile "org.slf4j:slf4j-api:${rootProject.slf4jVersion}" compile 'org.apache.httpcomponents:httpclient:4.5.2' compile 'org.apache.commons:commons-lang3:3.5' compile 'org.apache.commons:commons-collections4:4.1' diff --git a/juick-crosspost/build.gradle b/juick-crosspost/build.gradle index 11b47f84..30b13533 100644 --- a/juick-crosspost/build.gradle +++ b/juick-crosspost/build.gradle @@ -3,11 +3,9 @@ apply plugin: 'war' apply plugin: 'org.akhikhl.gretty' apply plugin: 'com.github.ben-manes.versions' -def springFrameworkVersion = '4.3.4.RELEASE' - dependencies { compile project(':juick-server') - compile "org.springframework:spring-webmvc:${springFrameworkVersion}" + compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}" compile 'com.mitchellbosecke:pebble-spring4:2.3.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' } diff --git a/juick-notifications/build.gradle b/juick-notifications/build.gradle index c66fbd86..80795368 100644 --- a/juick-notifications/build.gradle +++ b/juick-notifications/build.gradle @@ -3,13 +3,11 @@ apply plugin: 'war' apply plugin: 'org.akhikhl.gretty' apply plugin: 'com.github.ben-manes.versions' -def springFrameworkVersion = '4.3.4.RELEASE' - dependencies { compile project(':juick-server') compile 'com.ganyo:gcm-server:1.1.0' compile 'com.notnoop.apns:apns:1.0.0.Beta6' - compile "org.springframework:spring-webmvc:${springFrameworkVersion}" + compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}" compile 'com.mitchellbosecke:pebble-spring4:2.3.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' testCompile 'junit:junit:4.12' diff --git a/juick-server/build.gradle b/juick-server/build.gradle index 23387506..550f41c5 100644 --- a/juick-server/build.gradle +++ b/juick-server/build.gradle @@ -4,40 +4,34 @@ apply plugin: 'com.github.ben-manes.versions' sourceCompatibility = 1.8 -def jacksonVersion = '2.8.5' -def logbackVersion = '1.1.7' -def slf4jVersion = '1.7.21' -def springFrameworkVersion = '4.3.4.RELEASE' -def springSecurityVersion = "4.2.0.RELEASE" - dependencies { compile project(':juick-core') - compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" - compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" - compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jacksonVersion}" + 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 "ch.qos.logback:logback-classic:${logbackVersion}" - compile "ch.qos.logback:logback-core:${logbackVersion}" - compile "ch.qos.logback:logback-access:${logbackVersion}" + compile "ch.qos.logback:logback-classic:${rootProject.logbackVersion}" + compile "ch.qos.logback:logback-core:${rootProject.logbackVersion}" + compile "ch.qos.logback:logback-access:${rootProject.logbackVersion}" - compile "org.slf4j:slf4j-api:${slf4jVersion}" - compile "org.slf4j:jcl-over-slf4j:${slf4jVersion}" - compile "org.slf4j:log4j-over-slf4j:${slf4jVersion}" - compile "org.slf4j:jul-to-slf4j:${slf4jVersion}" + compile "org.slf4j:slf4j-api:${rootProject.slf4jVersion}" + compile "org.slf4j:jcl-over-slf4j:${rootProject.slf4jVersion}" + compile "org.slf4j:log4j-over-slf4j:${rootProject.slf4jVersion}" + compile "org.slf4j:jul-to-slf4j:${rootProject.slf4jVersion}" compile 'org.apache.httpcomponents:httpclient:4.5.2' compile 'org.apache.commons:commons-lang3:3.5' compile 'org.apache.commons:commons-collections4:4.1' compile 'commons-io:commons-io:2.5' - compile "org.springframework:spring-context:${springFrameworkVersion}" - compile "org.springframework:spring-jdbc:${springFrameworkVersion}" + compile "org.springframework:spring-context:${rootProject.springFrameworkVersion}" + compile "org.springframework:spring-jdbc:${rootProject.springFrameworkVersion}" providedCompile 'javax.servlet:javax.servlet-api:3.1.0' - compile "org.springframework.security:spring-security-web:${springSecurityVersion}" - compile "org.springframework.security:spring-security-config:${springSecurityVersion}" + compile "org.springframework.security:spring-security-web:${rootProject.springSecurityVersion}" + compile "org.springframework.security:spring-security-config:${rootProject.springSecurityVersion}" compile 'org.apache.commons:commons-dbcp2:2.1.1' compile 'com.googlecode.log4jdbc:log4jdbc:1.2' @@ -49,8 +43,8 @@ dependencies { testCompile "ch.vorburger.mariaDB4j:mariaDB4j:2.2.2" testCompile "junit:junit:4.12" testCompile "org.mockito:mockito-core:1.+" - testCompile "org.springframework:spring-test:${springFrameworkVersion}" - testCompile "org.springframework.security:spring-security-test:${springSecurityVersion}" + testCompile "org.springframework:spring-test:${rootProject.springFrameworkVersion}" + testCompile "org.springframework.security:spring-security-test:${rootProject.springSecurityVersion}" testRuntime "org.thymeleaf:thymeleaf-testing:3.0.1.RELEASE" testRuntime "mysql:mysql-connector-java:5.1.40" diff --git a/juick-spring-www/build.gradle b/juick-spring-www/build.gradle index 14b3bb9c..c05cc612 100644 --- a/juick-spring-www/build.gradle +++ b/juick-spring-www/build.gradle @@ -18,14 +18,13 @@ apply plugin: 'war' apply plugin: 'org.akhikhl.gretty' apply plugin: 'com.github.ben-manes.versions' -def springFrameworkVersion = "4.3.4.RELEASE" def thymeleafVersion = "3.0.2.RELEASE" dependencies { compile project(':juick-server') compile "com.sun.mail:javax.mail:1.5.6" compile "org.pegdown:pegdown:1.6.0" - compile "org.springframework:spring-webmvc:${springFrameworkVersion}" + compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}" compile "org.thymeleaf:thymeleaf:${thymeleafVersion}" compile "org.thymeleaf:thymeleaf-spring4:${thymeleafVersion}" compile "org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.0.RELEASE" @@ -34,7 +33,7 @@ dependencies { testCompile "junit:junit:4.12" testCompile "org.mockito:mockito-core:1.+" - testCompile "org.springframework:spring-test:${springFrameworkVersion}" + testCompile "org.springframework:spring-test:${rootProject.springFrameworkVersion}" testCompile "ch.vorburger.mariaDB4j:mariaDB4j:2.2.2" testCompile "org.thymeleaf:thymeleaf-testing:3.0.1.RELEASE" diff --git a/juick-ws/build.gradle b/juick-ws/build.gradle index 2326a13b..f9c88393 100644 --- a/juick-ws/build.gradle +++ b/juick-ws/build.gradle @@ -11,13 +11,11 @@ apply plugin: 'war' apply plugin: 'org.akhikhl.gretty' apply plugin: 'com.github.ben-manes.versions' -def springFrameworkVersion = '4.3.4.RELEASE' - dependencies { compile project(':juick-server') - compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.6.3' - compile "org.springframework:spring-webmvc:${springFrameworkVersion}" - compile "org.springframework:spring-websocket:${springFrameworkVersion}" + compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${rootProject.jacksonVersion}" + compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}" + compile "org.springframework:spring-websocket:${rootProject.springFrameworkVersion}" compile 'com.mitchellbosecke:pebble-spring4:2.3.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' } diff --git a/juick-www/build.gradle b/juick-www/build.gradle index 6ed95125..a5622316 100644 --- a/juick-www/build.gradle +++ b/juick-www/build.gradle @@ -18,8 +18,6 @@ apply plugin: 'war' apply plugin: 'org.akhikhl.gretty' apply plugin: 'com.github.ben-manes.versions' -def springFrameworkVersion = '4.3.4.RELEASE' - dependencies { compile project(':juick-server') compile 'com.github.scribejava:scribejava-apis:3.3.0' @@ -27,7 +25,7 @@ dependencies { compile 'com.github.ooxi:serialized-php-parser:0.5.0' compile 'com.mitchellbosecke:pebble:2.2.3' compile 'com.sun.mail:javax.mail:1.5.6' - compile "org.springframework:spring-webmvc:${springFrameworkVersion}" + compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}" compile 'com.mitchellbosecke:pebble-spring4:2.3.0' providedCompile 'javax.servlet:javax.servlet-api:3.1.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' diff --git a/juick-xmpp-bot/build.gradle b/juick-xmpp-bot/build.gradle index b7635da8..1cc7a352 100644 --- a/juick-xmpp-bot/build.gradle +++ b/juick-xmpp-bot/build.gradle @@ -3,11 +3,9 @@ apply plugin: 'war' apply plugin: 'org.akhikhl.gretty' apply plugin: 'com.github.ben-manes.versions' -def springFrameworkVersion = '4.3.4.RELEASE' - dependencies { compile project(':juick-server') - compile "org.springframework:spring-webmvc:${springFrameworkVersion}" + compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}" compile 'com.mitchellbosecke:pebble-spring4:2.3.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' } diff --git a/juick-xmpp-ft/build.gradle b/juick-xmpp-ft/build.gradle index b7635da8..1cc7a352 100644 --- a/juick-xmpp-ft/build.gradle +++ b/juick-xmpp-ft/build.gradle @@ -3,11 +3,9 @@ apply plugin: 'war' apply plugin: 'org.akhikhl.gretty' apply plugin: 'com.github.ben-manes.versions' -def springFrameworkVersion = '4.3.4.RELEASE' - dependencies { compile project(':juick-server') - compile "org.springframework:spring-webmvc:${springFrameworkVersion}" + compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}" compile 'com.mitchellbosecke:pebble-spring4:2.3.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' } diff --git a/juick-xmpp/build.gradle b/juick-xmpp/build.gradle index 5462a879..808166b6 100644 --- a/juick-xmpp/build.gradle +++ b/juick-xmpp/build.gradle @@ -3,18 +3,14 @@ apply plugin: 'war' apply plugin: 'org.akhikhl.gretty' apply plugin: 'com.github.ben-manes.versions' -def springFrameworkVersion = '4.3.4.RELEASE' -def jacksonVersion = '2.8.5' -def slf4jVersion = '1.7.21' - dependencies { compile project(':juick-server') compile 'com.github.juick:com.juick.xmpp:dbf603cfff' - compile "org.slf4j:slf4j-api:${slf4jVersion}" - compile "org.springframework:spring-webmvc:${springFrameworkVersion}" - compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" - compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jacksonVersion}" + compile "org.slf4j:slf4j-api:${rootProject.slf4jVersion}" + compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}" + compile "com.fasterxml.jackson.core:jackson-core:${rootProject.jacksonVersion}" + compile "com.fasterxml.jackson.core:jackson-databind:${rootProject.jacksonVersion}" + compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}" compile 'javax.inject:javax.inject:1' compile 'org.apache.httpcomponents:httpclient:4.5.2' compile 'org.apache.commons:commons-dbcp2:2.1.1' diff --git a/settings.gradle b/settings.gradle index 773e9537..efc9a711 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,4 @@ +rootProject.name = "Juick" + include ':juick-core', 'juick-server', ':juick-api', ':juick-www', ':juick-rss', ':juick-ws', ':juick-demo', ':juick-notifications', ':juick-crosspost', ':juick-xmpp', ':juick-xmpp-ft', ':juick-xmpp-bot', ':juick-spring-www' -- cgit v1.2.3