Skip to content

Update to libre office 7.0.3 #7150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2020
Merged

Update to libre office 7.0.3 #7150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ repositories {
}

configurations {
libreoffice
antlr3
antlr4
// TODO: Remove the following workaround for split error messages such as
Expand Down Expand Up @@ -117,14 +116,8 @@ dependencies {

implementation 'commons-cli:commons-cli:1.4'

// For Java 9+ compatibility, we include a bundled version of the libreoffice libraries
// See https://bugs.documentfoundation.org/show_bug.cgi?id=117331#c8 for background information
// Use the task bundleLibreOffice to update the bundled jar
// DO NOT CHANGE THE libreoffice PREFIX
libreoffice 'org.libreoffice:juh:6.4.3'
libreoffice 'org.libreoffice:jurt:6.4.3'
libreoffice 'org.libreoffice:ridl:6.4.3'
libreoffice 'org.libreoffice:unoil:6.4.3'
implementation 'org.libreoffice:libreoffice:7.0.3'
implementation 'org.libreoffice:unoloader:7.0.3'

implementation 'io.github.java-diff-utils:java-diff-utils:4.9'
implementation 'info.debatty:java-string-similarity:2.0.0'
Expand Down Expand Up @@ -767,13 +760,4 @@ task downloadDependencies {
}
}

task bundleLibreOffice(type: Jar) {
from configurations.libreoffice.collect { zipTree it }

manifest {
attributes 'Automatic-Module-Name': 'org.jabref.thirdparty.libreoffice'
}

destinationDir = file('lib')
archiveName = 'libreoffice.jar'
}
Binary file removed lib/libreoffice.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
requires applicationinsights.core;

// Libre Office
requires org.jabref.thirdparty.libreoffice;
requires org.libreoffice.uno;

// Other modules
requires commons.logging;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/openoffice/OOBibBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,7 @@ public BibDatabase generateDatabase(List<BibDatabase> databases)
throws NoSuchElementException, WrappedTargetException {
BibDatabase resultDatabase = new BibDatabase();
List<String> cited = findCitedKeys();
List<BibEntry> entriesToInsert = new ArrayList<BibEntry>();
List<BibEntry> entriesToInsert = new ArrayList<>();

// For each cited key
for (String key : cited) {
Expand Down