From 63e490ca7d11e68b0735f1360351e81d1d444820 Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Wed, 12 Jun 2019 01:48:22 +0200 Subject: [PATCH 01/21] fix #5043: preserve encoding while copy and pasting in maintable --- .../java/org/jabref/gui/ClipBoardManager.java | 86 +++++++++++-------- .../org/jabref/gui/maintable/MainTable.java | 2 +- 2 files changed, 51 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/jabref/gui/ClipBoardManager.java b/src/main/java/org/jabref/gui/ClipBoardManager.java index c7c6ce2b9d4..26bc331fbb4 100644 --- a/src/main/java/org/jabref/gui/ClipBoardManager.java +++ b/src/main/java/org/jabref/gui/ClipBoardManager.java @@ -1,6 +1,8 @@ package org.jabref.gui; +import java.io.ByteArrayInputStream; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; import java.util.Optional; @@ -28,13 +30,11 @@ import org.slf4j.LoggerFactory; public class ClipBoardManager { - public static final DataFormat XML = new DataFormat("application/xml"); - + private static final Logger LOGGER = LoggerFactory.getLogger(ClipBoardManager.class); private final Clipboard clipboard; - private final ImportFormatReader importFormatReader; public ClipBoardManager() { @@ -63,9 +63,8 @@ public String getContents() { String result = clipboard.getString(); if (result == null) { return ""; - } else { - return result; } + return result; } public void setHtmlContent(String html) { @@ -89,40 +88,55 @@ public void setContent(List entries) throws IOException { clipboard.setContent(content); } - public List extractEntries() { + public List extractData() { Object entries = clipboard.getContent(DragAndDropDataFormats.ENTRIES); + if (entries == null) { + return handleStringData(clipboard.getString()); + } + return handleBibTeXData((String) entries); + } + + private List handleBibTeXData(String entries) { BibtexParser parser = new BibtexParser(Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor()); - if (entries != null) { - // We have determined that the clipboard data is a set of entries (serialized as a string). - try { - return parser.parseEntries((String) entries); - } catch (ParseException ex) { - LOGGER.error("Could not paste", ex); - } - } else { - String data = clipboard.getString(); - if (data != null) { - try { - // fetch from doi - Optional doi = DOI.parse(data); - if (doi.isPresent()) { - LOGGER.info("Found DOI in clipboard"); - Optional entry = new DoiFetcher(Globals.prefs.getImportFormatPreferences()).performSearchById(doi.get().getDOI()); - return OptionalUtil.toList(entry); - } else { - try { - UnknownFormatImport unknownFormatImport = importFormatReader.importUnknownFormat(data); - return unknownFormatImport.parserResult.getDatabase().getEntries(); - } catch (ImportException e) { - // import failed and result will be empty - } - } - } catch (FetcherException ex) { - LOGGER.error("Error while fetching", ex); - } - } + try { + return parser.parseEntries(new ByteArrayInputStream(entries.getBytes(StandardCharsets.UTF_8))); + } catch (ParseException ex) { + LOGGER.error("Could not paste", ex); + return Collections.emptyList(); + } + } + + private List handleStringData(String data) { + if (data == null || data.isEmpty()) { + return Collections.emptyList(); + } + + Optional doi = DOI.parse(data); + if (doi.isPresent()) { + return fetchByDOI(doi.get()); + } + + return tryImportFormats(data); + } + + private List tryImportFormats(String data) { + try { + UnknownFormatImport unknownFormatImport = importFormatReader.importUnknownFormat(data); + return unknownFormatImport.parserResult.getDatabase().getEntries(); + } catch (ImportException ignored) { + return Collections.emptyList(); + } + } + + private List fetchByDOI(DOI doi) { + LOGGER.info("Found DOI in clipboard"); + try { + Optional entry = new DoiFetcher(Globals.prefs.getImportFormatPreferences()).performSearchById(doi.getDOI()); + return OptionalUtil.toList(entry); + } catch (FetcherException ex) { + LOGGER.error("Error while fetching", ex); + return Collections.emptyList(); } - return Collections.emptyList(); } } diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java index 892116fb337..6232d33a961 100644 --- a/src/main/java/org/jabref/gui/maintable/MainTable.java +++ b/src/main/java/org/jabref/gui/maintable/MainTable.java @@ -209,7 +209,7 @@ private void clearAndSelectLast() { public void paste() { // Find entries in clipboard - List entriesToAdd = Globals.clipboardManager.extractEntries(); + List entriesToAdd = Globals.clipboardManager.extractData(); if (!entriesToAdd.isEmpty()) { // Add new entries From 45d1f579349dd84d2e585a2fb4d0b3d13af128a4 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Thu, 20 Jun 2019 19:37:32 +0200 Subject: [PATCH 02/21] Refactor for loop to stream in groupTree Close version socket --- .../org/jabref/gui/groups/GroupTreeView.java | 18 +++--------------- .../java/org/jabref/logic/util/Version.java | 5 +++-- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java index abc6e9fb460..1d2c4646dc6 100644 --- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java +++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Optional; import java.util.function.Consumer; +import java.util.stream.Collectors; import javax.inject.Inject; @@ -280,12 +281,7 @@ private void updateSelection(List> newSelectedGroup if ((newSelectedGroups == null) || newSelectedGroups.isEmpty()) { viewModel.selectedGroupsProperty().clear(); } else { - List list = new ArrayList<>(); - for (TreeItem model : newSelectedGroups) { - if ((model != null) && (model.getValue() != null) && !(model.getValue().getGroupNode().getGroup() instanceof AllEntriesGroup)) { - list.add(model.getValue()); - } - } + List list = newSelectedGroups.stream().filter(model -> model != null && !(model.getValue().getGroupNode().getGroup() instanceof AllEntriesGroup)).map(TreeItem::getValue).collect(Collectors.toList()); viewModel.selectedGroupsProperty().setAll(list); } } @@ -304,15 +300,7 @@ private Optional> getTreeItemByValue(TreeItem child : root.getChildren()) { - Optional> treeItemByValue = getTreeItemByValue(child, value); - if (treeItemByValue.isPresent()) { - return treeItemByValue; - } - } - - return Optional.empty(); + return root.getChildren().stream().filter(child -> getTreeItemByValue(child, value).isPresent()).findFirst(); } private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) { diff --git a/src/main/java/org/jabref/logic/util/Version.java b/src/main/java/org/jabref/logic/util/Version.java index 11ecd279f17..e288c718064 100644 --- a/src/main/java/org/jabref/logic/util/Version.java +++ b/src/main/java/org/jabref/logic/util/Version.java @@ -3,8 +3,8 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.net.HttpURLConnection; import java.net.URL; -import java.net.URLConnection; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -91,7 +91,7 @@ public static Version parse(String version) { * Grabs all the available releases from the GitHub repository */ public static List getAllAvailableVersions() throws IOException { - URLConnection connection = new URL(JABREF_GITHUB_RELEASES).openConnection(); + HttpURLConnection connection = (HttpURLConnection) new URL(JABREF_GITHUB_RELEASES).openConnection(); connection.setRequestProperty("Accept-Charset", "UTF-8"); try (BufferedReader rd = new BufferedReader(new InputStreamReader(connection.getInputStream()))) { @@ -102,6 +102,7 @@ public static List getAllAvailableVersions() throws IOException { Version version = Version.parse(jsonObject.getString("tag_name").replaceFirst("v", "")); versions.add(version); } + connection.disconnect(); return versions; } } From 155401db007930900a88177bd7cc2ded3fe6445d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 10:44:41 +0200 Subject: [PATCH 03/21] Bump xmlunit-core from 2.6.2 to 2.6.3 (#5073) Bumps [xmlunit-core](https://github.com/xmlunit/xmlunit) from 2.6.2 to 2.6.3. - [Release notes](https://github.com/xmlunit/xmlunit/releases) - [Changelog](https://github.com/xmlunit/xmlunit/blob/master/RELEASE_NOTES.md) - [Commits](https://github.com/xmlunit/xmlunit/compare/v2.6.2...v2.6.3) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a20c84f5a6e..1c203d4ebab 100644 --- a/build.gradle +++ b/build.gradle @@ -166,7 +166,7 @@ dependencies { testCompile 'org.mockito:mockito-core:2.28.2' testCompile 'com.github.tomakehurst:wiremock:2.23.2' testCompile 'org.reflections:reflections:0.9.11' - testCompile 'org.xmlunit:xmlunit-core:2.6.2' + testCompile 'org.xmlunit:xmlunit-core:2.6.3' testCompile 'org.xmlunit:xmlunit-matchers:2.6.2' testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.10.2' testCompile 'com.tngtech.archunit:archunit-junit5-api:0.10.2' From 6e63f58baa0c27a76955515337fab79efe4fcd44 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 10:45:06 +0200 Subject: [PATCH 04/21] Bump checkstyle from 8.21 to 8.22 (#5072) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.21 to 8.22. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.21...checkstyle-8.22) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1c203d4ebab..a28d6929797 100644 --- a/build.gradle +++ b/build.gradle @@ -173,7 +173,7 @@ dependencies { testCompile "org.testfx:testfx-core:4.0.+" testCompile "org.testfx:testfx-junit5:4.0.+" - checkstyle 'com.puppycrawl.tools:checkstyle:8.21' + checkstyle 'com.puppycrawl.tools:checkstyle:8.22' xjc 'com.sun.xml.bind:jaxb-xjc:2.2.4-1' jython 'org.python:jython-standalone:2.7.1' } From 35fa24c92308ae09ee693671b634b8fa6364d770 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 10:55:03 +0200 Subject: [PATCH 05/21] Bump xmlunit-matchers from 2.6.2 to 2.6.3 (#5074) Bumps [xmlunit-matchers](https://github.com/xmlunit/xmlunit) from 2.6.2 to 2.6.3. - [Release notes](https://github.com/xmlunit/xmlunit/releases) - [Changelog](https://github.com/xmlunit/xmlunit/blob/master/RELEASE_NOTES.md) - [Commits](https://github.com/xmlunit/xmlunit/compare/v2.6.2...v2.6.3) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a28d6929797..c05a22b3c04 100644 --- a/build.gradle +++ b/build.gradle @@ -167,7 +167,7 @@ dependencies { testCompile 'com.github.tomakehurst:wiremock:2.23.2' testCompile 'org.reflections:reflections:0.9.11' testCompile 'org.xmlunit:xmlunit-core:2.6.3' - testCompile 'org.xmlunit:xmlunit-matchers:2.6.2' + testCompile 'org.xmlunit:xmlunit-matchers:2.6.3' testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.10.2' testCompile 'com.tngtech.archunit:archunit-junit5-api:0.10.2' testCompile "org.testfx:testfx-core:4.0.+" From 441b76454318ff5b7a415085087ddeb22ded561e Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Mon, 24 Jun 2019 15:26:22 +0200 Subject: [PATCH 06/21] Configure autoapproval plugin for dependabot As suggested in: https://github.com/dependabot/feedback/issues/86#issuecomment-504930613 https://github.com/apps/autoapproval --- .github/autoapproval.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .github/autoapproval.yml diff --git a/.github/autoapproval.yml b/.github/autoapproval.yml new file mode 100644 index 00000000000..57ad49c1a77 --- /dev/null +++ b/.github/autoapproval.yml @@ -0,0 +1,4 @@ +from_owner: + - dependabot-preview[bot] +required_labels: + - dependencies From 26fc0c8ba6214e7420f682cef37c4b4c293d7d7c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 07:57:22 +0200 Subject: [PATCH 07/21] Bump com.install4j.gradle from 7.0.11 to 7.0.12 (#5077) Bumps com.install4j.gradle from 7.0.11 to 7.0.12. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c05a22b3c04..7c6bebc5e93 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { plugins { id 'com.gradle.build-scan' version '2.3' - id 'com.install4j.gradle' version '7.0.11' + id 'com.install4j.gradle' version '7.0.12' id 'com.github.johnrengelman.shadow' version '5.0.0' id "com.simonharrer.modernizer" version '1.6.0-1' id 'me.champeau.gradle.jmh' version '0.4.8' From 535becdee5d1627c9dd2554b53d0a4b7d90a33f1 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 26 Jun 2019 07:58:41 +0200 Subject: [PATCH 08/21] Delete autoapproval.yml --- .github/autoapproval.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .github/autoapproval.yml diff --git a/.github/autoapproval.yml b/.github/autoapproval.yml deleted file mode 100644 index 57ad49c1a77..00000000000 --- a/.github/autoapproval.yml +++ /dev/null @@ -1,4 +0,0 @@ -from_owner: - - dependabot-preview[bot] -required_labels: - - dependencies From 8100878f951d8b4b98e3f154ca6fe8d674c088f8 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Thu, 27 Jun 2019 21:12:15 +0200 Subject: [PATCH 09/21] Update FUNDING.yml --- .github/FUNDING.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index ae460b6a54a..4cfebe1ba5d 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,12 +1,12 @@ # These are supported funding model platforms github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: koppor +patreon: # Patreon user account open_collective: # Replace with a single Open Collective username ko_fi: # Replace with a single Ko-fi username tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: koppor +liberapay: JabRef issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username custom: https://github.com/JabRef/jabref/wiki/Donations # Replace with a single custom sponsorship URL From c85fa63920bcc77376121ea1771e43376c70346b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 17:22:43 +0200 Subject: [PATCH 10/21] Bump xmpbox from 2.0.15 to 2.0.16 (#5082) Bumps xmpbox from 2.0.15 to 2.0.16. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7c6bebc5e93..d4c66503a26 100644 --- a/build.gradle +++ b/build.gradle @@ -92,7 +92,7 @@ dependencies { compile 'org.apache.pdfbox:pdfbox:2.0.15' compile 'org.apache.pdfbox:fontbox:2.0.15' - compile 'org.apache.pdfbox:xmpbox:2.0.15' + compile 'org.apache.pdfbox:xmpbox:2.0.16' compile group: 'org.apache.tika', name: 'tika-core', version: '1.21' From d7fba98badd90d9cb02995cdb8c28112dfecaae9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 17:22:53 +0200 Subject: [PATCH 11/21] Bump pdfbox from 2.0.15 to 2.0.16 (#5081) Bumps pdfbox from 2.0.15 to 2.0.16. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d4c66503a26..fe558f4bdb3 100644 --- a/build.gradle +++ b/build.gradle @@ -90,7 +90,7 @@ dependencies { // Include all jar-files in the 'lib' folder as dependencies compile fileTree(dir: 'lib', includes: ['*.jar']) - compile 'org.apache.pdfbox:pdfbox:2.0.15' + compile 'org.apache.pdfbox:pdfbox:2.0.16' compile 'org.apache.pdfbox:fontbox:2.0.15' compile 'org.apache.pdfbox:xmpbox:2.0.16' From c7f958f3b4db43d7f3f3b9201960124d519727b5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 17:30:59 +0200 Subject: [PATCH 12/21] Bump fontbox from 2.0.15 to 2.0.16 (#5080) Bumps fontbox from 2.0.15 to 2.0.16. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fe558f4bdb3..d91b5b56b52 100644 --- a/build.gradle +++ b/build.gradle @@ -91,7 +91,7 @@ dependencies { compile fileTree(dir: 'lib', includes: ['*.jar']) compile 'org.apache.pdfbox:pdfbox:2.0.16' - compile 'org.apache.pdfbox:fontbox:2.0.15' + compile 'org.apache.pdfbox:fontbox:2.0.16' compile 'org.apache.pdfbox:xmpbox:2.0.16' compile group: 'org.apache.tika', name: 'tika-core', version: '1.21' From 0b7e3efbc1cba6fb3f007b2da4a31d127cf55f98 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 05:50:58 +0000 Subject: [PATCH 13/21] Bump log4j-jcl from 2.11.2 to 2.12.0 Bumps log4j-jcl from 2.11.2 to 2.12.0. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d91b5b56b52..55b7bff203e 100644 --- a/build.gradle +++ b/build.gradle @@ -144,7 +144,7 @@ dependencies { // >1.8.0-beta is required for java 9 compatibility compile 'org.slf4j:slf4j-api:2.0.0-alpha0' compile 'org.apache.logging.log4j:log4j-slf4j18-impl:2.11.2' - compile 'org.apache.logging.log4j:log4j-jcl:2.11.2' + compile 'org.apache.logging.log4j:log4j-jcl:2.12.0' compile 'org.apache.logging.log4j:log4j-api:2.11.2' compile 'org.apache.logging.log4j:log4j-core:2.11.2' From 408990efcb5a23978f21bdd7f87fce85f02caab5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 05:51:25 +0000 Subject: [PATCH 14/21] Bump com.github.johnrengelman.shadow from 5.0.0 to 5.1.0 Bumps com.github.johnrengelman.shadow from 5.0.0 to 5.1.0. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d91b5b56b52..8345018cbad 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { plugins { id 'com.gradle.build-scan' version '2.3' id 'com.install4j.gradle' version '7.0.12' - id 'com.github.johnrengelman.shadow' version '5.0.0' + id 'com.github.johnrengelman.shadow' version '5.1.0' id "com.simonharrer.modernizer" version '1.6.0-1' id 'me.champeau.gradle.jmh' version '0.4.8' id 'net.ltgt.errorprone' version '0.8.1' From 2d5239ede7c10323627a627dac858cfecd79926a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 05:52:27 +0000 Subject: [PATCH 15/21] Bump junit-jupiter from 5.4.2 to 5.5.0 Bumps [junit-jupiter](https://github.com/junit-team/junit5) from 5.4.2 to 5.5.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.4.2...r5.5.0) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d91b5b56b52..7a7885d4c02 100644 --- a/build.gradle +++ b/build.gradle @@ -157,7 +157,7 @@ dependencies { compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.3.1' compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.3.1' - testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' + testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0' testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.4.2' testCompile 'org.junit.platform:junit-platform-launcher:1.4.2' From 729c6e574d3fccb784e0c72c1401dddf7b3f9e9d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 05:55:12 +0000 Subject: [PATCH 16/21] Bump log4j-jul from 2.11.2 to 2.12.0 Bumps log4j-jul from 2.11.2 to 2.12.0. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d91b5b56b52..6a2984e8a5e 100644 --- a/build.gradle +++ b/build.gradle @@ -162,7 +162,7 @@ dependencies { testCompile 'org.junit.platform:junit-platform-launcher:1.4.2' testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1' - testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.2' + testRuntime 'org.apache.logging.log4j:log4j-jul:2.12.0' testCompile 'org.mockito:mockito-core:2.28.2' testCompile 'com.github.tomakehurst:wiremock:2.23.2' testCompile 'org.reflections:reflections:0.9.11' From e666526bd466d3b908270f3fde6ca570fe3fcd3f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 06:36:51 +0000 Subject: [PATCH 17/21] Bump log4j-slf4j18-impl from 2.11.2 to 2.12.0 Bumps log4j-slf4j18-impl from 2.11.2 to 2.12.0. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9b9aa47022e..b7fdbab107e 100644 --- a/build.gradle +++ b/build.gradle @@ -143,7 +143,7 @@ dependencies { // >1.8.0-beta is required for java 9 compatibility compile 'org.slf4j:slf4j-api:2.0.0-alpha0' - compile 'org.apache.logging.log4j:log4j-slf4j18-impl:2.11.2' + compile 'org.apache.logging.log4j:log4j-slf4j18-impl:2.12.0' compile 'org.apache.logging.log4j:log4j-jcl:2.12.0' compile 'org.apache.logging.log4j:log4j-api:2.11.2' compile 'org.apache.logging.log4j:log4j-core:2.11.2' From f641cd5eddbba6d5156fb6da70436bfa1ba72d2c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 06:36:56 +0000 Subject: [PATCH 18/21] Bump log4j-core from 2.11.2 to 2.12.0 Bumps log4j-core from 2.11.2 to 2.12.0. Signed-off-by: dependabot-preview[bot] --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9b9aa47022e..46ae19799ff 100644 --- a/build.gradle +++ b/build.gradle @@ -146,7 +146,7 @@ dependencies { compile 'org.apache.logging.log4j:log4j-slf4j18-impl:2.11.2' compile 'org.apache.logging.log4j:log4j-jcl:2.12.0' compile 'org.apache.logging.log4j:log4j-api:2.11.2' - compile 'org.apache.logging.log4j:log4j-core:2.11.2' + compile 'org.apache.logging.log4j:log4j-core:2.12.0' compile 'de.undercouch:citeproc-java:1.0.1' @@ -161,7 +161,7 @@ dependencies { testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.4.2' testCompile 'org.junit.platform:junit-platform-launcher:1.4.2' - testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1' + testRuntime 'org.apache.logging.log4j:log4j-core:2.12.0' testRuntime 'org.apache.logging.log4j:log4j-jul:2.12.0' testCompile 'org.mockito:mockito-core:2.28.2' testCompile 'com.github.tomakehurst:wiremock:2.23.2' From 03b2a596098a449ebd5206a22380b06a71b0ba45 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 06:39:04 +0000 Subject: [PATCH 19/21] Bump junit-platform-launcher from 1.4.2 to 1.5.0 Bumps [junit-platform-launcher](https://github.com/junit-team/junit5) from 1.4.2 to 1.5.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/commits) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0951b9873a6..bc0b8d09193 100644 --- a/build.gradle +++ b/build.gradle @@ -159,7 +159,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.4.2' - testCompile 'org.junit.platform:junit-platform-launcher:1.4.2' + testCompile 'org.junit.platform:junit-platform-launcher:1.5.0' testRuntime 'org.apache.logging.log4j:log4j-core:2.12.0' testRuntime 'org.apache.logging.log4j:log4j-jul:2.12.0' From d51f4cf159b3aab2f98642b9d315ec15483ac226 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 06:39:22 +0000 Subject: [PATCH 20/21] Bump log4j-api from 2.11.2 to 2.12.0 Bumps log4j-api from 2.11.2 to 2.12.0. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0951b9873a6..a02b3bf0421 100644 --- a/build.gradle +++ b/build.gradle @@ -145,7 +145,7 @@ dependencies { compile 'org.slf4j:slf4j-api:2.0.0-alpha0' compile 'org.apache.logging.log4j:log4j-slf4j18-impl:2.12.0' compile 'org.apache.logging.log4j:log4j-jcl:2.12.0' - compile 'org.apache.logging.log4j:log4j-api:2.11.2' + compile 'org.apache.logging.log4j:log4j-api:2.12.0' compile 'org.apache.logging.log4j:log4j-core:2.12.0' compile 'de.undercouch:citeproc-java:1.0.1' From d70a25ce6658c5a164135f46ad743bbeabd89510 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 06:44:36 +0000 Subject: [PATCH 21/21] Bump junit-vintage-engine from 5.4.2 to 5.5.0 Bumps [junit-vintage-engine](https://github.com/junit-team/junit5) from 5.4.2 to 5.5.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.4.2...r5.5.0) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 75388431e80..95605aab8ff 100644 --- a/build.gradle +++ b/build.gradle @@ -158,7 +158,7 @@ dependencies { compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.3.1' testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.4.2' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.0' testCompile 'org.junit.platform:junit-platform-launcher:1.5.0' testRuntime 'org.apache.logging.log4j:log4j-core:2.12.0'