From a18552337ef24478f43b13f6018b3b36ee6aebcd Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Thu, 27 Feb 2020 14:43:23 +0100 Subject: [PATCH 1/3] Disallow jython beta versions --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1b69c25572e..324dd814f34 100644 --- a/build.gradle +++ b/build.gradle @@ -238,7 +238,7 @@ 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') } } From adef1f210023f199feb65eb1c714df55a3426d27 Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Thu, 27 Feb 2020 14:44:44 +0100 Subject: [PATCH 2/3] bump mockito to 3.3.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 324dd814f34..29df6737f8f 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' From f778eece253366ed1f51d25ab1dc2eaa582e7891 Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Thu, 27 Feb 2020 14:48:23 +0100 Subject: [PATCH 3/3] Add more general exception for fontawesome --- build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 29df6737f8f..72d2f156e01 100644 --- a/build.gradle +++ b/build.gradle @@ -243,9 +243,7 @@ dependencyUpdates.resolutionStrategy = { } } 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)') } }