Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into ooCloseCon
Browse files Browse the repository at this point in the history
* upstream/main:
  Bump slf4j-tinylog from 2.4.1 to 2.5.0 (#9085)
  Bump bcprov-jdk18on from 1.71 to 1.71.1 (#9079)
  Bump tinylog-impl from 2.4.1 to 2.5.0 (#9086)
  Bump postgresql from 42.4.1 to 42.4.2 (#9081)
  Bump slf4j-api from 2.0.0-beta1 to 2.0.0 in /buildSrc (#9083)
  Bump unoloader from 7.3.5 to 7.4.0 (#9084)
  Bump slf4j-api from 2.0.0-beta1 to 2.0.0 (#9078)
  Bump tinylog-api from 2.4.1 to 2.5.0 (#9080)
  Bump libreoffice from 7.3.5 to 7.4.0 (#9082)
  Bump hmarr/auto-approve-action from 2.2.1 to 2.4.0 (#9077)
  • Loading branch information
Siedlerchr committed Aug 22, 2022
2 parents 78d9a71 + 8836cf4 commit 76e2016
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- name: Auto approve
uses: hmarr/auto-approve-action@v2.2.1
uses: hmarr/auto-approve-action@v2.4.0
if: steps.waitforstatuschecks.outputs.status == 'success'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
Expand Down
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ dependencies {
implementation group: 'org.apache.tika', name: 'tika-core', version: '2.4.1'

// required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
implementation 'org.bouncycastle:bcprov-jdk18on:1.71'
implementation 'org.bouncycastle:bcprov-jdk18on:1.71.1'

implementation 'commons-cli:commons-cli:1.5.0'

implementation 'org.libreoffice:libreoffice:7.3.5'
implementation 'org.libreoffice:unoloader:7.3.5'
implementation 'org.libreoffice:libreoffice:7.4.0'
implementation 'org.libreoffice:unoloader:7.4.0'

implementation 'io.github.java-diff-utils:java-diff-utils:4.12'
implementation 'info.debatty:java-string-similarity:2.0.0'
Expand All @@ -148,7 +148,7 @@ dependencies {

implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.6'

implementation 'org.postgresql:postgresql:42.4.1'
implementation 'org.postgresql:postgresql:42.4.2'

implementation ('com.oracle.ojdbc:ojdbc10:19.3.0.0') {
// causing module issues
Expand Down Expand Up @@ -177,10 +177,10 @@ dependencies {
implementation 'org.jsoup:jsoup:1.15.1'
implementation 'com.konghq:unirest-java:3.13.10'

implementation 'org.slf4j:slf4j-api:2.0.0-beta1'
implementation "org.tinylog:tinylog-api:2.4.1"
implementation "org.tinylog:slf4j-tinylog:2.4.1"
implementation "org.tinylog:tinylog-impl:2.4.1"
implementation 'org.slf4j:slf4j-api:2.0.0'
implementation "org.tinylog:tinylog-api:2.5.0"
implementation "org.tinylog:slf4j-tinylog:2.5.0"
implementation "org.tinylog:tinylog-impl:2.5.0"

implementation 'de.undercouch:citeproc-java:3.0.0-alpha.6'

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {
dependencies {
implementation 'com.h2database:h2-mvstore:2.1.214'
implementation 'org.apache.commons:commons-csv:1.9.0'
implementation 'org.slf4j:slf4j-api:2.0.0-beta1'
implementation 'org.slf4j:slf4j-api:2.0.0'
}

sourceSets{
Expand Down

0 comments on commit 76e2016

Please sign in to comment.