Skip to content

Commit

Permalink
Merge pull request #3421 from JabRef/jdk9
Browse files Browse the repository at this point in the history
Port JabRef to Java 11
  • Loading branch information
koppor committed Aug 25, 2019
2 parents 8e64e5a + 4b9cd1a commit f85c081
Show file tree
Hide file tree
Showing 100 changed files with 1,531 additions and 1,989 deletions.
56 changes: 26 additions & 30 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,39 @@
version: 2

jobs:
downloadinstall4j:
prepareinstall4j:
docker:
- image: circleci/openjdk:8-jdk
- image: circleci/openjdk:11.0.3-jdk-stretch
steps:
- checkout
- run: git submodule sync
- run: git submodule update --init
- restore_cache:
keys:
- install4j-{{ checksum "scripts/extract-install4j.sh" }}
- run: scripts/download-install4j-and-jres.sh
- install4j-{{ checksum "scripts/prepare-install4j.sh" }}
- run: scripts/prepare-install4j.sh
- save_cache:
key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
key: install4j-{{ checksum "scripts/prepare-install4j.sh" }}
paths:
- "~/downloads"
- "~/.install4j7"
- "~/.install4j8"
filters:
tags:
only: /.*/

buildDev:
docker:
- image: circleci/openjdk:8-jdk
- image: circleci/openjdk:11.0.4-jdk-stretch
steps:
- restore_cache:
key: dependency-cache
- checkout
- restore_cache:
key: install4j-{{ checksum "scripts/prepare-install4j.sh" }}
- run: scripts/prepare-install4j.sh
- run: install4j8/bin/install4jc --verbose --license=$INSTALL4J8_KEY
- restore_cache:
key: gradle
- run: git submodule sync
- run: git submodule update --init
- restore_cache:
key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
- run: scripts/extract-install4j.sh
- run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
- run: ./gradlew -Pdev=true -Pinstall4jDir="install4j7" release --stacktrace
- run: ./gradlew -Pdev=true -Pinstall4jDir="install4j8" release --stacktrace
- save_cache:
key: dependency-cache
key: gradle
paths:
- "~/.gradle"
- store_artifacts:
Expand All @@ -46,18 +43,18 @@ jobs:

buildRelease:
docker:
- image: circleci/openjdk:8-jdk
- image: circleci/openjdk:11.0.4-jdk-stretch
steps:
- restore_cache:
key: dependency-cache
- checkout
- restore_cache:
key: install4j-{{ checksum "scripts/prepare-install4j.sh" }}
- run: scripts/prepare-install4j.sh
- run: install4j8/bin/install4jc --verbose --license=$INSTALL4J8_KEY
- restore_cache:
key: gradle
- run: git submodule sync
- run: git submodule update --init
- restore_cache:
key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
- run: scripts/extract-install4j.sh
- run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
- run: ./gradlew -Pinstall4jDir="install4j7" release --stacktrace
- run: ./gradlew -Pinstall4jDir="install4j8" release --stacktrace
- store_artifacts:
path: build/releases
destination: release
Expand All @@ -70,16 +67,15 @@ workflows:
version: 2
build:
jobs:
- downloadinstall4j
- prepareinstall4j
- buildDev:
requires:
- downloadinstall4j
- prepareinstall4j
- buildRelease:
requires:
- downloadinstall4j
- prepareinstall4j
filters:
branches:
ignore: /.*/
tags:
only: /.*/

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -347,3 +347,7 @@ lib/ojdbc.jar

# do not ignore the source of the build
!/buildSrc/src/
!/buildSrc/src/main/groovy/org/jabref/build

# do not ignore JabRef icons (they are ignored by the macos setting above)
!gui/icon/**/*
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
language: java
jdk:
- oraclejdk11
- openjdk11

# we test at Ubuntu Trusty (Ubuntu 14.04 LTS)
# see https://docs.travis-ci.com/user/trusty-ci-environment/
Expand All @@ -17,7 +20,7 @@ env:
global:
- GRADLE_OPTS=-Dorg.gradle.daemon=false
matrix:
- TEST_SUITE=check OPTIONS=modernizer
- TEST_SUITE=check
- TEST_SUITE=checkstyle
- TEST_SUITE=fetcherTest
- TEST_SUITE=databaseTest
Expand All @@ -29,6 +32,7 @@ matrix:
fast_finish: true
allow_failures:
- env: TEST_SUITE=fetcherTest
- env: TEST_SUITE=guiTest
- env: TEST_SUITE=codecov
- env: DEPENDENCY_UPDATES=check

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ JabRef supports you in every step of your research work.
Fresh development builds are available at [builds.jabref.org](https://builds.jabref.org/master/).
The [latest stable release is available at FossHub](https://www.fosshub.com/JabRef.html).

JabRef runs on any system equipped with the Java Virtual Machine (1.8), which can be downloaded at no cost from [Oracle](http://www.oracle.com/technetwork/java/javase/downloads/index.html). Note that Java 9 is currently not supported.
JabRef runs on any system equipped with the Java Virtual Machine (Java 11 or higher), which can be downloaded at no cost from [AdoptOpenDJK](https://adoptopenjdk.net/).
From JabRef 4.0 onwards, [JavaFX] support has to be installed.
- Windows: JabRef offers an installer, which also adds a shortcut to JabRef to your start menu. Please also see our [Windows FAQ](https://help.jabref.org/en/FAQwindows)
- Linux: Please see our [Installation Guide](http://help.jabref.org/en/Installation).
Expand Down
Loading

0 comments on commit f85c081

Please sign in to comment.