diff --git a/build.gradle b/build.gradle index 8796658b173..a88052930d2 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { plugins { id 'com.gradle.build-scan' version '1.16' - id 'com.install4j.gradle' version '7.0.7' + id 'com.install4j.gradle' version '7.0.8' id 'com.github.johnrengelman.shadow' version '2.0.4' id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" id "com.simonharrer.modernizer" version '1.6.0-1' @@ -119,13 +119,13 @@ dependencies { antlr4 'org.antlr:antlr4:4.7.1' compile 'org.antlr:antlr4-runtime:4.7.1' - compile 'mysql:mysql-connector-java:8.0.12' + compile 'mysql:mysql-connector-java:8.0.13' compile 'org.postgresql:postgresql:42.2.5' compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1' - compile 'com.google.guava:guava:26.0-jre' + compile 'com.google.guava:guava:27.0-jre' // JavaFX stuff compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4' @@ -182,7 +182,7 @@ dependencies { testCompile "org.testfx:testfx-core:4.0.+" testCompile "org.testfx:testfx-junit5:4.0.+" - checkstyle 'com.puppycrawl.tools:checkstyle:8.13' + checkstyle 'com.puppycrawl.tools:checkstyle:8.14' } jacoco { @@ -204,6 +204,11 @@ dependencyUpdates.resolutionStrategy = { selection.reject("Ignore SNAPSHOT releases") } } + rules.withModule("com.gradle.build-scan:com.gradle.build-scan.gradle.plugin") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("Cannot be upgraded to version 2 until we upgrade to gradle 5") + } + } rules.withModule("org.controlsfx:controlsfx") { ComponentSelection selection -> if (selection.candidate.version ==~ /9.*/) { // Reject version 9 or higher selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9") @@ -216,8 +221,8 @@ dependencyUpdates.resolutionStrategy = { } } rules.withModule("com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin") { ComponentSelection selection -> - if (selection.candidate.version == /4.0.1/) { - selection.reject("Version 4.0.1 breaks the release process.") + if (selection.candidate.version ==~ /4.*/) { + selection.reject("Version 4.X breaks the release process.") } } rules.withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection ->