aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-05-12 16:26:59 +0300
committerGravatar Vitaly Takmazov2017-05-12 16:26:59 +0300
commit161ef8c74547f8400d8264a1ab39d9c0c2240235 (patch)
tree684435a1e7fd01c452e043acb713849af6bff9be
parent373cc36a337c67ab12b773366be0a862d7d88ae8 (diff)
gradle: dependencyUpdates
-rw-r--r--build.gradle28
-rw-r--r--juick-api/build.gradle3
-rw-r--r--juick-core/build.gradle1
-rw-r--r--juick-crosspost/build.gradle1
-rw-r--r--juick-notifications/build.gradle1
-rw-r--r--juick-rss/build.gradle5
-rw-r--r--juick-server/build.gradle6
-rw-r--r--juick-ws/build.gradle1
-rw-r--r--juick-www/build.gradle3
-rw-r--r--juick-xmpp-bot/build.gradle1
-rw-r--r--juick-xmpp/build.gradle4
11 files changed, 27 insertions, 27 deletions
diff --git a/build.gradle b/build.gradle
index 3734ed9e..4e9d3249 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,19 +1,33 @@
allprojects {
repositories {
mavenCentral()
+ jcenter()
maven { url "https://jitpack.io" }
}
+ apply plugin: 'com.github.ben-manes.versions'
+ dependencyUpdates.resolutionStrategy = {
+ componentSelection { rules ->
+ rules.all { ComponentSelection selection ->
+ boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'pr', 'b'].any { qualifier ->
+ selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
+ }
+ if (rejected) {
+ selection.reject('Release candidate')
+ }
+ }
+ }
+ }
}
project.ext {
- springFrameworkVersion = '4.3.7.RELEASE'
+ springFrameworkVersion = '4.3.8.RELEASE'
springSecurityVersion = '4.2.2.RELEASE'
- jacksonVersion = '2.8.7'
- slf4jVersion = '1.7.24'
+ jacksonVersion = '2.8.8'
+ slf4jVersion = '1.7.25'
logbackVersion = '1.2.3'
junitVersion = "4.12"
hamcrestVersion= "1.3"
- mockitoVersion = "2.7.22"
+ mockitoVersion = "2.+"
}
buildscript {
@@ -23,7 +37,7 @@ buildscript {
}
dependencies {
classpath 'org.akhikhl.gretty:gretty:+'
- classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
+ classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
}
}
apply plugin: 'java'
@@ -38,10 +52,10 @@ dependencies {
testCompile "org.json:json:20160810"
testCompile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
- testCompile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
+ testCompile "com.fasterxml.jackson.core:jackson-databind:2.8.8.1"
testCompile "org.springframework:spring-jdbc:${springFrameworkVersion}"
testCompile "org.springframework:spring-test:${springFrameworkVersion}"
- testCompile "ch.vorburger.mariaDB4j:mariaDB4j:2.2.2"
+ testCompile "ch.vorburger.mariaDB4j:mariaDB4j:2.2.3"
testCompile "org.slf4j:slf4j-api:${slf4jVersion}"
testCompile "junit:junit:${junitVersion}"
testCompile "org.hamcrest:hamcrest-all:${hamcrestVersion}"
diff --git a/juick-api/build.gradle b/juick-api/build.gradle
index bca3a8c2..56335270 100644
--- a/juick-api/build.gradle
+++ b/juick-api/build.gradle
@@ -7,7 +7,6 @@ buildscript {
apply plugin: 'java'
apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty'
-apply plugin: 'com.github.ben-manes.versions'
dependencies {
compile project(':juick-server')
@@ -21,7 +20,7 @@ dependencies {
testCompile project(path: ':juick-server', configuration: 'testArtifacts')
- testRuntime 'org.apache.tomcat:tomcat-websocket:8.5.11'
+ testRuntime 'org.apache.tomcat:tomcat-websocket:8.5.15'
testRuntime 'com.jayway.jsonpath:json-path:2.2.0'
}
diff --git a/juick-core/build.gradle b/juick-core/build.gradle
index 986d5b48..a0997423 100644
--- a/juick-core/build.gradle
+++ b/juick-core/build.gradle
@@ -1,5 +1,4 @@
apply plugin: 'java-library'
-apply plugin: 'com.github.ben-manes.versions'
dependencies {
compile "com.fasterxml.jackson.core:jackson-annotations:${rootProject.jacksonVersion}"
diff --git a/juick-crosspost/build.gradle b/juick-crosspost/build.gradle
index ff26252b..a0987f5b 100644
--- a/juick-crosspost/build.gradle
+++ b/juick-crosspost/build.gradle
@@ -1,7 +1,6 @@
apply plugin: 'java'
apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty'
-apply plugin: 'com.github.ben-manes.versions'
dependencies {
compile project(':juick-server')
diff --git a/juick-notifications/build.gradle b/juick-notifications/build.gradle
index fc21e51f..2f51030d 100644
--- a/juick-notifications/build.gradle
+++ b/juick-notifications/build.gradle
@@ -1,7 +1,6 @@
apply plugin: 'java'
apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty'
-apply plugin: 'com.github.ben-manes.versions'
dependencies {
compile project(':juick-core')
diff --git a/juick-rss/build.gradle b/juick-rss/build.gradle
index 290d48e3..61fb4ba6 100644
--- a/juick-rss/build.gradle
+++ b/juick-rss/build.gradle
@@ -1,13 +1,12 @@
apply plugin: 'java'
apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty'
-apply plugin: 'com.github.ben-manes.versions'
dependencies {
compile project(':juick-server')
compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}"
- compile 'com.rometools:rome:1.7.2'
- compile 'com.rometools:rome-modules:1.7.2'
+ compile 'com.rometools:rome:1.7.3'
+ compile 'com.rometools:rome-modules:1.7.3'
providedRuntime 'mysql:mysql-connector-java:5.1.40'
testCompile "junit:junit:${rootProject.junitVersion}"
diff --git a/juick-server/build.gradle b/juick-server/build.gradle
index 308b6ede..49712622 100644
--- a/juick-server/build.gradle
+++ b/juick-server/build.gradle
@@ -1,6 +1,5 @@
apply plugin: 'java-library'
apply plugin: 'war'
-apply plugin: 'com.github.ben-manes.versions'
sourceCompatibility = 1.8
@@ -8,7 +7,7 @@ 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-databind:2.8.8.1"
compile "com.fasterxml.jackson.core:jackson-annotations:${rootProject.jacksonVersion}"
compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}"
@@ -27,7 +26,7 @@ dependencies {
providedCompile "commons-io:commons-io:2.5"
providedCompile "commons-codec:commons-codec:1.10"
- compile 'com.github.ben-manes.caffeine:caffeine:2.4.0'
+ compile 'com.github.ben-manes.caffeine:caffeine:2.5.0'
compile "org.springframework:spring-context:${rootProject.springFrameworkVersion}"
compile "org.springframework:spring-jdbc:${rootProject.springFrameworkVersion}"
@@ -53,7 +52,6 @@ dependencies {
testCompile "org.springframework:spring-test:${rootProject.springFrameworkVersion}"
testCompile "org.springframework.security:spring-security-test:${rootProject.springSecurityVersion}"
- testRuntime "org.thymeleaf:thymeleaf-testing:3.0.2.RELEASE"
testRuntime "mysql:mysql-connector-java:5.1.40"
}
diff --git a/juick-ws/build.gradle b/juick-ws/build.gradle
index ff26252b..a0987f5b 100644
--- a/juick-ws/build.gradle
+++ b/juick-ws/build.gradle
@@ -1,7 +1,6 @@
apply plugin: 'java'
apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty'
-apply plugin: 'com.github.ben-manes.versions'
dependencies {
compile project(':juick-server')
diff --git a/juick-www/build.gradle b/juick-www/build.gradle
index 5f42b81b..6900174a 100644
--- a/juick-www/build.gradle
+++ b/juick-www/build.gradle
@@ -16,11 +16,10 @@ task compileFrontend(type: NpmTask) {
apply plugin: 'java'
apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty'
-apply plugin: 'com.github.ben-manes.versions'
dependencies {
compile project(':juick-server')
- compile 'com.github.scribejava:scribejava-apis:4.0.0'
+ compile 'com.github.scribejava:scribejava-apis:4.1.0'
compile 'org.imgscalr:imgscalr-lib:4.2'
compile 'com.github.ooxi:serialized-php-parser:0.5.0'
compile 'com.mitchellbosecke:pebble:2.3.0'
diff --git a/juick-xmpp-bot/build.gradle b/juick-xmpp-bot/build.gradle
index 2bef7852..bc6dce3c 100644
--- a/juick-xmpp-bot/build.gradle
+++ b/juick-xmpp-bot/build.gradle
@@ -1,7 +1,6 @@
apply plugin: 'java'
apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty'
-apply plugin: 'com.github.ben-manes.versions'
dependencies {
compile project(':juick-server')
diff --git a/juick-xmpp/build.gradle b/juick-xmpp/build.gradle
index e836948c..1758e97e 100644
--- a/juick-xmpp/build.gradle
+++ b/juick-xmpp/build.gradle
@@ -1,16 +1,12 @@
apply plugin: 'java'
apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty'
-apply plugin: 'com.github.ben-manes.versions'
dependencies {
compile project(':juick-server')
compile 'com.github.juick:com.juick.xmpp:483936e0bd'
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.3'
compile 'org.apache.commons:commons-dbcp2:2.1.1'