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

* upstream/master: Remove untranslated Strings from the greek menu translation Remove untranslated Strings from the greek translation Update wiremock from 2.7.1 -> 2.8.0 Update log4j from 2.8.2 -> 2.9.0 Added the name of some new authors Fix typo local db and shared db sync fix #2284 with changelog local db and shared db sync fix #2284 Improvement in Japanese translation (#3193)
JabRef · Sep 5, 2017 · 13a45d5 · 13a45d5
2 parents 1f1dca7 + c416818
commit 13a45d5
Show file tree

Hide file tree

Showing 10 changed files with 1,554 additions and 2,101 deletions.
diff --git a/.mailmap b/.mailmap
@@ -122,3 +122,7 @@ Fabian Bauer <125m125@users.noreply.github.com>
 Jong-Ho Shinn <jhshinn@kaist.edu>
 Nadeem Mahmood <mahmoodn@purdue.edu>
 Foivos Christoulakis <halx4@users.noreply.github.com>
+Predrag Milanovic <pmilanovic@gmail.com>
+Karsten Hiekmann <sammann-fnordbedarf-de@users.noreply.github.com>
+Andrew Levit <dreyskiy@gmail.com>
+
diff --git a/AUTHORS b/AUTHORS
@@ -14,6 +14,7 @@ Ambrogio Oliva
 Andreas Amann
 Andreas Buhr
 Andreas Rudert
+Andrew Levit
 Anh Nghia Tran
 Anita Armbruster
 Antonio Ribeiro
@@ -91,6 +92,7 @@ Jörg Zieren
 Jørgen Kvalsvik
 Jürgen Lange
 Kai Mindermann
+Karsten Hiekmann
 Koji Yokota
 Kolja Brix
 Krunoslav Zubrinic
@@ -123,7 +125,6 @@ Michel Baylac
 Mike Smoot
 Moritz Ringler
 Morten Alver
-mpele
 Mélanie Tremblay
 Nadeem Mahmood
 Nathan Dunn
@@ -142,6 +143,7 @@ Paul Martin
 payload
 Peter Ansell
 Philip Johnson
+Predrag Milanovic
 Raik Nagel
 Renato Massao
 Robert Jäschke

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where an online file link could not be removed from an entry [#3165](https://github.com/JabRef/jabref/issues/3165)
 - We fixed an issue where an online file link did not open the browser and created an error [#3165](https://github.com/JabRef/jabref/issues/3165)
 - We fixed an issue where the arrow keys in the search bar did not work as expected [#3081](https://github.com/JabRef/jabref/issues/3081)
+- We fixed an issue where metadata syncing with local and shared database were unstable. It will also fix syncing groups and sub-groups in database. [#2284](https://github.com/JabRef/jabref/issues/2284)
+
 ### Removed
 
 

diff --git a/build.gradle b/build.gradle
@@ -113,9 +113,9 @@ dependencies {
     compile 'com.mashape.unirest:unirest-java:1.4.9'
 
     compile 'commons-logging:commons-logging:1.2'
-    compile 'org.apache.logging.log4j:log4j-jcl:2.8.2'
-    compile 'org.apache.logging.log4j:log4j-api:2.8.2'
-    compile 'org.apache.logging.log4j:log4j-core:2.8.2'
+    compile 'org.apache.logging.log4j:log4j-jcl:2.9.0'
+    compile 'org.apache.logging.log4j:log4j-api:2.9.0'
+    compile 'org.apache.logging.log4j:log4j-core:2.9.0'
 
     // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles
     compile 'org.citationstyles:styles:1.0.1-SNAPSHOT'
@@ -129,7 +129,7 @@ dependencies {
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:2.9.0'
-    testCompile 'com.github.tomakehurst:wiremock:2.7.1'
+    testCompile 'com.github.tomakehurst:wiremock:2.8.0'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
     testCompile 'org.reflections:reflections:0.9.11'
     testCompile 'org.xmlunit:xmlunit-core:2.4.0'

diff --git a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
@@ -117,7 +117,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
                     Files.createDirectories(newPath);
                 }
             } catch (IOException e) {
-                LOGGER.error("Could not create necessary target directoires for renaming", e);
+                LOGGER.error("Could not create necessary target directories for renaming", e);
             }
 
             boolean renameSuccessful = FileUtil.renameFile(Paths.get(expandedOldFilePath), newPath, true);

diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -81,6 +81,7 @@ public void setGroups(GroupTreeNode root) {
         groupsRoot = Objects.requireNonNull(root);
         groupsRoot.subscribeToDescendantChanged(groupTreeNode -> eventBus.post(new GroupUpdatedEvent(this)));
         eventBus.post(new GroupUpdatedEvent(this));
+        postChange();
     }
 
     /**