Skip to content

Commit

Permalink
Fix dependency updates workflow (#6033)
Browse files Browse the repository at this point in the history
* Disallow jython beta versions

* bump mockito to 3.3.1

* Add more general exception for fontawesome
  • Loading branch information
LinusDietz authored Feb 27, 2020
1 parent 3431490 commit fbd52b8
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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)')
}
}
Expand Down

0 comments on commit fbd52b8

Please sign in to comment.