From fbd52b881850f2f781247680af0878f0c23d7267 Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Thu, 27 Feb 2020 18:02:00 +0100 Subject: [PATCH] Fix dependency updates workflow (#6033) * Disallow jython beta versions * bump mockito to 3.3.1 * Add more general exception for fontawesome --- build.gradle | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 1b69c25572e..72d2f156e01 100644 --- a/build.gradle +++ b/build.gradle @@ -205,7 +205,7 @@ dependencies { testImplementation 'net.bytebuddy:byte-buddy-parent:1.10.8' testRuntime group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT' testRuntime group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT' - testImplementation 'org.mockito:mockito-core:3.3.0' + testImplementation 'org.mockito:mockito-core:3.3.1' testImplementation 'org.xmlunit:xmlunit-core:2.6.3' testImplementation 'org.xmlunit:xmlunit-matchers:2.6.3' testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.13.1' @@ -238,14 +238,12 @@ dependencyUpdates.resolutionStrategy = { } } rules.withModule("org.python:jython-standalone") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.7.2b2/) { + if (selection.candidate.version ==~ /2.7.2b\d/) { selection.reject('Release candidate') } } rules.withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.0.26-9.1.2/ - || selection.candidate.version ==~ /2.0.26-9.1.1/ - || selection.candidate.version ==~ /2.0.26-9.1.0/) { + if (selection.candidate.version ==~ /2.0.26.*/) { selection.reject('1.7.22-11 is actually newer (strange version system)') } }