Merge remote-tracking branch 'upstream/master' into fixcslpathdiscover

* upstream/master: Fixed group drag-n-drop not working after inserting an article into a group (#6008) New Crowdin translations (#5998) Bump richtextfx from 0.10.3 to 0.10.4 (#6007) Bump unirest-java from 3.5.00 to 3.6.00 (#6006) Bump com.github.ben-manes.versions from 0.27.0 to 0.28.0 (#6004) Bump classgraph from 4.8.64 to 4.8.65 (#6003) Bump mockito-core from 3.2.4 to 3.3.0 (#6005) Update module description (#5999)
JabRef · Feb 24, 2020 · 29a9259 · 29a9259
2 parents c3777e1 + 4eefcc6
commit 29a9259
Show file tree

Hide file tree

Showing 15 changed files with 427 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where the most bottom group in the list got lost, if it was dragged on itself. [#5983](https://github.com/JabRef/jabref/issues/5983)
 - We fixed an issue where changing entry type doesn't always work when biblatex source is shown. [#5905](https://github.com/JabRef/jabref/issues/5905)
 - We fixed an issue where the group and the link column were not updated after changing the entry in the main table. [#5985](https://github.com/JabRef/jabref/issues/5985)
+- We fixed an issue where reordering the groups was not possible after inserting an article. [#6008](https://github.com/JabRef/jabref/issues/6008)
 
 ### Removed
 

diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id "com.simonharrer.modernizer" version '1.8.0-1'
     id 'me.champeau.gradle.jmh' version '0.5.0'
     //id 'net.ltgt.errorprone' version '0.8.1'
-    id 'com.github.ben-manes.versions' version '0.27.0'
+    id 'com.github.ben-manes.versions' version '0.28.0'
     id 'org.javamodularity.moduleplugin' version '1.5.0'
     id 'org.openjfx.javafxplugin' version '0.0.8'
     id 'org.beryx.jlink' version '2.17.2'
@@ -163,13 +163,13 @@ dependencies {
     compile 'de.saxsys:mvvmfx:1.8.0'
     compile 'org.fxmisc.easybind:easybind:1.0.3'
     compile 'org.fxmisc.flowless:flowless:0.6.1'
-    compile 'org.fxmisc.richtext:richtextfx:0.10.3'
+    compile 'org.fxmisc.richtext:richtextfx:0.10.4'
     compile group: 'org.glassfish.hk2.external', name: 'jakarta.inject', version: '2.6.1'
     compile 'com.jfoenix:jfoenix:9.0.9'
     compile 'org.controlsfx:controlsfx:11.0.1'
 
     compile 'org.jsoup:jsoup:1.12.2'
-    compile 'com.konghq:unirest-java:3.5.00'
+    compile 'com.konghq:unirest-java:3.6.00'
 
     compile 'org.slf4j:slf4j-api:2.0.0-alpha1'
     compile group: 'org.apache.logging.log4j', name: 'log4j-jcl', version: '3.0.0-SNAPSHOT'
@@ -206,15 +206,15 @@ dependencies {
     }
 
 
-    testCompile 'io.github.classgraph:classgraph:4.8.64'
+    testCompile 'io.github.classgraph:classgraph:4.8.65'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.6.0'
     testCompile 'org.junit.platform:junit-platform-launcher:1.6.0'
 
     testCompile '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'
-    testCompile 'org.mockito:mockito-core:3.2.4'
+    testCompile 'org.mockito:mockito-core:3.3.0'
     //testCompile 'com.github.tomakehurst:wiremock:2.24.1'
     testCompile 'org.xmlunit:xmlunit-core:2.6.3'
     testCompile 'org.xmlunit:xmlunit-matchers:2.6.3'
@@ -582,41 +582,81 @@ jlink {
 
     // TODO: Remove the following correction to the merged module
     // The module descriptor automatically generated by the plugin for the merged module contained some invalid entries.
-    // Execute ./gradlew suggestMergedModuleInfo and include the incorrect directives here.
+    // Execute ./gradlew suggestMergedModuleInfo and include the suggested directives here.
     mergedModule {
-        requires 'java.logging'
-        requires 'jdk.xml.dom'
-        requires 'java.sql'
-        requires 'java.rmi'
         requires 'java.xml'
         requires 'com.sun.xml.txw2'
-        requires 'com.google.gson'
         requires 'java.desktop'
-        requires 'java.security.jgss'
-        requires 'jdk.jsobject'
+        requires 'org.objectweb.asm'
+        requires 'jdk.jfr'
         requires 'jdk.unsupported'
+        requires 'com.google.gson'
         requires 'java.management'
         requires 'java.naming'
-        requires 'jdk.unsupported.desktop'
         requires 'java.security.sasl'
+        requires 'com.sun.xml.fastinfoset'
+        requires 'jdk.security.jgss'
+        requires 'java.logging'
+        requires 'jdk.xml.dom'
+        requires 'java.sql'
+        requires 'java.rmi'
+        requires 'java.security.jgss'
+        requires 'com.oracle.truffle.regex'
+        requires 'jdk.jsobject'
+        requires 'jdk.management'
+        requires 'jdk.unsupported.desktop'
+        requires 'org.objectweb.asm.util'
         requires 'java.scripting'
+        requires 'org.objectweb.asm.commons'
+        requires 'org.graalvm.truffle'
         requires 'java.datatransfer'
         requires 'java.compiler'
+        requires 'java.sql.rowset'
         requires 'java.transaction.xa'
-        requires 'com.sun.xml.fastinfoset'
+        requires 'org.graalvm.sdk'
         requires 'org.slf4j'
-        uses 'com.airhacks.afterburner.injection.PresenterFactory'
+        uses 'org.apache.logging.log4j.util.PropertySource'
+        uses 'org.apache.logging.log4j.core.util.WatchEventService'
+        uses 'org.apache.logging.log4j.plugins.processor.PluginService'
         uses 'org.controlsfx.glyphfont.GlyphFont'
         uses 'com.airhacks.afterburner.views.ResourceLocator'
+        uses 'com.oracle.truffle.js.runtime.Evaluator'
+        uses 'org.apache.logging.log4j.message.ThreadDumpMessage.ThreadInfoFactory'
+        uses 'com.airhacks.afterburner.injection.PresenterFactory'
+        uses 'com.oracle.truffle.js.runtime.builtins.JSFunctionLookup'
+        uses 'org.apache.logging.log4j.spi.Provider'
+        uses 'org.mariadb.jdbc.tls.TlsSocketPlugin'
+        uses 'org.mariadb.jdbc.LocalInfileInterceptor'
         uses 'javax.xml.bind.JAXBContextFactory'
-        provides 'java.sql.Driver' with 'org.postgresql.Driver'
+        provides 'javax.annotation.processing.Processor' with 'org.apache.logging.log4j.plugins.processor.PluginProcessor'
         provides 'org.controlsfx.glyphfont.GlyphFont' with 'org.controlsfx.glyphfont.FontAwesome'
-        provides 'org.apache.commons.logging.LogFactory' with 'org.apache.logging.log4j.jcl.LogFactoryImpl'
-        provides 'org.slf4j.spi.SLF4JServiceProvider' with 'org.apache.logging.slf4j.SLF4JServiceProvider'
+        provides 'org.apache.logging.log4j.message.ThreadDumpMessage.ThreadInfoFactory' with 'org.apache.logging.log4j.core.message.ExtendedThreadInfoFactory'
+        provides 'org.mariadb.jdbc.tls.TlsSocketPlugin' with 'org.mariadb.jdbc.internal.protocol.tls.DefaultTlsSocketPlugin'
         provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.ServerProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.netty.shaded.io.grpc.netty.NettyServerProvider'
+        provides 'com.oracle.truffle.js.runtime.Evaluator' with 'com.oracle.truffle.js.parser.GraalJSEvaluator'
         provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.NameResolverProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.internal.DnsNameResolverProvider'
-        provides 'java.security.Provider' with 'org.bouncycastle.jce.provider.BouncyCastleProvider', 'org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider'
+        provides 'org.apache.logging.log4j.util.PropertySource' with 'org.apache.logging.log4j.util.EnvironmentPropertySource',
+                'org.apache.logging.log4j.util.SystemPropertiesPropertySource'
+        provides 'java.sql.Driver' with 'org.postgresql.Driver'
+        provides 'org.apache.logging.log4j.plugins.processor.PluginService' with 'org.apache.logging.log4j.plugins.convert.plugins.Log4jPlugins'
+        provides 'org.mariadb.jdbc.authentication.AuthenticationPlugin' with 'org.mariadb.jdbc.internal.com.send.authentication.CachingSha2PasswordPlugin',
+                'org.mariadb.jdbc.internal.com.send.authentication.ClearPasswordPlugin',
+                'org.mariadb.jdbc.internal.com.send.authentication.Ed25519PasswordPlugin',
+                'org.mariadb.jdbc.internal.com.send.authentication.NativePasswordPlugin',
+                'org.mariadb.jdbc.internal.com.send.authentication.OldPasswordPlugin',
+                'org.mariadb.jdbc.internal.com.send.authentication.SendGssApiAuthPacket',
+                'org.mariadb.jdbc.internal.com.send.authentication.SendPamAuthPacket',
+                'org.mariadb.jdbc.internal.com.send.authentication.Sha256PasswordPlugin'
+        provides 'org.mariadb.jdbc.credential.CredentialPlugin' with 'org.mariadb.jdbc.credential.aws.AwsIamCredentialPlugin',
+                'org.mariadb.jdbc.credential.env.EnvCredentialPlugin',
+                'org.mariadb.jdbc.credential.system.PropertiesCredentialPlugin'
+        provides 'org.apache.commons.logging.LogFactory' with 'org.apache.logging.log4j.jcl.LogFactoryImpl'
+        provides 'org.slf4j.spi.SLF4JServiceProvider' with 'org.apache.logging.slf4j.SLF4JServiceProvider'
+        provides 'org.apache.logging.log4j.spi.Provider' with 'org.apache.logging.log4j.core.impl.Log4jProvider'
+        provides 'java.security.Provider' with 'org.bouncycastle.jce.provider.BouncyCastleProvider',
+                'org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider'
         provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.ManagedChannelProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.netty.shaded.io.grpc.netty.NettyChannelProvider'
+        provides 'com.oracle.truffle.js.runtime.builtins.JSFunctionLookup' with 'com.oracle.truffle.js.builtins.JSDefaultBuiltinLookup'
     }
 
     jpackage {

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -6,6 +6,7 @@
     requires java.sql;
 
     // JavaFX
+    requires javafx.base;
     requires javafx.graphics;
     requires javafx.swing;
     requires javafx.controls;
@@ -17,6 +18,7 @@
     requires de.jensd.fx.fontawesomefx.commons;
     requires de.jensd.fx.fontawesomefx.materialdesignicons;
     requires org.controlsfx.controls;
+    requires org.fxmisc.richtext;
 
     provides com.airhacks.afterburner.views.ResourceLocator
             with org.jabref.gui.util.JabRefResourceLocator;
@@ -62,7 +64,6 @@
     requires org.graalvm.js;
     requires org.apache.xmpbox;
     requires de.saxsys.mvvmfx.validation;
-    requires richtextfx;
     requires com.google.gson;
     requires unirest.java;
     requires org.apache.httpcomponents.httpclient;
@@ -72,9 +73,10 @@
     requires java.string.similarity;
     requires ojdbc10;
     requires org.postgresql.jdbc;
+    requires org.mariadb.jdbc;
+    uses org.mariadb.jdbc.credential.CredentialPlugin;
     requires org.apache.commons.lang3;
     requires org.antlr.antlr4.runtime;
     requires flowless;
     requires org.apache.tika.core;
-    requires javafx.base;
 }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -201,6 +201,10 @@ public void initialize() {
                     }
                 }
 
+                if (groupsToMove.size() > 0) {
+                    localDragboard.clearAll();
+                }
+
                 // Put the group nodes as content
                 Dragboard dragboard = treeTable.startDragAndDrop(TransferMode.MOVE);
                 // Display the group when dragging

diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
@@ -459,7 +459,7 @@ Main\ file\ directory=Hovedbibliotek
 Manage\ custom\ exports=Opsæt eksterne eksportfiltre
 
 Manage\ custom\ imports=Opsæt eksterne importfiltre
-Manage\ external\ file\ types=Administrer eksterne &filtyper
+Manage\ external\ file\ types=Administrer eksterne filtyper
 
 Mark\ new\ entries\ with\ addition\ date=Mærk nye poster med dato