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

* upstream/master: (23 commits)
  Feature java version check again (#3428)
  Fix test for quoted lang messages (#3424)
  Update gradle from 4.3 to 4.3.1
  Fix #3411: ordering of fields in customized entry types works again (#3422)
  Backport of syncLang to python2 (#3420)
  Remove Versioneye badge
  Fix some error prone warnings
  Fix for issue #2721 append to a field (#3395)
  Fix travis - hopefully
  Remove 3.x changelog (#3250)
  Try to use hint of https://github.com/TheBoegl/shadow-log4j-transformer#usage-as-library
  Try to enable LGTM
  Update guava from 23.2 -> 23.3 (#3409)
  Update wiremock from 2.8.0 -> 2.10.1
  Move groups field from others to general (#3407)
  Fix checkstyle issues to repair build
  Fix #3046: No longer allow duplicate fields in customized entry types (#3405)
  Strip invalid prolog when loading CitationStyles (#3404)
  Integrity check "Abbreviation Detection" detects abbreviated names for journals and booktitles based on the internal list instead of only looking for "." signs. (#3362)
  Update gradle from 4.2.1 to 4.3
  ...

.travis.yml

@@ -38,7 +38,7 @@ before_script:
   - mysql -u root -e 'create database jabref'
 
 script:
-  # --scan enables the Gradle build scan, which can be used to investiage the time each action consumes
+  # --scan enables the Gradle build scan, which can be used to investigate the time each action consumes
   # For more information see https://gradle.com/scans/get-started
   - if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ]; then ./gradlew $TEST_SUITE $OPTIONS --scan; fi
   - if [ "$TEST_SUITE" == "checkstyle" ]; then ./gradlew checkstyleMain checkstyleTest checkstyleJmh; fi

README.md

@@ -1,7 +1,6 @@
 # JabRef Development Version
 
 [![Build Status](https://travis-ci.org/JabRef/jabref.svg?branch=master)](https://travis-ci.org/JabRef/jabref)
-[![Dependency Status](https://www.versioneye.com/user/projects/557f2723386664002000009c/badge.svg?style=flat)](https://www.versioneye.com/user/projects/557f2723386664002000009c)
 [![codecov.io](https://codecov.io/github/JabRef/jabref/coverage.svg?branch=master)](https://codecov.io/github/JabRef/jabref?branch=master)
 [![Donation](https://img.shields.io/badge/donate%20to-jabref-orange.svg)](https://donations.jabref.org)
 

build.gradle

@@ -3,7 +3,7 @@ import org.gradle.internal.os.OperatingSystem
 // to update the gradle wrapper, execute ./gradlew wrapper --gradle-version 4.0
 
 plugins {
-    id 'com.gradle.build-scan' version '1.8'
+    id 'com.gradle.build-scan' version '1.9'
     id 'com.install4j.gradle' version '6.1.5'
     id 'com.github.johnrengelman.shadow' version '2.0.1'
     id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
@@ -38,6 +38,10 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 mainClassName = "org.jabref.JabRefMain"
 
+// These are the Java version requirements we will check on each start of JabRef
+ext.minRequiredJavaVersion = "1.8.0_144"
+ext.allowJava9 = false
+
 install4j {
     installDir = file(project.ext.install4jDir)
 }
@@ -97,7 +101,7 @@ dependencies {
 
     compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
 
-    compile 'com.google.guava:guava:23.2-jre'
+    compile 'com.google.guava:guava:23.3-jre'
 
     // JavaFX stuff
     compile 'com.airhacks:afterburner.fx:1.7.0'
@@ -131,7 +135,7 @@ dependencies {
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:2.11.0'
-    testCompile 'com.github.tomakehurst:wiremock:2.8.0'
+    testCompile 'com.github.tomakehurst:wiremock:2.10.1'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
     testCompile 'org.reflections:reflections:0.9.11'
     testCompile 'org.xmlunit:xmlunit-core:2.5.0'
@@ -160,7 +164,11 @@ processResources {
                 "year": String.valueOf(Calendar.getInstance().get(Calendar.YEAR)),
                 "authors": new File('AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "),
                 "developers": new File('DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "),
-                "azureInstrumentationKey": System.getenv('AzureInstrumentationKey'))
+                "azureInstrumentationKey": System.getenv('AzureInstrumentationKey'),
+                "minRequiredJavaVersion": minRequiredJavaVersion,
+                "allowJava9": allowJava9
+
+        )
         filteringCharset = 'UTF-8'
     }
 

docs/adr/0000-use-markdown-architectural-decision-records.md

@@ -0,0 +1,23 @@
+# Use Markdown Architectural Decision Records
+
+Should we record the architectural decisions made in this project?
+And if we do, wow to structure these recordings?
+
+## Considered Alternatives
+
+* [MADR](https://adr.github.io/madr/) - Markdown Architectural Decision Records
+* [Michael Nygard's template](http://thinkrelevance.com/blog/2011/11/15/documenting-architecture-decisions) - The first incarnation of the term "ADR". Maintainable by [adr-tools](https://github.com/npryce/adr-tools).
+* [Sustainable Architectural Decisions](https://www.infoq.com/articles/sustainable-architectural-design-decisions) - The Y-Statements
+* [DecisionRecord](https://github.com/schubmat/DecisionCapture) - Agile records by [@schubmat](https://github.com/schubmat/)
+* Other templates listed at <https://github.com/joelparkerhenderson/architecture_decision_record>
+* No records
+
+## Decision Outcome
+
+* Chosen Alternative: MADR
+* Implicit assumptions should be made explicit.
+  Design documentation is important to enable people understanding the decisions later on.
+  See also [A rational design process: How and why to fake it](https://doi.org/10.1109/TSE.1986.6312940).
+* The MADR template is lean and fits our development style.
+
+<!-- Pros and cons of alternatives straight-forward to elicit and therefore not captured. -->

docs/adr/index.md

@@ -1,8 +1,13 @@
-# Architectural Decision Records
+# Architectural Decision Log
 
-This lists the architectural decisions for JabRef.
+This log lists the architectural decisions for JabRef.
 
-- [0000-use-architectural-decision-records.md](0000-use-architectural-decision-records) - Use Architectural Decision Records
-- [template.md](template/) - the template
+<!-- adrlog -->
 
-More information on architectural decision records is available at <https://adr.github.io/>.
+- [ADR-0000](0000-use-markdown-architectural-decision-records.md) - Use Markdown Architectural Decision Records
+
+<!-- adrlogstop -->
+
+For new ADRs, please use [template.md](template.md) as basis.
+More information on MADR is available at <https://adr.github.io/madr/>.
+General information about architectural decision records is available at <https://adr.github.io/>.

docs/adr/template.md

@@ -1,36 +1,42 @@
-# <Short Title of the Issue>
+# *[short title of solved problem and solution]*
 
-**UserStory:** <TICKET/ISSUE-NUMBER>
+**User Story:** *[ticket/issue-number]* <!-- optional -->
 
-<WRITE ONE SENTENCE DESCRIBING THE PROBLEM. (Optional)>
+*[context and problem statement]*
+*[decision drivers | forces]* <!-- optional -->
 
 ## Considered Alternatives
 
-* <ALTERNATIVE 1>
-* <ALTERNATIVE 2>
-* <ALTERNATIVE 3>
+* *[alternative 1]*
+* *[alternative 2]*
+* *[alternative 3]*
+* *[...]* <!-- numbers of alternatives can vary -->
 
-## Conclusion
+## Decision Outcome
 
-* *Chosen Alternative: <ALTERNATIVE 1>*
-* <FURTHER RATIONALE (Optional)>
+* Chosen Alternative: *[alternative 1]*
+* *[justification. e.g., only alternative, which meets k.o. criterion decision driver | which resolves force force | ... | comes out best (see below)]*
+* *[consequences. e.g., negative impact on quality attribute, follow-up decisions required, ...]* <!-- optional -->
 
-## Comparison (Optional)
+## Pros and Cons of the Alternatives <!-- optional -->
 
-### <ALTERNATIVE 1>
+### *[alternative 1]*
 
-* + <ARGUMENT 1 PRO>
-* + <ARGUMENT 2 PRO>
-* - <ARGUMENT 1 CONTRA>
+* `+` *[argument 1 pro]*
+* `+` *[argument 2 pro]*
+* `-` *[argument 1 con]*
+* *[...]* <!-- numbers of pros and cons can vary -->
 
-### <ALTERNATIVE 2>
+### *[alternative 2]*
 
-* + <ARGUMENT 1 PRO>
-* + <ARGUMENT 2 PRO>
-* - <ARGUMENT 1 CONTRA>
+* `+` *[argument 1 pro]*
+* `+` *[argument 2 pro]*
+* `-` *[argument 1 con]*
+* *[...]* <!-- numbers of pros and cons can vary -->
 
-### <ALTERNATIVE 3>
+### *[alternative 3]*
 
-* + <ARGUMENT 1 PRO>
-* + <ARGUMENT 2 PRO>
-* - <ARGUMENT 1 CONTRA>
+* `+` *[argument 1 pro]*
+* `+` *[argument 2 pro]*
+* `-` *[argument 1 con]*
+* *[...]* <!-- numbers of pros and cons can vary -->

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip