From 6e127cdeb3617ddc13dec393d19d48c8e40c7f99 Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Tue, 9 Oct 2018 22:10:31 +0200 Subject: [PATCH 01/15] Update mockito-core from 2.22.0 -> 2.23.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 41737ff9652..1db6bf86300 100644 --- a/build.gradle +++ b/build.gradle @@ -171,7 +171,7 @@ dependencies { testCompile 'org.junit-pioneer:junit-pioneer:0.1.2' 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' From d9b28a1319550ca71defbc879247fd9958116f10 Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Tue, 9 Oct 2018 22:11:17 +0200 Subject: [PATCH 02/15] Update checkstyle from 8.12 -> 8.13 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1db6bf86300..07037856a1c 100644 --- a/build.gradle +++ b/build.gradle @@ -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 { From 47de03486085e44cc6050f196a508e67c4530b47 Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Tue, 9 Oct 2018 22:12:16 +0200 Subject: [PATCH 03/15] Update fontbox, pdfbox, xmpbox from 2.0.11 -> 2.0.12 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 07037856a1c..6a5d5f1ee4c 100644 --- a/build.gradle +++ b/build.gradle @@ -97,7 +97,7 @@ dependencies { 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:fontbox:2.0.12' compile 'org.apache.pdfbox:xmpbox:2.0.11' // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635 From 95209e973e3cb8462f6b0290cb33063c7c49492d Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Tue, 9 Oct 2018 22:15:51 +0200 Subject: [PATCH 04/15] Update johnrengelman.shadow.gradle.plugin from 2.0.4 -> 4.0.1 --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 6a5d5f1ee4c..9ee4e263284 100644 --- a/build.gradle +++ b/build.gradle @@ -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.1' 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' @@ -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:pdfbox:2.0.12' compile 'org.apache.pdfbox:fontbox:2.0.12' - compile 'org.apache.pdfbox:xmpbox:2.0.11' + 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' From f3461b3485094019afe64357a5d5350bc0a89f1b Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Tue, 9 Oct 2018 22:18:36 +0200 Subject: [PATCH 05/15] Revert "Update johnrengelman.shadow.gradle.plugin from 2.0.4 -> 4.0.1" This reverts commit 95209e973e3cb8462f6b0290cb33063c7c49492d. --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 9ee4e263284..6a5d5f1ee4c 100644 --- a/build.gradle +++ b/build.gradle @@ -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 '4.0.1' + 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' id 'me.champeau.gradle.jmh' version '0.4.7' @@ -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.12' + compile 'org.apache.pdfbox:pdfbox:2.0.11' compile 'org.apache.pdfbox:fontbox:2.0.12' - compile 'org.apache.pdfbox:xmpbox:2.0.12' + compile 'org.apache.pdfbox:xmpbox:2.0.11' // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635 compile 'org.bouncycastle:bcprov-jdk15on:1.60' From d4212f0cb7d0a5c8334290674b6a2077b5b2ed47 Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Tue, 9 Oct 2018 22:29:39 +0200 Subject: [PATCH 06/15] Update junit-pioneer from 0.1.2 -> 0.2.1 --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 6a5d5f1ee4c..38d2c6f23e5 100644 --- a/build.gradle +++ b/build.gradle @@ -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:pdfbox:2.0.12' compile 'org.apache.pdfbox:fontbox:2.0.12' - compile 'org.apache.pdfbox:xmpbox:2.0.11' + 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' @@ -168,7 +168,7 @@ 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.23.0' From 9917162fd68bbcccfe5f3ca1103b03930403d689 Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Tue, 9 Oct 2018 22:50:42 +0200 Subject: [PATCH 07/15] Update johnrengelman shadow plugin from 2.0.4 -> 4.0.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 38d2c6f23e5..d395e40a349 100644 --- a/build.gradle +++ b/build.gradle @@ -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' From 7ea4e5c3bade0e5d24543c6340eff3f181dee8c6 Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Wed, 10 Oct 2018 06:19:54 +0200 Subject: [PATCH 08/15] Add update exception for com.github.johnrengelman.shadow. --- build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d395e40a349..fec9965514e 100644 --- a/build.gradle +++ b/build.gradle @@ -213,12 +213,17 @@ dependencyUpdates.resolutionStrategy = { 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/) { // Reject version 9 or higher + 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") } From f22809644c95c1783ea6ffbee2c7945649750e32 Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Wed, 10 Oct 2018 06:22:16 +0200 Subject: [PATCH 09/15] Define exception for latex2unicode --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fec9965514e..57a300f4c4c 100644 --- a/build.gradle +++ b/build.gradle @@ -209,7 +209,7 @@ 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") } } From 0f56a158f30168933302912a3fa7105c567ad13f Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Wed, 10 Oct 2018 06:23:44 +0200 Subject: [PATCH 10/15] Update jaxb-xjc from 2.2.4-1 -> 2.4 --- xjc.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xjc.gradle b/xjc.gradle index ea33b543a03..705ca2c43cd 100644 --- a/xjc.gradle +++ b/xjc.gradle @@ -4,7 +4,7 @@ configurations { dependencies { // Cannot be updated. - xjc 'com.sun.xml.bind:jaxb-xjc:2.2.4-1' + xjc 'com.sun.xml.bind:jaxb-xjc:2.4.+' } task xjc { From f61336934c4ff8ad683ade0d1124fd4fc266df3a Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Wed, 10 Oct 2018 06:45:30 +0200 Subject: [PATCH 11/15] Update com.google.errorprone:javac from 1.8.0-beta-132 -> 1.8.0-u20 and define exception for java 9 --- build.gradle | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 57a300f4c4c..f23cb693d58 100644 --- a/build.gradle +++ b/build.gradle @@ -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' @@ -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.module!="javax.inject" && selection.candidate.version ==~ /[0-9].*SNAPSHOT/ ) { selection.reject("Ignore SNAPSHOT releases") } } @@ -214,7 +214,7 @@ dependencyUpdates.resolutionStrategy = { } } rules.withModule("com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin") { ComponentSelection selection -> - if (selection.candidate.version == /4.0.1/) { // Reject version 9 or higher + if (selection.candidate.version == /4.0.1/) { selection.reject("Version 4.0.1 breaks the release process.") } } @@ -228,6 +228,11 @@ dependencyUpdates.resolutionStrategy = { 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") + } + } } } From a3e3481ce2e38b8fffc161fca298c12a946457b0 Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Wed, 10 Oct 2018 06:47:24 +0200 Subject: [PATCH 12/15] fix exception for javax.inject --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f23cb693d58..3bf1e1d8740 100644 --- a/build.gradle +++ b/build.gradle @@ -198,8 +198,8 @@ dependencyUpdates.revision = 'integration' // We have some dependencies which cannot be updated due to various reasons. dependencyUpdates.resolutionStrategy = { componentSelection { rules -> - rules.all { ComponentSelection selection -> - if (selection.candidate.module!="javax.inject" && selection.candidate.version ==~ /[0-9].*SNAPSHOT/ ) { + rules.withModule("javax.inject") { ComponentSelection selection -> + if (selection.candidate.version ==~ /[0-9].*SNAPSHOT/ ) { selection.reject("Ignore SNAPSHOT releases") } } From fba283bfe630ef3b348bac62f4bf0abbbc8d39fc Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Wed, 10 Oct 2018 06:47:45 +0200 Subject: [PATCH 13/15] Revert "Update jaxb-xjc from 2.2.4-1 -> 2.4" This reverts commit 0f56a158f30168933302912a3fa7105c567ad13f. --- xjc.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xjc.gradle b/xjc.gradle index 705ca2c43cd..ea33b543a03 100644 --- a/xjc.gradle +++ b/xjc.gradle @@ -4,7 +4,7 @@ configurations { dependencies { // Cannot be updated. - xjc 'com.sun.xml.bind:jaxb-xjc:2.4.+' + xjc 'com.sun.xml.bind:jaxb-xjc:2.2.4-1' } task xjc { From 9c490b78d147ece16606c53eb15b6c5d0d092e14 Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Wed, 10 Oct 2018 06:49:20 +0200 Subject: [PATCH 14/15] Revert "fix exception for javax.inject" This reverts commit a3e3481ce2e38b8fffc161fca298c12a946457b0. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3bf1e1d8740..f23cb693d58 100644 --- a/build.gradle +++ b/build.gradle @@ -198,8 +198,8 @@ dependencyUpdates.revision = 'integration' // We have some dependencies which cannot be updated due to various reasons. dependencyUpdates.resolutionStrategy = { componentSelection { rules -> - rules.withModule("javax.inject") { ComponentSelection selection -> - if (selection.candidate.version ==~ /[0-9].*SNAPSHOT/ ) { + rules.all { ComponentSelection selection -> + if (selection.candidate.module!="javax.inject" && selection.candidate.version ==~ /[0-9].*SNAPSHOT/ ) { selection.reject("Ignore SNAPSHOT releases") } } From a652226c32f6cc4cafb75394541d6b3290c2494e Mon Sep 17 00:00:00 2001 From: Linus Dietz Date: Wed, 10 Oct 2018 07:05:07 +0200 Subject: [PATCH 15/15] add exception for xjc --- build.gradle | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index f23cb693d58..ae67cf00cb6 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,7 @@ sourceSets { srcDirs = ["src/main/java", "src/main/resources"] } } - test{ + test { java { srcDirs = ["src/test/java"] } @@ -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") } } @@ -209,7 +209,8 @@ dependencyUpdates.resolutionStrategy = { } } rules.withModule("com.github.tomtung:latex2unicode_2.12") { ComponentSelection selection -> - if (selection.candidate.version ==~ /0.2.[3,4]/) { // Reject version higher than 2.0.2. see https://github.com/JabRef/jabref/pull/3781 + 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") } } @@ -233,6 +234,11 @@ dependencyUpdates.resolutionStrategy = { 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.") + } + } } }