-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into lucenceUpgrade
* 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
Showing
662 changed files
with
42,695 additions
and
9,432 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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' | ||
|
@@ -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: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.