Skip to content

Commit

Permalink
Update Libraries (#4366)
Browse files Browse the repository at this point in the history
  • Loading branch information
LinusDietz authored Oct 10, 2018
1 parent 0a55a82 commit 79ba040
Showing 1 changed file with 28 additions and 12 deletions.
40 changes: 28 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {
plugins {
id 'com.gradle.build-scan' version '1.16'
id 'com.install4j.gradle' version '7.0.7'
id 'com.github.johnrengelman.shadow' version '2.0.4'
id 'com.github.johnrengelman.shadow' version '4.0.0'
id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
id "com.simonharrer.modernizer" version '1.6.0-1'
id 'me.champeau.gradle.jmh' version '0.4.7'
Expand Down Expand Up @@ -65,7 +65,7 @@ sourceSets {
srcDirs = ["src/main/java", "src/main/resources"]
}
}
test{
test {
java {
srcDirs = ["src/test/java"]
}
Expand Down Expand Up @@ -96,9 +96,9 @@ dependencies {
compile 'com.jgoodies:jgoodies-common:1.8.1'
compile 'com.jgoodies:jgoodies-forms:1.9.0'

compile 'org.apache.pdfbox:pdfbox:2.0.11'
compile 'org.apache.pdfbox:fontbox:2.0.11'
compile 'org.apache.pdfbox:xmpbox:2.0.11'
compile 'org.apache.pdfbox:pdfbox:2.0.12'
compile 'org.apache.pdfbox:fontbox:2.0.12'
compile 'org.apache.pdfbox:xmpbox:2.0.12'

// required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
compile 'org.bouncycastle:bcprov-jdk15on:1.60'
Expand Down Expand Up @@ -158,7 +158,7 @@ dependencies {

compile 'com.github.tomtung:latex2unicode_2.12:0.2.2'

errorproneJavac 'com.google.errorprone:javac:1.8.0-beta-132'
errorproneJavac 'com.google.errorprone:javac:1.8.0-u20'

compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.2.0'
compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.0'
Expand All @@ -168,10 +168,10 @@ dependencies {
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1'
testCompile 'org.junit.platform:junit-platform-launcher:1.3.1'
testCompile 'org.junit-pioneer:junit-pioneer:0.1.2'
testCompile 'org.junit-pioneer:junit-pioneer:0.2.1'
testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'
testCompile 'org.mockito:mockito-core:2.22.0'
testCompile 'org.mockito:mockito-core:2.23.0'
testCompile 'com.github.tomakehurst:wiremock:2.19.0'
testCompile 'org.assertj:assertj-swing-junit:3.8.0'
testCompile 'org.reflections:reflections:0.9.11'
Expand All @@ -181,7 +181,7 @@ dependencies {
testCompile "org.testfx:testfx-core:4.0.+"
testCompile "org.testfx:testfx-junit5:4.0.+"

checkstyle 'com.puppycrawl.tools:checkstyle:8.12'
checkstyle 'com.puppycrawl.tools:checkstyle:8.13'
}

jacoco {
Expand All @@ -199,7 +199,7 @@ dependencyUpdates.revision = 'integration'
dependencyUpdates.resolutionStrategy = {
componentSelection { rules ->
rules.all { ComponentSelection selection ->
if ( selection.candidate.module!="javax.inject" && selection.candidate.version ==~ /[0-9].*SNAPSHOT/ ) {
if (selection.candidate.version ==~ /[0-9].*SNAPSHOT/) {
selection.reject("Ignore SNAPSHOT releases")
}
}
Expand All @@ -209,20 +209,36 @@ dependencyUpdates.resolutionStrategy = {
}
}
rules.withModule("com.github.tomtung:latex2unicode_2.12") { ComponentSelection selection ->
if (selection.candidate.version ==~ /0.2.2/) { // Reject version higher than 2.0.2
if (selection.candidate.version ==~ /0.2.[3,4]/) {
// Reject version higher than 2.0.2. see https://github.com/JabRef/jabref/pull/3781
selection.reject("Cannot be updated to 0.2.4 until JabRef is prepared for it")
}
}
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.")
}
}
rules.withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection ->
if (selection.candidate.version ==~ /2.*/) {
selection.reject("Cannot be upgraded to version 2")
}
}
rules.withModule("com.jfoenix:jfoenix") { ComponentSelection selection ->
rules.withModule("com.jfoenix:jfoenix") { 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")
}
}
rules.withModule("com.google.errorprone:javac") { ComponentSelection selection ->
if (selection.candidate.version ==~ /1.9.*/ || selection.candidate.version ==~ /9.*/) {
selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9")
}
}
rules.withModule("com.sun.xml.bind:jaxb-xjc") { ComponentSelection selection ->
if (!(selection.candidate.version ==~ /2.2.4.*/) || selection.candidate.version ==~ /2.[3-9].*/) {
selection.reject("Cannot be updated to 2.2.5 or higher.")
}
}
}
}

Expand Down

0 comments on commit 79ba040

Please sign in to comment.