Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Siedlerchr committed Mar 6, 2020
2 parents 439172b + fdd8797 commit 9817b8b
Show file tree
Hide file tree
Showing 11 changed files with 518 additions and 315 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ jobs:
include:
- os: ubuntu-latest
displayName: linux
jpackageDownload: https://download.java.net/java/GA/jdk14/076bab302c7b4508975440c56f6cc26a/36/GPL/openjdk-14_linux-x64_bin.tar.gz
jpackageDownload: https://download.java.net/java/early_access/jdk14/34/GPL/openjdk-14-ea+34_linux-x64_bin.tar.gz
jdk14Path: /jdk-14
archivePortable: tar -c -C build/distribution JabRef | pigz --rsyncable > build/distribution/JabRef-portable_linux.tar.gz && rm -R build/distribution/JabRef
- os: windows-latest
displayName: windows
jpackageDownload: https://download.java.net/java/GA/jdk14/076bab302c7b4508975440c56f6cc26a/36/GPL/openjdk-14_windows-x64_bin.zip
jpackageDownload: https://download.java.net/java/early_access/jdk14/34/GPL/openjdk-14-ea+34_windows-x64_bin.zip
jdk14Path: /jdk-14
archivePortable: 7z a -r build/distribution/JabRef-portable_windows.zip ./build/distribution/JabRef && rm -R build/distribution/JabRef
- os: macOS-latest
displayName: macOS
jpackageDownload: https://download.java.net/java/GA/jdk14/076bab302c7b4508975440c56f6cc26a/36/GPL/openjdk-14_osx-x64_bin.tar.gz
jpackageDownload: https://download.java.net/java/early_access/jdk14/34/GPL/openjdk-14-ea+34_osx-x64_bin.tar.gz
jdk14Path: /jdk-14.jdk/Contents/Home
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

Expand Down Expand Up @@ -103,8 +103,12 @@ jobs:
export BADASS_JLINK_JPACKAGE_HOME="${GITHUB_WORKSPACE}${{ matrix.jdk14Path }}"
./gradlew -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage
shell: bash
- name: Package application image
run: ${{ matrix.archivePortable }}
shell: bash
- name: Rename files
run: |
get-childitem -Path build/distribution/*
get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"}
get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "portable","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-portable"}
shell: pwsh
Expand Down Expand Up @@ -156,4 +160,3 @@ jobs:
ssh_options: '-p 9922'
src: 'build/distribution/'
dest: [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ status.md
# Install4J
install4j6/

# JDK14 (see .github/deployment.yml for details)
jdk-14/

# Python
__pycache__/

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Here, the categories "Changed" for added and changed functionality,

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

## [5.0] – 2020-03-03
## [5.0] – 2020-03-06

### Changed

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
JabRef is an open-source, cross-platform citation and reference management tool.

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

## Features

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

### Cite

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

We are thankful for any bug reports or other feedback.
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)!
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).
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).
You can use our [GitHub issue tracker](https://github.com/JabRef/jabref/issues) to file bug reports.

An explanation of donation possibilities and usage of donations is available at our [donations page](https://donations.jabref.org).
Expand Down
2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ coverage:
project:
default:
threshold: 0.005
comment: off
comment: false
68 changes: 61 additions & 7 deletions external-libraries.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ Project: j2objc-annotations
URL: https://github.com/google/j2objc
License: Apache-2.0

Id: com.ibm.icu:icu4j
Project: International Components for Unicode for Java (ICU4J)
URL: https://wiki.eclipse.org/ICU4J

Id: com.jfoenix:jfoenix
Project: JavaFX MAterial Design Library
URL: https://github.com/jfoenixadmin/JFoenix
License: Apache-2.0

Id: com.konghq.unirest
Project: Unirest for Java
URL: https://github.com/Kong/unirest-java
Expand All @@ -85,18 +94,38 @@ Project: Oracle's JDBC drivers
URL: https://repo1.maven.org/maven2/com/oracle/ojdbc/ojdbc10/19.3.0.0/ojdbc10-19.3.0.0.pom
License: Oracle Free Use Terms and Conditions (FUTC)

Id: com.sun.istack:istack-commons-runtime
Project: iStack Common Utility Code
URL: https://github.com/eclipse-ee4j/jaxb-istack-commons
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)

Id: com.sun.xml.fastinfoset:FastInfoset
Project: Fast Infoset
URL: https://github.com/eclipse-ee4j/jaxb-fi
License: Apache-2.0

Id: commons-cli:commons-cli
Project: Apache Commons CLI
URL: http://commons.apache.org/cli/
License: Apache-2.0

Id: commons-codec:commons-codec
Project: Apache Commons Codec
URL: https://commons.apache.org/proper/commons-codec/
License: Apache-2.0

Id: commons-logging:commons-logging
Project: Apache Commons Logging
URL: http://commons.apache.org/logging/
License: Apache-2.0

Id: de.jensd:fontawesomefx-commons
Project: FontAwesomeFX Commons
URL: https://bitbucket.org/Jerady/fontawesomefx
License: Apache-2.0

Id: de.jensd:fontawesomefx-materialdesignfont
Project: FontAwesomeFX
Project: FontAwesomeFX Material Design Font
URL: https://bitbucket.org/Jerady/fontawesomefx
License: Apache-2.0

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

Id: eu.lestard:doc-annotations
Project: doc annotations
URL: https://github.com/lestard/doc-annotations
License: MIT

Id: info.debatty:java-string-similarity
Project: Java String Similarity
URL: https://github.com/tdebatty/java-string-similarity
Expand All @@ -125,22 +159,37 @@ Project: java-diff-utils
URL: https://github.com/java-diff-utils/java-diff-utils
License: Apache-2.0

Id: jakarta.activation:jakarata.activation-api
Project: Jakarta Activation
URL: https://eclipse-ee4j.github.io/jaf/
License: BSD-3-Clause

Id: jakarta.annotation:jakarata.annotation-api
Project: Jakarta Annotations
URL: https://projects.eclipse.org/projects/ee4j.ca
License: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0

Id: net.java.dev.glazedlists:glazedlists_java15
Project: Glazed Lists
URL: http://www.glazedlists.com/
License: LGPL-2.1 (not explicitly, but no comments in the source header) and MPL-2.0
Id: jakarta.xml.bind:jakarta.xml.bind-api
Project: Jakarta XML Binding project
URL: https://github.com/eclipse-ee4j/jaxb-api
License: BSD-3-Clause; sometimes EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0

Id: net.jcip:jcip-annotations
Project: JCIP (Java Concurrency in Practice) Annotations under Apache License
URL: http://stephenc.github.io/jcip-annotations/
License: Apache-2.0

Id: net.jodah:typetools
Project: TypeTools
URL: https://github.com/jhalterman/typetools
License: Apache-2.0

Id: org.antlr:antlr
Id: org.antlr:antlr-runtime
Project: ANTLR 3
URL: http://www.antlr3.org/
License: BSD-3-Clause

Id: org.antlr:antlr4
Id: org.antlr:antlr4-runtime
Project: ANTLR 4
URL: http://www.antlr.org/
License: BSD-3-Clause
Expand All @@ -155,6 +204,11 @@ Project: Apache Commons Lang
URL: https://commons.apache.org/proper/commons-lang/
License: Apache-2.0

Id: org.apache.commons:commons-text
Project: Apache Commons Text
URL: https://commons.apache.org/proper/commons-text/
License: Apache-2.0

Id: org.apache.logging.log4j
Project: Apache Log2j 2
URL: http://logging.apache.org/log4j/2.x/
Expand Down
Loading

0 comments on commit 9817b8b

Please sign in to comment.