Merge remote-tracking branch 'upstream/master' into swing-test

* upstream/master: fix loading of external file type edit dialog Remove JGoodies from external-libraries.txt Remove JGoodies (#4895)
JabRef · Apr 18, 2019 · 69ec0a3 · 69ec0a3
2 parents d214b7f + eab20bf
commit 69ec0a3
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 39 deletions.
diff --git a/build.gradle b/build.gradle
@@ -90,9 +90,6 @@ dependencies {
     // Include all jar-files in the 'lib' folder as dependencies
     compile fileTree(dir: 'lib', includes: ['*.jar'])
 
-    compile 'com.jgoodies:jgoodies-common:1.8.1'
-    compile 'com.jgoodies:jgoodies-forms:1.9.0'
-
     compile 'org.apache.pdfbox:pdfbox:2.0.15'
     compile 'org.apache.pdfbox:fontbox:2.0.15'
     compile 'org.apache.pdfbox:xmpbox:2.0.15'

diff --git a/external-libraries.txt b/external-libraries.txt
@@ -50,16 +50,6 @@ Project: pgjdbc-ng
 URL:     http://impossibl.github.io/pgjdbc-ng
 License: BSD-3-Clause
 
-Id:      com.jgoodies:jgoodies-common
-Project: JGoodies Common
-URL:     http://www.jgoodies.com/downloads/libraries/
-License: BSD-3-Clause
-
-Id:      com.jgoodies:jgoodies-forms
-Project: JGoodies Forms
-URL:     http://www.jgoodies.com/downloads/libraries/
-License: BSD-3-Clause
-
 Id:      com.mashape.unirest
 Project: Unirest for Java
 URL:     https://github.com/Mashape/unirest-java

diff --git a/licenses/com.jgoodies_jgoodies-common.txt b/licenses/com.jgoodies_jgoodies-common.txt
diff --git a/licenses/com.jgoodies_jgoodies-forms.txt b/licenses/com.jgoodies_jgoodies-forms.txt
diff --git a/licenses/com.jgoodies_jgoodies-looks.txt b/licenses/com.jgoodies_jgoodies-looks.txt