Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into jabrefonline
Browse files Browse the repository at this point in the history
* upstream/main:
  Refactoring existing unit tests into parametrized tests (#7700)
  Replace <p> in localization by \n (#7279)
  Bump byte-buddy-parent from 1.11.0 to 1.11.1 (#7800)
  Bump org.javamodularity.moduleplugin from 1.8.6 to 1.8.7 (#7799)
  Bump mockito-core from 3.10.0 to 3.11.0 (#7801)
  Bump classgraph from 4.8.106 to 4.8.108 (#7802)
  Update .markdownlint.yml
  Ignore slant.co links
  GitBook: [main] 3 pages and 17 assets modified
  GitBook: [main] one page modified
  GitBook: [main] one page modified
  GitBook: [main] 6 pages and 42 assets modified

# Conflicts:
#	build.gradle
  • Loading branch information
Siedlerchr committed Jun 8, 2021
2 parents 9e0ab5b + 2497ba4 commit be41827
Show file tree
Hide file tree
Showing 65 changed files with 721 additions and 542 deletions.
3 changes: 3 additions & 0 deletions .markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ MD031: false
MD033:
# we have <a> tags with ids and superscript
allowed_elements: ['a', 'kbd', 'sup']

# seems to be unsupported by gitbook anymore
MD045: false
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- The export to MS Office XML now uses the month name for the field `Month` instead of the two digit number [forum#2685](https://discourse.jabref.org/t/export-month-as-text-not-number/2685)
- We reintroduced missing default keybindings for new entries. [#7346](https://github.com/JabRef/jabref/issues/7346) [#7439](https://github.com/JabRef/jabref/issues/7439)
- Lists of available fields are now sorted alphabetically. [#7716](https://github.com/JabRef/jabref/issues/7716)
- The tooltip of the search field explaining the search is always shown. [#7279](https://github.com/JabRef/jabref/pull/7279)
- We rewrote the ACM fetcher to adapt to the new interface. [#5804](https://github.com/JabRef/jabref/issues/5804)
- We moved the select/collapse buttons in the unlinked files dialog into a context menu. [#7383](https://github.com/JabRef/jabref/issues/7383)

Expand Down
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ plugins {

id 'com.github.ben-manes.versions' version '0.39.0'

id 'org.javamodularity.moduleplugin' version '1.8.6'
id 'org.javamodularity.moduleplugin' version '1.8.7'

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

Expand Down Expand Up @@ -220,15 +220,17 @@ dependencies {
exclude module: "apollo-normalized-cache"
}

testImplementation 'io.github.classgraph:classgraph:4.8.106'


testImplementation 'io.github.classgraph:classgraph:4.8.108'
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.2'
testImplementation 'org.junit.platform:junit-platform-launcher:1.7.2'

testImplementation 'net.bytebuddy:byte-buddy-parent:1.11.0'
testImplementation 'net.bytebuddy:byte-buddy-parent:1.11.1'
testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT'
testImplementation 'org.mockito:mockito-core:3.10.0'
testImplementation 'org.mockito:mockito-core:3.11.0'
testImplementation 'org.xmlunit:xmlunit-core:2.8.2'
testImplementation 'org.xmlunit:xmlunit-matchers:2.8.2'
testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.19.0'
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit be41827

Please sign in to comment.