Skip to content

Commit 9817b8b

Browse files
committed
Merge remote-tracking branch 'upstream/master'
* upstream/master: Squashed 'src/main/resources/csl-styles/' changes from 265a3a9..6d7ca0a Trigger build Fix release date Explicitly list more external libraries Ignore extracted JDK 14 Revert "Update JDK14 from 34 to Build 36 (2020/2/6) - Release Candidate" Disable codecov comments Updated screenshot and added hint on the FAQ (#6058) Readd package portable Add debug output
2 parents 439172b + fdd8797 commit 9817b8b

11 files changed

+518
-315
lines changed

.github/workflows/deployment.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ jobs:
2424
include:
2525
- os: ubuntu-latest
2626
displayName: linux
27-
jpackageDownload: https://download.java.net/java/GA/jdk14/076bab302c7b4508975440c56f6cc26a/36/GPL/openjdk-14_linux-x64_bin.tar.gz
27+
jpackageDownload: https://download.java.net/java/early_access/jdk14/34/GPL/openjdk-14-ea+34_linux-x64_bin.tar.gz
2828
jdk14Path: /jdk-14
2929
archivePortable: tar -c -C build/distribution JabRef | pigz --rsyncable > build/distribution/JabRef-portable_linux.tar.gz && rm -R build/distribution/JabRef
3030
- os: windows-latest
3131
displayName: windows
32-
jpackageDownload: https://download.java.net/java/GA/jdk14/076bab302c7b4508975440c56f6cc26a/36/GPL/openjdk-14_windows-x64_bin.zip
32+
jpackageDownload: https://download.java.net/java/early_access/jdk14/34/GPL/openjdk-14-ea+34_windows-x64_bin.zip
3333
jdk14Path: /jdk-14
3434
archivePortable: 7z a -r build/distribution/JabRef-portable_windows.zip ./build/distribution/JabRef && rm -R build/distribution/JabRef
3535
- os: macOS-latest
3636
displayName: macOS
37-
jpackageDownload: https://download.java.net/java/GA/jdk14/076bab302c7b4508975440c56f6cc26a/36/GPL/openjdk-14_osx-x64_bin.tar.gz
37+
jpackageDownload: https://download.java.net/java/early_access/jdk14/34/GPL/openjdk-14-ea+34_osx-x64_bin.tar.gz
3838
jdk14Path: /jdk-14.jdk/Contents/Home
3939
archivePortable: brew install pigz && tar -c -C build/distribution JabRef.app | pigz --rsyncable > build/distribution/JabRef-portable_macos.tar.gz && rm -R build/distribution/JabRef.app
4040

@@ -103,8 +103,12 @@ jobs:
103103
export BADASS_JLINK_JPACKAGE_HOME="${GITHUB_WORKSPACE}${{ matrix.jdk14Path }}"
104104
./gradlew -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage
105105
shell: bash
106+
- name: Package application image
107+
run: ${{ matrix.archivePortable }}
108+
shell: bash
106109
- name: Rename files
107110
run: |
111+
get-childitem -Path build/distribution/*
108112
get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"}
109113
get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "portable","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-portable"}
110114
shell: pwsh
@@ -156,4 +160,3 @@ jobs:
156160
ssh_options: '-p 9922'
157161
src: 'build/distribution/'
158162
dest: jrrsync@build-upload.jabref.org:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/
159-

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ status.md
1111
# Install4J
1212
install4j6/
1313

14+
# JDK14 (see .github/deployment.yml for details)
15+
jdk-14/
16+
1417
# Python
1518
__pycache__/
1619

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Here, the categories "Changed" for added and changed functionality,
99

1010
We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#NUM`.
1111

12-
## [5.0] – 2020-03-03
12+
## [5.0] – 2020-03-06
1313

1414
### Changed
1515

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
JabRef is an open-source, cross-platform citation and reference management tool.
1010

1111
Stay on top of your literature: JabRef helps you to collect and organize sources, find the paper you need and discover the latest research.
12-
![main table](https://www.jabref.org/img/JabRef-4-0-MainTable.png)
12+
![main table](https://www.jabref.org/img/jabref-5-0-maintable.png)
1313

1414
## Features
1515

@@ -35,7 +35,7 @@ JabRef supports you in every step of your research work.
3535
- Find and merge duplicates
3636
- Attach related documents: 20 different kinds of documents supported out of the box, completely customizable and extendable
3737
- Automatically rename and move associated documents according to customizable rules
38-
- Keep track of what you read: ranking, priority, printed, quality-assured
38+
- Keep track of what you read: ranking, priority, printed, quality-assured
3939

4040
### Cite
4141

@@ -65,7 +65,7 @@ The [latest stable release is available at FossHub](https://www.fosshub.com/JabR
6565

6666
We are thankful for any bug reports or other feedback.
6767
If you have ideas for new features you want to be included in JabRef, [tell us in our forum](http://discourse.jabref.org/c/features)!
68-
If you need support in using JabRef, please read [the documentation](https://docs.jabref.org/) first and have a look at our [community forum](https://discourse.jabref.org/c/help).
68+
If you need support in using JabRef, please read [the documentation](https://docs.jabref.org/) first, the [frequently asked questions (FAQ)](https://docs.jabref.org/faq) and also have a look at our [community forum](https://discourse.jabref.org/c/help).
6969
You can use our [GitHub issue tracker](https://github.com/JabRef/jabref/issues) to file bug reports.
7070

7171
An explanation of donation possibilities and usage of donations is available at our [donations page](https://donations.jabref.org).

codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ coverage:
66
project:
77
default:
88
threshold: 0.005
9-
comment: off
9+
comment: false

external-libraries.txt

+61-7
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,15 @@ Project: j2objc-annotations
6565
URL: https://github.com/google/j2objc
6666
License: Apache-2.0
6767

68+
Id: com.ibm.icu:icu4j
69+
Project: International Components for Unicode for Java (ICU4J)
70+
URL: https://wiki.eclipse.org/ICU4J
71+
72+
Id: com.jfoenix:jfoenix
73+
Project: JavaFX MAterial Design Library
74+
URL: https://github.com/jfoenixadmin/JFoenix
75+
License: Apache-2.0
76+
6877
Id: com.konghq.unirest
6978
Project: Unirest for Java
7079
URL: https://github.com/Kong/unirest-java
@@ -85,18 +94,38 @@ Project: Oracle's JDBC drivers
8594
URL: https://repo1.maven.org/maven2/com/oracle/ojdbc/ojdbc10/19.3.0.0/ojdbc10-19.3.0.0.pom
8695
License: Oracle Free Use Terms and Conditions (FUTC)
8796

97+
Id: com.sun.istack:istack-commons-runtime
98+
Project: iStack Common Utility Code
99+
URL: https://github.com/eclipse-ee4j/jaxb-istack-commons
100+
License: BSD-3-Clause (with copyright as described in Eclipse Distribution License - v 1.0 - see https://wiki.spdx.org/view/Legal_Team/License_List/Licenses_Under_Consideration for details)
101+
102+
Id: com.sun.xml.fastinfoset:FastInfoset
103+
Project: Fast Infoset
104+
URL: https://github.com/eclipse-ee4j/jaxb-fi
105+
License: Apache-2.0
106+
88107
Id: commons-cli:commons-cli
89108
Project: Apache Commons CLI
90109
URL: http://commons.apache.org/cli/
91110
License: Apache-2.0
92111

112+
Id: commons-codec:commons-codec
113+
Project: Apache Commons Codec
114+
URL: https://commons.apache.org/proper/commons-codec/
115+
License: Apache-2.0
116+
93117
Id: commons-logging:commons-logging
94118
Project: Apache Commons Logging
95119
URL: http://commons.apache.org/logging/
96120
License: Apache-2.0
97121

122+
Id: de.jensd:fontawesomefx-commons
123+
Project: FontAwesomeFX Commons
124+
URL: https://bitbucket.org/Jerady/fontawesomefx
125+
License: Apache-2.0
126+
98127
Id: de.jensd:fontawesomefx-materialdesignfont
99-
Project: FontAwesomeFX
128+
Project: FontAwesomeFX Material Design Font
100129
URL: https://bitbucket.org/Jerady/fontawesomefx
101130
License: Apache-2.0
102131

@@ -115,6 +144,11 @@ Project: Citeproc-Java
115144
URL: http://michel-kraemer.github.io/citeproc-java/
116145
Licence: Apache-2.0
117146

147+
Id: eu.lestard:doc-annotations
148+
Project: doc annotations
149+
URL: https://github.com/lestard/doc-annotations
150+
License: MIT
151+
118152
Id: info.debatty:java-string-similarity
119153
Project: Java String Similarity
120154
URL: https://github.com/tdebatty/java-string-similarity
@@ -125,22 +159,37 @@ Project: java-diff-utils
125159
URL: https://github.com/java-diff-utils/java-diff-utils
126160
License: Apache-2.0
127161

162+
Id: jakarta.activation:jakarata.activation-api
163+
Project: Jakarta Activation
164+
URL: https://eclipse-ee4j.github.io/jaf/
165+
License: BSD-3-Clause
166+
128167
Id: jakarta.annotation:jakarata.annotation-api
129168
Project: Jakarta Annotations
130169
URL: https://projects.eclipse.org/projects/ee4j.ca
131170
License: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
132171

133-
Id: net.java.dev.glazedlists:glazedlists_java15
134-
Project: Glazed Lists
135-
URL: http://www.glazedlists.com/
136-
License: LGPL-2.1 (not explicitly, but no comments in the source header) and MPL-2.0
172+
Id: jakarta.xml.bind:jakarta.xml.bind-api
173+
Project: Jakarta XML Binding project
174+
URL: https://github.com/eclipse-ee4j/jaxb-api
175+
License: BSD-3-Clause; sometimes EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
176+
177+
Id: net.jcip:jcip-annotations
178+
Project: JCIP (Java Concurrency in Practice) Annotations under Apache License
179+
URL: http://stephenc.github.io/jcip-annotations/
180+
License: Apache-2.0
181+
182+
Id: net.jodah:typetools
183+
Project: TypeTools
184+
URL: https://github.com/jhalterman/typetools
185+
License: Apache-2.0
137186

138-
Id: org.antlr:antlr
187+
Id: org.antlr:antlr-runtime
139188
Project: ANTLR 3
140189
URL: http://www.antlr3.org/
141190
License: BSD-3-Clause
142191

143-
Id: org.antlr:antlr4
192+
Id: org.antlr:antlr4-runtime
144193
Project: ANTLR 4
145194
URL: http://www.antlr.org/
146195
License: BSD-3-Clause
@@ -155,6 +204,11 @@ Project: Apache Commons Lang
155204
URL: https://commons.apache.org/proper/commons-lang/
156205
License: Apache-2.0
157206

207+
Id: org.apache.commons:commons-text
208+
Project: Apache Commons Text
209+
URL: https://commons.apache.org/proper/commons-text/
210+
License: Apache-2.0
211+
158212
Id: org.apache.logging.log4j
159213
Project: Apache Log2j 2
160214
URL: http://logging.apache.org/log4j/2.x/

0 commit comments

Comments
 (0)