diff options
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | juick-api/build.gradle | 8 | ||||
| -rw-r--r-- | juick-crosspost/build.gradle | 5 | ||||
| -rw-r--r-- | juick-demo/build.gradle | 9 | ||||
| -rw-r--r-- | juick-notifications/build.gradle | 6 | ||||
| -rw-r--r-- | juick-rss/build.gradle | 6 | ||||
| -rw-r--r-- | juick-ws/build.gradle | 5 | ||||
| -rw-r--r-- | juick-www/build.gradle | 2 | ||||
| -rw-r--r-- | juick-xmpp/build.gradle | 6 |
9 files changed, 39 insertions, 10 deletions
diff --git a/build.gradle b/build.gradle index 29598f34..2b29ec0f 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ dependencies { testCompile 'ch.vorburger.mariaDB4j:mariaDB4j:2.1.3' testCompile 'org.slf4j:slf4j-api:1.7.21' testCompile 'junit:junit:4.12' - testRuntime 'mysql:mysql-connector-java:5.1.39' + testRuntime 'mysql:mysql-connector-java:5.1.40' } compileJava.options.encoding = 'UTF-8' diff --git a/juick-api/build.gradle b/juick-api/build.gradle index 8bb9d227..98a5fc7c 100644 --- a/juick-api/build.gradle +++ b/juick-api/build.gradle @@ -32,11 +32,17 @@ dependencies { 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.39' + providedRuntime 'mysql:mysql-connector-java:5.1.40' } + compileJava.options.encoding = 'UTF-8' + gretty { httpPort = 8080 contextPath = '/' servletContainer = 'tomcat8' } + +configurations { + all*.exclude module: 'commons-logging' +} diff --git a/juick-crosspost/build.gradle b/juick-crosspost/build.gradle index ae918f18..21b91264 100644 --- a/juick-crosspost/build.gradle +++ b/juick-crosspost/build.gradle @@ -22,7 +22,7 @@ dependencies { 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.39' + providedRuntime 'mysql:mysql-connector-java:5.1.40' } compileJava.options.encoding = 'UTF-8' @@ -33,3 +33,6 @@ gretty { servletContainer = 'tomcat8' } +configurations { + all*.exclude module: 'commons-logging' +}
\ No newline at end of file diff --git a/juick-demo/build.gradle b/juick-demo/build.gradle index 2807266d..5fe76a2c 100644 --- a/juick-demo/build.gradle +++ b/juick-demo/build.gradle @@ -21,9 +21,14 @@ 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.39' + 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'
\ 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-notifications/build.gradle b/juick-notifications/build.gradle index b178758c..c61491a7 100644 --- a/juick-notifications/build.gradle +++ b/juick-notifications/build.gradle @@ -24,7 +24,7 @@ dependencies { 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.39' + providedRuntime 'mysql:mysql-connector-java:5.1.40' } compileJava.options.encoding = 'UTF-8' @@ -35,3 +35,7 @@ gretty { servletContainer = 'tomcat8' } +configurations { + all*.exclude module: 'commons-logging' +} + diff --git a/juick-rss/build.gradle b/juick-rss/build.gradle index b17a2c04..7c3fca9b 100644 --- a/juick-rss/build.gradle +++ b/juick-rss/build.gradle @@ -15,7 +15,7 @@ dependencies { 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.39' + providedRuntime 'mysql:mysql-connector-java:5.1.40' } compileJava.options.encoding = 'UTF-8' @@ -25,3 +25,7 @@ gretty { contextPath = '/' servletContainer = 'tomcat8' } + +configurations { + all*.exclude module: 'commons-logging' +} diff --git a/juick-ws/build.gradle b/juick-ws/build.gradle index 727a3c7b..720352e3 100644 --- a/juick-ws/build.gradle +++ b/juick-ws/build.gradle @@ -33,7 +33,7 @@ dependencies { 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.39' + providedRuntime 'mysql:mysql-connector-java:5.1.40' } compileFrontend.dependsOn 'npmInstall' @@ -46,3 +46,6 @@ gretty { servletContainer = 'tomcat8' } +configurations { + all*.exclude module: 'commons-logging' +}
\ No newline at end of file diff --git a/juick-www/build.gradle b/juick-www/build.gradle index a901da09..c8d1f10e 100644 --- a/juick-www/build.gradle +++ b/juick-www/build.gradle @@ -44,7 +44,7 @@ dependencies { 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.39' + providedRuntime 'mysql:mysql-connector-java:5.1.40' } compileFrontend.dependsOn 'npmInstall' diff --git a/juick-xmpp/build.gradle b/juick-xmpp/build.gradle index c072bd00..d50a68b8 100644 --- a/juick-xmpp/build.gradle +++ b/juick-xmpp/build.gradle @@ -23,7 +23,7 @@ dependencies { compile 'org.apache.commons:commons-dbcp2:2.1.1' compile 'com.mitchellbosecke:pebble-spring4:2.2.3' compile 'net.jodah:failsafe:0.9.5' - providedRuntime 'mysql:mysql-connector-java:5.1.39' + providedRuntime 'mysql:mysql-connector-java:5.1.40' } compileJava.options.encoding = 'UTF-8' @@ -34,3 +34,7 @@ gretty { servletContainer = 'tomcat8' } +configurations { + all*.exclude module: 'commons-logging' +} + |