Skip to content

Commit 94f4c1e

Browse files
authored
Upgrade citeproc to 3.x snapshot without graal (#7370)
1 parent 1be95fc commit 94f4c1e

File tree

5 files changed

+30
-46
lines changed

5 files changed

+30
-46
lines changed

build.gradle

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ dependencies {
171171
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
172172
annotationProcessor group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
173173

174-
implementation 'de.undercouch:citeproc-java:2.1.0-SNAPSHOT'
174+
implementation 'de.undercouch:citeproc-java:3.0.0-SNAPSHOT'
175175

176176
implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: '1.2.1'
177177
implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '2.3.2'
@@ -390,7 +390,6 @@ run {
390390
'org.controlsfx.controls/impl.org.controlsfx.skin' : 'org.jabref',
391391

392392
'javafx.controls/com.sun.javafx.scene.control.behavior' : 'com.jfoenix',
393-
'com.oracle.truffle.regex/com.oracle.truffle.regex' : 'org.graalvm.truffle',
394393

395394
// Not sure why we need to restate the controlfx exports
396395
// Taken from here: https://github.com/controlsfx/controlsfx/blob/9.0.0/build.gradle#L1
@@ -567,56 +566,51 @@ jlink {
567566
// The module descriptor automatically generated by the plugin for the merged module contained some invalid entries.
568567
// Execute ./gradlew suggestMergedModuleInfo and include the suggested directives here.
569568
mergedModule {
570-
requires 'java.xml'
571-
requires 'com.sun.xml.txw2'
572-
requires 'java.desktop'
573-
requires 'org.objectweb.asm'
574-
requires 'jdk.jfr'
575-
requires 'jdk.unsupported'
576-
requires 'com.google.gson'
577-
requires 'java.management'
578-
requires 'java.naming'
579-
requires 'java.security.sasl'
580-
requires 'jdk.security.jgss'
581-
requires 'java.logging'
582-
requires 'jdk.xml.dom'
583-
requires 'java.sql'
584-
requires 'java.rmi'
585-
requires 'java.security.jgss'
586-
requires 'com.oracle.truffle.regex'
587-
requires 'jdk.jsobject'
588-
requires 'jdk.management'
589-
requires 'jdk.unsupported.desktop'
590-
requires 'org.objectweb.asm.util'
591-
requires 'java.scripting'
592-
requires 'org.objectweb.asm.commons'
593-
requires 'org.graalvm.truffle'
594-
requires 'java.datatransfer'
595-
requires 'java.compiler'
596-
requires 'java.sql.rowset'
597-
requires 'java.transaction.xa'
598-
requires 'org.graalvm.sdk'
569+
requires 'java.compiler';
570+
requires 'java.datatransfer';
571+
requires 'java.desktop';
572+
requires 'java.logging';
573+
requires 'java.management';
574+
requires 'java.naming';
575+
requires 'java.net.http';
576+
requires 'java.scripting';
577+
requires 'java.security.jgss';
578+
requires 'java.security.sasl';
579+
requires 'java.sql';
580+
requires 'java.sql.rowset';
581+
requires 'java.transaction.xa';
582+
requires 'java.rmi';
583+
requires 'java.xml';
584+
requires 'jdk.jfr';
585+
requires 'jdk.jsobject';
586+
requires 'jdk.unsupported';
587+
requires 'jdk.unsupported.desktop';
588+
requires 'jdk.security.jgss';
589+
requires 'jdk.xml.dom';
590+
requires 'com.google.gson';
591+
requires 'com.sun.xml.fastinfoset';
592+
requires 'com.sun.xml.txw2';
599593
requires 'org.slf4j'
600594
uses 'org.apache.logging.log4j.util.PropertySource'
601595
uses 'org.apache.logging.log4j.core.util.WatchEventService'
602596
uses 'org.apache.logging.log4j.plugins.processor.PluginService'
603597
uses 'org.controlsfx.glyphfont.GlyphFont'
604598
uses 'com.airhacks.afterburner.views.ResourceLocator'
605-
uses 'com.oracle.truffle.js.runtime.Evaluator'
606599
uses 'org.apache.logging.log4j.message.ThreadDumpMessage.ThreadInfoFactory'
607600
uses 'com.airhacks.afterburner.injection.PresenterFactory'
608-
uses 'com.oracle.truffle.js.runtime.builtins.JSFunctionLookup'
609601
uses 'org.apache.logging.log4j.spi.Provider'
610602
uses 'org.mariadb.jdbc.credential.CredentialPlugin'
611603
uses 'org.mariadb.jdbc.tls.TlsSocketPlugin'
612604
uses 'org.mariadb.jdbc.LocalInfileInterceptor'
605+
uses 'org.eclipse.jgit.transport.SshSessionFactory';
606+
uses 'org.eclipse.jgit.lib.GpgSigner';
613607
uses 'javax.xml.bind.JAXBContextFactory'
608+
provides 'org.apache.lucene.codecs.DocValuesFormat' with 'org.apache.lucene.codecs.lucene80.Lucene80DocValuesFormat';
614609
provides 'javax.annotation.processing.Processor' with 'org.apache.logging.log4j.plugins.processor.PluginProcessor'
615610
provides 'org.controlsfx.glyphfont.GlyphFont' with 'org.controlsfx.glyphfont.FontAwesome'
616611
provides 'org.apache.logging.log4j.message.ThreadDumpMessage.ThreadInfoFactory' with 'org.apache.logging.log4j.core.message.ExtendedThreadInfoFactory'
617612
provides 'org.mariadb.jdbc.tls.TlsSocketPlugin' with 'org.mariadb.jdbc.internal.protocol.tls.DefaultTlsSocketPlugin'
618613
provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.ServerProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.netty.shaded.io.grpc.netty.NettyServerProvider'
619-
provides 'com.oracle.truffle.js.runtime.Evaluator' with 'com.oracle.truffle.js.parser.GraalJSEvaluator'
620614
provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.NameResolverProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.internal.DnsNameResolverProvider'
621615
provides 'org.apache.logging.log4j.util.PropertySource' with 'org.apache.logging.log4j.util.EnvironmentPropertySource',
622616
'org.apache.logging.log4j.util.SystemPropertiesPropertySource'
@@ -639,7 +633,6 @@ jlink {
639633
provides 'java.security.Provider' with 'org.bouncycastle.jce.provider.BouncyCastleProvider',
640634
'org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider'
641635
provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.ManagedChannelProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.netty.shaded.io.grpc.netty.NettyChannelProvider'
642-
provides 'com.oracle.truffle.js.runtime.builtins.JSFunctionLookup' with 'com.oracle.truffle.js.builtins.JSDefaultBuiltinLookup'
643636
}
644637

645638
jpackage {

eclipse.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ eclipse {
3434
def javafxfxml = entries.find { isJavafxFXML(it) };
3535
javafxfxml.entryAttributes['add-opens'] = 'javafx.fxml/javafx.fxml=org.jabref';
3636

37-
def graaltruffle = entries.find{ isTruffleGraal(it) } ;
38-
graaltruffle.entryAttributes['add-exports'] = 'com.oracle.truffle.regex/com.oracle.truffle.regex=org.graalvm.truffle';
39-
4037
entries.findAll { isLibrary(it) && isTestScope(it) }.each { //mark test source files
4138
it.entryAttributes['test'] = 'true'
4239
}
@@ -66,8 +63,6 @@ boolean isJavafxGraphics(entry) { return entry.properties.path.contains('javafx-
6663

6764
boolean isJavafxFXML(entry) { return entry.properties.path.contains('javafx-fxml'); }
6865

69-
boolean isTruffleGraal(entry) {return entry.properties.path.contains('org.graalvm.regex'); }
70-
7166
// add formatter and cleanup settings to Eclipse settings
7267
// see http://stackoverflow.com/a/27461890/873282
7368

src/main/java/module-info.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@
6161
requires jbibtex;
6262
requires citeproc.java;
6363
requires antlr.runtime;
64-
requires org.graalvm.truffle;
65-
requires org.graalvm.sdk;
66-
requires transitive org.graalvm.js;
67-
requires java.scripting;
68-
requires jdk.internal.vm.compiler;
6964
requires org.apache.xmpbox;
7065
requires de.saxsys.mvvmfx.validation;
7166
requires com.google.gson;

src/main/java/org/jabref/gui/maintable/MainTableDataModel.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public MainTableDataModel(BibDatabaseContext context, PreferencesService prefere
5454
// We need to wrap the list since otherwise sorting in the table does not work
5555
entriesSorted = new SortedList<>(entriesFiltered);
5656
groupViewMode = preferencesService.getGroupViewMode();
57+
5758
}
5859

5960
private boolean isMatched(ObservableList<GroupTreeNode> groups, Optional<SearchQuery> query, BibEntryTableViewModel entry) {

src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private void initialize(String newStyle, CitationStyleOutputFormat newFormat) th
6868
if ((cslInstance == null) || !Objects.equals(newStyle, style)) {
6969
// lang and forceLang are set to the default values of other CSL constructors
7070
cslInstance = new CSL(dataProvider, new JabRefLocaleProvider(),
71-
new DefaultAbbreviationProvider(), null, newStyle, "en-US", false, true);
71+
new DefaultAbbreviationProvider(), null, newStyle, "en-US");
7272
style = newStyle;
7373
}
7474

0 commit comments

Comments
 (0)