Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into lucenceUpgrade
Browse files Browse the repository at this point in the history
* upstream/main: (150 commits)
  fix unit test
  Add check for developer's documentation
  Merge GitBook view
  Fix zbMath fetcher (#8623)
  GitBook: [#56] No subject
  Add an extra dialog to ask the user whether they want to open the saved file folder when the export the entries (#8567)
  Bump checkstyle from 10.0 to 10.1 (#8620)
  Bump peter-evans/create-pull-request from 3 to 4 (#8619)
  Bump pascalgn/automerge-action from 0.14.3 to 0.15.2 (#8618)
  Bump flexmark from 0.62.2 to 0.64.0 (#8621)
  Bump classgraph from 4.8.141 to 4.8.143 (#8622)
  update test getPart (#8610)
  Add ControlHelper truncateString tests comments (#8612)
  Allow using custom SSL certificates (#8583)
  Fix protectedTerms not stored due to weaklistener (#8609)
  Fix changelog and version parsing (#8578)
  Creating more unit tests for NumericFieldComparatorTest (#8604)
  Fix merge entries dialog exceeding screen size (#8599)
  StringUtilTest new test for method GetPart (#8594)
  Use unkown entry type
  ...

# Conflicts:
#	build.gradle
#	src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java
  • Loading branch information
Siedlerchr committed Mar 30, 2022
2 parents 33a826b + 2bf53cb commit 81f08ef
Show file tree
Hide file tree
Showing 662 changed files with 42,695 additions and 9,432 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
github: JabRef
patreon: # Patreon user account
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body:
attributes:
label: JabRef version
options:
- "5.4 (latest release)"
- "5.5 (latest release)"
- "3.8.2"
- Latest development branch build (please note build date below)
- Other (please describe below)
Expand Down
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ The title of the PR must not reference an issue, because GitHub does not support
- [ ] Tests created for changes (if applicable)
- [ ] Manually tested changed features in running JabRef (always required)
- [ ] Screenshots added in PR description (for UI changes)
- [ ] [Checked developer's documentation](https://devdocs.jabref.org/): Is the information available and up to date? If not, I outlined it in this pull request.
- [ ] [Checked documentation](https://docs.jabref.org/): Is the information available and up to date? If not, I created an issue at <https://github.com/JabRef/user-documentation/issues> or, even better, I submitted a pull request to the documentation repository.
45 changes: 25 additions & 20 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
version: 2
updates:
- package-ecosystem: gradle
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 15
labels:
- "type: dependencies"
ignore:
- dependency-name: com.microsoft.azure:applicationinsights-core
versions:
- ">= 2.5.a" # Blocked by https://github.com/microsoft/ApplicationInsights-Java/issues/1155
- dependency-name: com.microsoft.azure:applicationinsights-logging-log4j2
versions:
- ">= 2.5.a" # Blocked by https://github.com/microsoft/ApplicationInsights-Java/issues/1155
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: weekly
labels:
- "type: dependencies"
- package-ecosystem: gradle
directory: "/"
schedule:
interval: weekly
labels:
- "type: dependencies"
ignore:
- dependency-name: com.microsoft.azure:applicationinsights-core
versions:
- ">= 2.5.a" # Blocked by https://github.com/microsoft/ApplicationInsights-Java/issues/1155
- dependency-name: com.microsoft.azure:applicationinsights-logging-log4j2
versions:
- ">= 2.5.a" # Blocked by https://github.com/microsoft/ApplicationInsights-Java/issues/1155
- package-ecosystem: gradle
directory: "buildSrc/"
schedule:
interval: weekly
labels:
- "type: dependencies"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: weekly
labels:
- "type: dependencies"
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Merge pull requests
uses: pascalgn/automerge-action@v0.14.3
uses: pascalgn/automerge-action@v0.15.2
if: steps.waitforstatuschecks.outputs.status == 'success'
env:
MERGE_METHOD: "merge"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-links.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
use-quiet-mode: 'yes'
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,21 +51,21 @@ jobs:
name: Create installer and portable version for ${{ matrix.displayName }}
steps:
- name: Fetch all history for all tags and branches
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install GitVersion
uses: gittools/actions/gitversion/[email protected].11
uses: gittools/actions/gitversion/[email protected].13
with:
versionSpec: "5.x"
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/[email protected].11
uses: gittools/actions/gitversion/[email protected].13
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Setup OSX key chain on OSX
if: matrix.os == 'macos-latest'
Expand Down Expand Up @@ -152,16 +152,16 @@ jobs:
env:
BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Fetch all history for all tags and branches
run: git fetch --prune --unshallow
- name: Install GitVersion
uses: gittools/actions/gitversion/[email protected].11
uses: gittools/actions/gitversion/[email protected].13
with:
versionSpec: '5.x'
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/[email protected].11
uses: gittools/actions/gitversion/[email protected].13
- name: Get linux binaries
uses: actions/download-artifact@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gource.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout'
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Determine dates
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/refresh-csl-subtrees.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
if: github.repository == 'JabRef/jabref'
steps:
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: main
fetch-depth: 0
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
cp buildres/csl/csl-locales/locales-en-US.xml src/main/resources/csl-locales/
git add .
git commit -m"Refresh example styles" || true
- uses: peter-evans/create-pull-request@v3
- uses: peter-evans/create-pull-request@v4
with:
token: ${{ secrets.GH_TOKEN_UPDATE_GRADLE_WRAPPER }}
branch: refresh-csl
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/refresh-journal-lists.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Fetch all history for all tags and branches
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: main
persist-credentials: false
fetch-depth: 0
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Update journal lists
run: |
Expand All @@ -46,7 +46,7 @@ jobs:
# create .mv file
cd $GITHUB_WORKSPACE
./gradlew generateJournalAbbreviationList
- uses: peter-evans/create-pull-request@v3
- uses: peter-evans/create-pull-request@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: update-journallist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
env:
SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3
# The image relies on https://builds.jabref.org/master/JabRef-5.0-portable_linux.tar.gz^
# See snap/snapcraft.yml for details
- name: Run snapcraft build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-fetchers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Run fetcher tests
run: ./gradlew fetcherTest
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Run check style reporter
uses: nikitasavinov/checkstyle-action@master
Expand All @@ -50,12 +50,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Run tests
run: xvfb-run --auto-servernum ./gradlew check -x checkstyleJmh -x checkstyleMain -x checkstyleTest
Expand All @@ -82,12 +82,12 @@ jobs:
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
steps:
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Run tests on PostgreSQL
run: ./gradlew databaseTest --rerun-tasks
Expand Down Expand Up @@ -116,12 +116,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Run GUI tests
run: xvfb-run --auto-servernum ./gradlew guiTest
Expand Down Expand Up @@ -154,12 +154,12 @@ jobs:
env:
SNAPCRAFT_LOGIN_FILE: ${{ secrets.CODECOV_TOKEN }}
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Update test coverage metrics
if: ${{ steps.checksecrets.outputs.secretspresent }}
Expand All @@ -174,5 +174,5 @@ jobs:
name: "Validate Gradle Wrapper"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1
2 changes: 1 addition & 1 deletion .github/workflows/update-gradle-wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Update Gradle Wrapper
uses: gradle-update/update-gradle-wrapper-action@v1
Expand Down
Loading

0 comments on commit 81f08ef

Please sign in to comment.