Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* upstream/master:
  Update JDK14 from EA 30 to EA 34 (#5910)
  ide-setup updated (#5915)
  Added update method to typePropertyListeners (#5917)
  Bump mariadb-java-client from 2.5.3 to 2.5.4 (#5914)
  Bump org.beryx.jlink from 2.17.0 to 2.17.1 (#5913)
  • Loading branch information
Siedlerchr committed Feb 5, 2020
2 parents 6dcc424 + 7a9f296 commit 522d8c9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ jobs:
include:
- os: ubuntu-latest
displayName: linux
jpackageDownload: https://download.java.net/java/early_access/jdk14/30/GPL/openjdk-14-ea+30_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/early_access/jdk14/30/GPL/openjdk-14-ea+30_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/early_access/jdk14/30/GPL/openjdk-14-ea+30_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
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
id 'com.github.ben-manes.versions' version '0.27.0'
id 'org.javamodularity.moduleplugin' version '1.5.0'
id 'org.openjfx.javafxplugin' version '0.0.8'
id 'org.beryx.jlink' version '2.17.0'
id 'org.beryx.jlink' version '2.17.1'

// nicer test outputs during running and completion
id 'com.adarshr.test-logger' version '2.0.0'
Expand Down Expand Up @@ -140,7 +140,7 @@ dependencies {
antlr4 'org.antlr:antlr4:4.8-1'
compile 'org.antlr:antlr4-runtime:4.8-1'

compile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.5.3'
compile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.5.4'

compile 'org.postgresql:postgresql:42.2.9'

Expand Down
14 changes: 7 additions & 7 deletions docs/guidelines-for-setting-up-a-local-workspace.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community]
--add-exports=org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref
```

5. Use IntellJ to build and run (instead of gradle):
5. Use IntelliJ to build and run (instead of gradle):
* File -> Settings -> Build, Execution, Deployment -> Build Tools -> Gradle:
* Set "Build and run using" and "Run tests using" both to "IntelliJ IDEA"
6. Ensure that the JDK13 is enabled for Gradle: Use IntellJ to build and run (instead of gradle):
6. Ensure that the JDK13 is enabled for Gradle: Use IntelliJ to build and run (instead of gradle):
* File -> Settings -> Build, Execution, Deployment -> Build Tools -> Gradle -> Gradle:
* Set "Gradle JVM" to "JDK13"
7. Use the provided code style:
Expand Down Expand Up @@ -146,17 +146,17 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community]
5. Now you can also select "jabref [run]" and either run or debug the application from within IntelliJ.
* Equivalently, this can also be executed from the terminal by running `./gradlew run`.


### Setup for Eclipse

1. Run `./gradlew run` to generate all resources and to check if jabref runs.
1. Run `./gradlew run` to generate all resources and to check if JabRef runs.
* The JabRef GUI should finally appear.
* This step is only required once.
2. Run `./gradlew eclipse`
* **This must always be executed, when there are new upstream changes.**
3. Copy the file `Log4jPlugins.java` from `build\generated\sources\annotationProcessor\java\main\org\jabref\gui\logging\plugins` to `src/main/java/org/jabref/gui/logging/plugins/`
3. Copy the file `Log4jPlugins.java` from `build/generated/sources/annotationProcessor/java/main/org/jabref/gui/logging/plugins` to `src/main/java/org/jabref/gui/logging/plugins/`
* Usually, the folder `plugins` must be created for that.
4. Open or import the existing project in Eclipse as Java project. Import as gradle project will not work correctly.
4. Open or import the existing project in Eclipse as Java project.
* Remark: Importing it as gradle project will not work correctly.
5. Create a run/debug configuration for the main class `org.jabref.JabRefLauncher` and/or for `org.jabref.JabRefMain` (both can be used equivalently)
* In the tab "Arguments" of the run/debug configuration, enter the same runtime VM arguments as above for intelliJ:
* Set "VM Arguments" to:
Expand Down Expand Up @@ -189,7 +189,7 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community]
--add-opens javafx.base/com.sun.javafx.event=com.jfoenix
```

6. Optional: Install the [e(fx)clipse plugin](http://www.eclipse.org/efxclipse/index.html) from the eclipse marketplace:
6. Optional: Install the [e(fx)clipse plugin](http://www.eclipse.org/efxclipse/index.html) from the Eclipse marketplace:
1. Help -> Eclipse Marketplace... -> Search tab
2. Enter "e(fx)clipse" in the search dialogue
3. Click "Go"
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/jabref/gui/entryeditor/SourceTab.java
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ protected void bindToEntry(BibEntry entry) {

updateCodeArea();

entry.typeProperty().addListener(listener -> updateCodeArea());
entry.getFieldsObservable().addListener((InvalidationListener) listener -> updateCodeArea());
}

Expand Down

0 comments on commit 522d8c9

Please sign in to comment.