aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexander Alexeev2016-11-12 00:36:37 +0700
committerGravatar Vitaly Takmazov2016-11-12 11:14:48 +0300
commit5179f9417dc3a2ad1da45c4aafa82f6f646c61e8 (patch)
tree77628ee3544ada9c3259a51dad398fcbd6220a39
parent5a9bfa524dcd27f357a8838acb7f150660061ae6 (diff)
configuration updated: common dependences moved to core module
-rw-r--r--juick-api/build.gradle7
-rw-r--r--juick-core/build.gradle9
-rw-r--r--juick-crosspost/build.gradle9
-rw-r--r--juick-demo/build.gradle5
-rw-r--r--juick-notifications/build.gradle9
-rw-r--r--juick-rss/build.gradle5
-rw-r--r--juick-ws/build.gradle10
-rw-r--r--juick-www/build.gradle5
-rw-r--r--juick-xmpp-ft/build.gradle16
9 files changed, 13 insertions, 62 deletions
diff --git a/juick-api/build.gradle b/juick-api/build.gradle
index 98a5fc7c..30e2a94a 100644
--- a/juick-api/build.gradle
+++ b/juick-api/build.gradle
@@ -17,21 +17,14 @@ repositories {
mavenCentral()
}
-def slf4jVersion = '1.7.21'
-
dependencies {
compile project(':juick-core')
compile project(':deps:com.juick.xmpp')
- compile "org.apache.commons:commons-lang3:3.5"
- compile "org.springframework:spring-jdbc:4.3.4.RELEASE"
providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
- compile 'javax.inject:javax.inject:1'
compile 'com.github.pengrad:java-telegram-bot-api:2.1.4'
compile 'org.msbotframework4j:msbotframework4j-builder:0.1.4'
compile 'com.neovisionaries:nv-websocket-client:1.30'
- compile 'org.apache.commons:commons-dbcp2:2.1.1'
compile 'net.coobird:thumbnailator:0.4.8'
- compile 'org.slf4j:slf4j-api:${slf4jVersion}'
providedRuntime 'mysql:mysql-connector-java:5.1.40'
}
diff --git a/juick-core/build.gradle b/juick-core/build.gradle
index 873b0495..e3a35e29 100644
--- a/juick-core/build.gradle
+++ b/juick-core/build.gradle
@@ -26,10 +26,17 @@ dependencies {
compile "org.slf4j:jul-to-slf4j:${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.apache.commons:commons-dbcp2:2.1.1'
compile 'org.json:json:20160810'
+ compile 'javax.inject:javax.inject:1'
}
-compileJava.options.encoding = 'UTF-8' \ No newline at end of file
+compileJava.options.encoding = 'UTF-8'
+
+configurations {
+ all*.exclude module: 'commons-logging'
+} \ No newline at end of file
diff --git a/juick-crosspost/build.gradle b/juick-crosspost/build.gradle
index 21b91264..21b7019e 100644
--- a/juick-crosspost/build.gradle
+++ b/juick-crosspost/build.gradle
@@ -8,19 +8,10 @@ repositories {
}
def springFrameworkVersion = '4.3.4.RELEASE'
-def jacksonVersion = '2.8.4'
-def slf4jVersion = '1.7.21'
dependencies {
compile project(':juick-core')
- 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 'javax.inject:javax.inject:1'
- compile 'org.apache.httpcomponents:httpclient:4.5.2'
- compile 'org.apache.commons:commons-dbcp2:2.1.1'
compile 'com.mitchellbosecke:pebble-spring4:2.2.3'
providedRuntime 'mysql:mysql-connector-java:5.1.40'
}
diff --git a/juick-demo/build.gradle b/juick-demo/build.gradle
index 5fe76a2c..3ac52b52 100644
--- a/juick-demo/build.gradle
+++ b/juick-demo/build.gradle
@@ -15,16 +15,11 @@ repositories {
mainClassName = "com.juick.demo.Demo"
-def slf4jVersion = '1.7.21'
-
dependencies {
compile project(':juick-core')
- compile 'org.apache.commons:commons-lang3:3.5'
- compile 'org.springframework:spring-jdbc:4.3.4.RELEASE'
compile 'mysql:mysql-connector-java:5.1.40'
compile 'ch.vorburger.mariaDB4j:mariaDB4j:2.2.2'
compile 'jline:jline:2.14.2'
- compile 'org.slf4j:slf4j-api:${slf4jVersion}'
}
compileJava.options.encoding = 'UTF-8'
diff --git a/juick-notifications/build.gradle b/juick-notifications/build.gradle
index c61491a7..c8a2479d 100644
--- a/juick-notifications/build.gradle
+++ b/juick-notifications/build.gradle
@@ -8,21 +8,12 @@ repositories {
}
def springFrameworkVersion = '4.3.4.RELEASE'
-def jacksonVersion = '2.8.4'
-def slf4jVersion = '1.7.21'
dependencies {
compile project(':juick-core')
- compile 'org.slf4j:slf4j-api:${slf4jVersion}'
compile 'com.ganyo:gcm-server:1.1.0'
compile 'com.notnoop.apns:apns:1.0.0.Beta6'
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 'javax.inject:javax.inject:1'
- compile 'org.apache.httpcomponents:httpclient:4.5.2'
- compile 'org.apache.commons:commons-dbcp2:2.1.1'
compile 'com.mitchellbosecke:pebble-spring4:2.2.3'
providedRuntime 'mysql:mysql-connector-java:5.1.40'
}
diff --git a/juick-rss/build.gradle b/juick-rss/build.gradle
index 7c3fca9b..d18d1dd8 100644
--- a/juick-rss/build.gradle
+++ b/juick-rss/build.gradle
@@ -7,14 +7,9 @@ repositories {
mavenCentral()
}
-def slf4jVersion = '1.7.21'
-
dependencies {
compile project(':juick-core')
providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
- compile 'org.apache.commons:commons-dbcp2:2.1.1'
- compile 'org.apache.commons:commons-lang3:3.5'
- compile 'org.slf4j:slf4j-api:${slf4jVersion}'
providedRuntime 'mysql:mysql-connector-java:5.1.40'
}
diff --git a/juick-ws/build.gradle b/juick-ws/build.gradle
index 720352e3..51f8c401 100644
--- a/juick-ws/build.gradle
+++ b/juick-ws/build.gradle
@@ -15,23 +15,13 @@ repositories {
mavenCentral()
}
-def slf4jVersion = '1.7.21'
def springFrameworkVersion = '4.3.4.RELEASE'
-def jacksonVersion = '2.8.4'
dependencies {
compile project(':juick-core')
compile project(':deps:com.juick.xmpp')
- compile 'org.slf4j:slf4j-api:${slf4jVersion}'
- compile "org.springframework:spring-jdbc:${springFrameworkVersion}"
compile "org.springframework:spring-webmvc:${springFrameworkVersion}"
compile "org.springframework:spring-websocket:${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 'javax.inject:javax.inject:1'
- compile 'org.apache.httpcomponents:httpclient:4.5.2'
- compile 'org.apache.commons:commons-dbcp2:2.1.1'
compile 'com.mitchellbosecke:pebble-spring4:2.2.3'
providedRuntime 'mysql:mysql-connector-java:5.1.40'
}
diff --git a/juick-www/build.gradle b/juick-www/build.gradle
index c8d1f10e..36eae244 100644
--- a/juick-www/build.gradle
+++ b/juick-www/build.gradle
@@ -32,17 +32,12 @@ dependencies {
compile project(':juick-core')
compile project(':deps:com.juick.xmpp')
compile 'com.github.scribejava:scribejava-apis:3.2.0'
- compile 'org.apache.httpcomponents:httpclient:4.5.2'
- compile 'org.apache.commons:commons-lang3:3.5'
compile 'commons-io:commons-io:2.5'
- compile "org.springframework:spring-jdbc:4.3.4.RELEASE"
- compile 'org.apache.commons:commons-dbcp2:2.1.1'
compile 'net.coobird:thumbnailator:0.4.8'
compile 'com.github.ooxi:serialized-php-parser:0.5.0'
compile 'net.jodah:failsafe:0.9.5'
compile 'com.mitchellbosecke:pebble:2.2.3'
compile 'com.sun.mail:javax.mail:1.5.6'
- compile 'org.slf4j:slf4j-api:${slf4jVersion}'
providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
providedRuntime 'mysql:mysql-connector-java:5.1.40'
}
diff --git a/juick-xmpp-ft/build.gradle b/juick-xmpp-ft/build.gradle
index dd230a4b..2950d081 100644
--- a/juick-xmpp-ft/build.gradle
+++ b/juick-xmpp-ft/build.gradle
@@ -9,24 +9,14 @@ repositories {
}
def springFrameworkVersion = '4.3.4.RELEASE'
-def jacksonVersion = '2.8.4'
-def slf4jVersion = '1.7.21'
dependencies {
compile project(':juick-core')
- 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 'commons-io:commons-io:2.5'
- compile 'javax.inject:javax.inject:1'
- compile 'org.apache.httpcomponents:httpclient:4.5.2'
- compile 'org.apache.commons:commons-dbcp2:2.1.1'
compile 'com.mitchellbosecke:pebble-spring4:2.2.3'
compile 'org.bitbucket.sco0ter.babbler:xmpp-core-client:279e488e51'
compile 'org.bitbucket.sco0ter.babbler:xmpp-extensions-client:279e488e51'
- providedRuntime 'mysql:mysql-connector-java:5.1.39'
+ providedRuntime 'mysql:mysql-connector-java:5.1.40'
}
compileJava.options.encoding = 'UTF-8'
@@ -37,3 +27,7 @@ gretty {
servletContainer = 'tomcat8'
}
+configurations {
+ all*.exclude module: 'commons-logging'
+}
+