Skip to content

Commit 89b0968

Browse files
committed
Merge remote-tracking branch 'upstream/main' into improve-reversibility-rebased-03
2 parents 6297879 + 44a229b commit 89b0968

File tree

137 files changed

+10300
-2315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+10300
-2315
lines changed

.github/workflows/stale.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/stale@v3
12+
- uses: actions/stale@v4
1313
with:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
days-before-stale: 180

CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,19 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
1111

1212
### Added
1313

14+
- We added the option to copy the DOI of an entry directly from the context menu copy submenu. [#7826](https://github.com/JabRef/jabref/issues/7826)
15+
- We added a fulltext search feature. [#2838](https://github.com/JabRef/jabref/pull/2838)
16+
1417
### Changed
1518

19+
- We slightly changed the layout of the Journal tab in the preferences for ui consistency. [#7937](https://github.com/JabRef/jabref/pull/7937)
20+
- The JabRefHost on Windows now writes a temporary file and calls `-importToOpen` instead of passing the bibtex via `-importBibtex`. [#7374](https://github.com/JabRef/jabref/issues/7374), [JabRef Browser Ext #274](https://github.com/JabRef/JabRef-Browser-Extension/issues/274)
21+
1622
### Fixed
1723

1824
- We fixed an issue when checking for a new version when JabRef is used behind a corporate proxy. [#7884](https://github.com/JabRef/jabref/issues/7884)
25+
- We fixed an issue where it was impossible to add or modify groups. [#7912](https://github.com/JabRef/jabref/pull/793://github.com/JabRef/jabref/pull/7921)
26+
- We fixed an issue where exported entries from a Citavi bib containing URLs could not be imported [#7892](https://github.com/JabRef/jabref/issues/7882)
1927

2028
### Removed
2129

GitVersion.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ branches:
66
main:
77
regex: ^main
88
tag: ''
9-
pre-release-weight: 0 # 0 after stable release, 15000 before alpha release, 30000 before beta release, 50000 before stable release
9+
pre-release-weight: 0 # 0 after stable release, 15000 before alpha release, 30000 before beta release, 50000 before stable release

build.gradle

+11-14
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020

2121
id 'org.openjfx.javafxplugin' version '0.0.10'
2222

23-
id 'org.beryx.jlink' version '2.24.0'
23+
id 'org.beryx.jlink' version '2.24.1'
2424

2525
// nicer test outputs during running and completion
2626
// Homepage: https://github.com/radarsh/gradle-test-logger-plugin
@@ -129,15 +129,15 @@ dependencies {
129129
implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.8'
130130
implementation 'com.h2database:h2-mvstore:1.4.200'
131131

132-
implementation group: 'org.apache.tika', name: 'tika-core', version: '1.27'
132+
implementation group: 'org.apache.tika', name: 'tika-core', version: '2.0.0'
133133

134134
// required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
135135
implementation 'org.bouncycastle:bcprov-jdk15on:1.69'
136136

137137
implementation 'commons-cli:commons-cli:1.4'
138138

139-
implementation 'org.libreoffice:libreoffice:7.1.4'
140-
implementation 'org.libreoffice:unoloader:7.1.4'
139+
implementation 'org.libreoffice:libreoffice:7.1.5'
140+
implementation 'org.libreoffice:unoloader:7.1.5'
141141

142142
implementation 'io.github.java-diff-utils:java-diff-utils:4.10'
143143
implementation 'info.debatty:java-string-similarity:2.0.0'
@@ -148,10 +148,6 @@ dependencies {
148148
antlr4 'org.antlr:antlr4:4.9.2'
149149
implementation 'org.antlr:antlr4-runtime:4.9.2'
150150

151-
implementation (group: 'org.apache.lucene', name: 'lucene-queryparser', version: '8.9.0') {
152-
exclude group: 'org.apache.lucene', module: 'lucene-sandbox'
153-
}
154-
155151
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.12.0.202106070339-r'
156152

157153
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.12.4'
@@ -186,7 +182,7 @@ dependencies {
186182
implementation 'org.controlsfx:controlsfx:11.1.0'
187183

188184
implementation 'org.jsoup:jsoup:1.14.1'
189-
implementation 'com.konghq:unirest-java:3.11.11'
185+
implementation 'com.konghq:unirest-java:3.11.12'
190186

191187
implementation 'org.slf4j:slf4j-api:2.0.0-alpha2'
192188
implementation group: 'org.apache.logging.log4j', name: 'log4j-jcl', version: '3.0.0-SNAPSHOT'
@@ -196,7 +192,7 @@ dependencies {
196192
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
197193
annotationProcessor group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
198194

199-
implementation 'de.undercouch:citeproc-java:3.0.0-alpha.1'
195+
implementation 'de.undercouch:citeproc-java:3.0.0-alpha.2'
200196

201197
implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: '1.2.1'
202198
implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '2.3.2'
@@ -215,19 +211,21 @@ dependencies {
215211
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.62.2'
216212
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.62.2'
217213

214+
implementation group: 'net.harawata', name: 'appdirs', version: '1.2.1'
215+
218216
testImplementation 'io.github.classgraph:classgraph:4.8.110'
219217
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2'
220218
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.2'
221219
testImplementation 'org.junit.platform:junit-platform-launcher:1.7.2'
222220

223-
testImplementation 'net.bytebuddy:byte-buddy-parent:1.11.6'
221+
testImplementation 'net.bytebuddy:byte-buddy-parent:1.11.8'
224222
testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
225223
testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT'
226224
testImplementation 'org.mockito:mockito-core:3.11.2'
227225
testImplementation 'org.xmlunit:xmlunit-core:2.8.2'
228226
testImplementation 'org.xmlunit:xmlunit-matchers:2.8.2'
229-
testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.20.0'
230-
testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.20.0'
227+
testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.20.1'
228+
testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.20.1'
231229
testImplementation "org.testfx:testfx-core:4.0.17-alpha-SNAPSHOT"
232230
testImplementation "org.testfx:testfx-junit5:4.0.17-alpha-SNAPSHOT"
233231
testImplementation "org.hamcrest:hamcrest-library:2.2"
@@ -655,7 +653,6 @@ jlink {
655653
provides 'org.mariadb.jdbc.credential.CredentialPlugin' with 'org.mariadb.jdbc.credential.aws.AwsIamCredentialPlugin',
656654
'org.mariadb.jdbc.credential.env.EnvCredentialPlugin',
657655
'org.mariadb.jdbc.credential.system.PropertiesCredentialPlugin'
658-
provides 'org.apache.commons.logging.LogFactory' with 'org.apache.logging.log4j.jcl.LogFactoryImpl'
659656
provides 'org.slf4j.spi.SLF4JServiceProvider' with 'org.apache.logging.slf4j.SLF4JServiceProvider'
660657
provides 'org.apache.logging.log4j.spi.Provider' with 'org.apache.logging.log4j.core.impl.Log4jProvider'
661658
provides 'java.security.Provider' with 'org.bouncycastle.jce.provider.BouncyCastleProvider',

buildres/csl/csl-styles/Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ GIT
2020
GEM
2121
remote: https://rubygems.org/
2222
specs:
23-
addressable (2.7.0)
23+
addressable (2.8.0)
2424
public_suffix (>= 2.0.2, < 5.0)
2525
citeproc (1.0.10)
2626
namae (~> 1.0)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,223 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
3+
<info>
4+
<title>American Society for Horticultural Science</title>
5+
<title-short>ASHS</title-short>
6+
<id>http://www.zotero.org/styles/american-society-for-horticultural-science</id>
7+
<link href="http://www.zotero.org/styles/american-society-for-horticultural-science" rel="self"/>
8+
<link href="http://www.zotero.org/styles/revista-de-biologia-tropical" rel="template"/>
9+
<link href="https://aggie-horticulture.tamu.edu/syllabi/423/ASHS%20Publ%20Manual%202002.pdf" rel="documentation"/>
10+
<author>
11+
<name>Patrick O'Brien</name>
12+
</author>
13+
<category citation-format="author-date"/>
14+
<category field="biology"/>
15+
<category field="botany"/>
16+
<updated>2021-07-27T13:34:10+00:00</updated>
17+
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
18+
</info>
19+
<macro name="edition">
20+
<choose>
21+
<if is-numeric="edition">
22+
<group delimiter=" ">
23+
<number variable="edition" form="ordinal"/>
24+
<label variable="edition" form="short"/>
25+
</group>
26+
</if>
27+
<else>
28+
<text variable="edition"/>
29+
</else>
30+
</choose>
31+
</macro>
32+
<macro name="container">
33+
<choose>
34+
<if type="chapter paper-conference" match="any">
35+
<text term="in" text-case="capitalize-first" font-style="italic" prefix=". " suffix=" "/>
36+
<names variable="editor translator" delimiter=", " suffix=". ">
37+
<name initialize-with="." delimiter=", " delimiter-precedes-last="never" and="symbol"/>
38+
<label form="short" prefix=" (" suffix=")"/>
39+
</names>
40+
<group delimiter=", ">
41+
<text variable="container-title" text-case="title"/>
42+
<text variable="collection-title" text-case="title"/>
43+
</group>
44+
</if>
45+
<else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
46+
<group prefix=", " delimiter=", ">
47+
<text variable="container-title"/>
48+
<text variable="collection-title"/>
49+
</group>
50+
</else-if>
51+
<else>
52+
<group prefix=". " delimiter=", ">
53+
<text variable="container-title" form="short"/>
54+
<text variable="collection-title"/>
55+
</group>
56+
</else>
57+
</choose>
58+
</macro>
59+
<macro name="author">
60+
<names variable="author">
61+
<name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="first"/>
62+
<label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
63+
<substitute>
64+
<names variable="editor"/>
65+
<names variable="translator"/>
66+
<text macro="title"/>
67+
</substitute>
68+
</names>
69+
</macro>
70+
<macro name="author-short">
71+
<names variable="author">
72+
<name form="short" and="symbol" delimiter=", " initialize-with=". "/>
73+
<et-al font-style="italic"/>
74+
<substitute>
75+
<names variable="editor"/>
76+
<names variable="translator"/>
77+
<choose>
78+
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
79+
<text variable="title" form="short" font-style="italic"/>
80+
</if>
81+
<else>
82+
<text variable="title" form="short" quotes="true"/>
83+
</else>
84+
</choose>
85+
</substitute>
86+
</names>
87+
</macro>
88+
<macro name="access">
89+
<choose>
90+
<if type="webpage">
91+
<group>
92+
<text value="URL" suffix=" "/>
93+
<text variable="URL"/>
94+
</group>
95+
</if>
96+
</choose>
97+
</macro>
98+
<macro name="title">
99+
<choose>
100+
<if type="chapter paper-conference" match="any">
101+
<group delimiter=", ">
102+
<text variable="title"/>
103+
<group>
104+
<label variable="page" form="short" suffix=" " plural="never"/>
105+
<text variable="page"/>
106+
</group>
107+
</group>
108+
</if>
109+
<else-if type="webpage">
110+
<text variable="title"/>
111+
<text value="WWW Document" prefix=" [" suffix="]"/>
112+
</else-if>
113+
<else>
114+
<text variable="title"/>
115+
</else>
116+
</choose>
117+
</macro>
118+
<macro name="publisher">
119+
<choose>
120+
<if type="report thesis" match="any">
121+
<group delimiter=", ">
122+
<text variable="publisher"/>
123+
<text variable="publisher-place"/>
124+
</group>
125+
</if>
126+
<else>
127+
<group delimiter=", ">
128+
<text variable="publisher"/>
129+
<text variable="publisher-place"/>
130+
</group>
131+
</else>
132+
</choose>
133+
</macro>
134+
<macro name="event">
135+
<choose>
136+
<if variable="event">
137+
<text term="presented at" text-case="capitalize-first" suffix=" "/>
138+
<text variable="event"/>
139+
</if>
140+
</choose>
141+
</macro>
142+
<macro name="issued">
143+
<choose>
144+
<if variable="issued">
145+
<date variable="issued">
146+
<date-part name="year"/>
147+
</date>
148+
</if>
149+
<else-if variable="accessed">
150+
<choose>
151+
<if type="webpage">
152+
<date variable="accessed">
153+
<date-part name="year"/>
154+
</date>
155+
</if>
156+
<else>
157+
<text term="no date" form="short"/>
158+
</else>
159+
</choose>
160+
</else-if>
161+
<else>
162+
<text term="no date" form="short"/>
163+
</else>
164+
</choose>
165+
</macro>
166+
<macro name="locators">
167+
<choose>
168+
<if type="article-journal article-magazine article-newspaper" match="any">
169+
<group delimiter=":" prefix=" ">
170+
<text variable="volume"/>
171+
<text variable="page"/>
172+
</group>
173+
</if>
174+
<else-if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
175+
<group delimiter=", " prefix=". ">
176+
<group>
177+
<text variable="genre"/>
178+
<text variable="number" prefix=" No. "/>
179+
</group>
180+
<text macro="edition"/>
181+
<text macro="event"/>
182+
<text macro="publisher"/>
183+
</group>
184+
</else-if>
185+
<else-if type="chapter paper-conference" match="any">
186+
<group delimiter=", " prefix=". ">
187+
<text macro="event"/>
188+
<text macro="publisher"/>
189+
</group>
190+
</else-if>
191+
</choose>
192+
</macro>
193+
<citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year">
194+
<sort>
195+
<key macro="issued"/>
196+
<key macro="author"/>
197+
</sort>
198+
<layout prefix="(" suffix=")" delimiter=", ">
199+
<group delimiter=" ">
200+
<text macro="author-short"/>
201+
<text macro="issued"/>
202+
</group>
203+
</layout>
204+
</citation>
205+
<bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
206+
<sort>
207+
<key macro="author"/>
208+
<key macro="issued" sort="ascending"/>
209+
</sort>
210+
<layout>
211+
<group suffix=".">
212+
<text macro="author"/>
213+
<text macro="issued" prefix=". " suffix=". "/>
214+
<group>
215+
<text macro="title"/>
216+
<text macro="container"/>
217+
</group>
218+
<text macro="locators"/>
219+
</group>
220+
<text macro="access" prefix=". "/>
221+
</layout>
222+
</bibliography>
223+
</style>

0 commit comments

Comments
 (0)