Merge remote-tracking branch 'origin/main' into GSOC-merge-fields

CHANGELOG.md

@@ -16,6 +16,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added an extra option in the 'Find Unlinked Files' dialog view to ignore unnecessary files like Thumbs.db, DS_Store, etc. [koppor#373](https://github.com/koppor/jabref/issues/373)
 - JabRef now writes log files. Linux: `$home/.cache/jabref/logs/version`, Windows: `%APPDATA%\..\Local\harawata\jabref\version\logs`, Mac: `Users/.../Library/Logs/jabref/version`
 - We added an importer for Citavi backup files, support ".ctv5bak" and ".ctv6bak" file formats. [#8322](https://github.com/JabRef/jabref/issues/8322)
+- We added a feature to drag selected entries and drop them to other opened inactive library tabs [koppor521](https://github.com/koppor/jabref/issues/521).
 
 ### Changed
 
@@ -35,7 +36,9 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - When configured SSL certificates changed, JabRef warns the user to restart to apply the configuration.
 - We improved the appearances and logic of the "Manage field names & content" dialog, and renamed it to "Automatic field editor". [#6536](https://github.com/JabRef/jabref/issues/6536)
 - We improved the message explaining the options when modifying an automatic keyword group [#8911](https://github.com/JabRef/jabref/issues/8911)
-- We moved the preferences option "Warn about duplicates on import" option from the tab "File" to the tab "Import and Export". [kopper#570](https://github.com/koppor/jabref/issues/570)
+- We moved the preferences option "Warn about duplicates on import" option from the tab "File" to the tab "Import and Export". [koppor#570](https://github.com/koppor/jabref/issues/570)
+- When JabRef encounters `% Encoding: UTF-8` header, it is kept during writing (and not removed). [#8964](https://github.com/JabRef/jabref/pull/8964)
+- We replace characters which cannot be decoded using the specified encoding by a (probably another) valid character. This happens if JabRef detects the wrong charset (e.g., UTF-8 instead of Windows 1252). One can use the [Integrity Check](https://docs.jabref.org/finding-sorting-and-cleaning-entries/checkintegrity) to find those characters.
 
 ### Fixed
 
@@ -54,6 +57,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where removing several groups deletes only one of them. [#8390](https://github.com/JabRef/jabref/issues/8390)
 - We fixed an issue where the Sidepane (groups, web search and open office) width is not remembered after restarting JabRef. [#8907](https://github.com/JabRef/jabref/issues/8907)
 - We fixed a bug where switching between themes will cause an error/exception. [#8939](https://github.com/JabRef/jabref/pull/8939)
+- We fixed a bug where files that were deleted in the source bibtex file were kept in the index. [#8962](https://github.com/JabRef/jabref/pull/8962)
+- We fixed "Error while sending to JabRef" when the browser extension interacts with JabRef. [JabRef-Browser-Extension#479](https://github.com/JabRef/JabRef-Browser-Extension/issues/479)
 
 ### Removed
 

build.gradle

@@ -100,7 +100,7 @@ dependencyLocking {
 }
 
 javafx {
-    version = "18"
+    version = "18.0.1"
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
 }
 
@@ -127,7 +127,6 @@ dependencies {
     implementation 'com.h2database:h2-mvstore:2.1.214'
 
     implementation group: 'org.apache.tika', name: 'tika-core', version: '2.4.1'
-    implementation 'com.ibm.icu:icu4j-charset:71.1'
 
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
     implementation 'org.bouncycastle:bcprov-jdk18on:1.71'
@@ -208,7 +207,7 @@ dependencies {
 
     implementation group: 'net.harawata', name: 'appdirs', version: '1.2.1'
 
-    testImplementation 'io.github.classgraph:classgraph:4.8.147'
+    testImplementation 'io.github.classgraph:classgraph:4.8.149'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
     testImplementation 'org.junit.platform:junit-platform-launcher:1.8.2'
 

buildres/csl/csl-locales/.github/workflows/merge.yaml

@@ -48,6 +48,10 @@ jobs:
             - deleted: [ '*.csl', 'dependent/*.csl', '*.xml' ]
           workflows:
             - added|modified: .github/workflows/*.yaml
+          updated_composer:
+            - added|modified: composer.json
+          deleted_composer:
+            - deleted: composer.json
 
     - name: Changed files
       if: github.event_name == 'push'
@@ -87,11 +91,24 @@ jobs:
       run: cd release && git rm ${{ steps.update.outputs.deleted_files }}
       if: github.event_name == 'push' && steps.update.outputs.deleted == 'true'
 
+    - name: Update composer.json
+      if: steps.update.outputs.updated_composer == 'true'
+      run: |
+        cp composer.json release/composer.json
+        cd release
+        git add composer.json
+  
+    - name: Delete composer.json
+      if: steps.update.outputs.deleted_composer == 'true'
+      run: |
+        cd release
+        git rm composer.json
+    
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
         repository: 'release'
-        commit_message: Releasing ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }}
-      if: github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')
+        commit_message: Releasing ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }} ${{ steps.update.outputs.updated_composer_files }} ${{ steps.update.outputs.deleted_composer_files }}
+      if: github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true' || steps.update.outputs.updated_composer == 'true' || steps.update.outputs.deleted_composer == 'true')
 
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
@@ -116,3 +133,21 @@ jobs:
         git-user: "csl-bot"
         git-user-email: github@citationstyles.org
         git-commit-message: copied ${{ steps.update.outputs.workflows_files }} from styles
+
+    - name: Bump version and push tag
+      id: tag_version
+      uses: mathieudutour/github-tag-action@v5.6
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        default_bump: patch
+      if: github.event_name == 'push' && hashFiles('composer.json') != '' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')
+
+    - name: Create a GitHub release
+      uses: softprops/action-gh-release@v0.1.14
+      env:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ steps.tag_version.outputs.new_tag }}
+        name: Release ${{ steps.tag_version.outputs.new_tag }}
+        body: Released ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }} ${{ steps.update.outputs.updated_composer_files }} ${{ steps.update.outputs.deleted_composer_files }}
+      if: github.event_name == 'push' && hashFiles('composer.json') != '' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')

buildres/csl/csl-styles/.github/workflows/merge.yaml

@@ -48,6 +48,10 @@ jobs:
             - deleted: [ '*.csl', 'dependent/*.csl', '*.xml' ]
           workflows:
             - added|modified: .github/workflows/*.yaml
+          updated_composer:
+            - added|modified: composer.json
+          deleted_composer:
+            - deleted: composer.json
 
     - name: Changed files
       if: github.event_name == 'push'
@@ -87,11 +91,24 @@ jobs:
       run: cd release && git rm ${{ steps.update.outputs.deleted_files }}
       if: github.event_name == 'push' && steps.update.outputs.deleted == 'true'
 
+    - name: Update composer.json
+      if: steps.update.outputs.updated_composer == 'true'
+      run: |
+        cp composer.json release/composer.json
+        cd release
+        git add composer.json
+  
+    - name: Delete composer.json
+      if: steps.update.outputs.deleted_composer == 'true'
+      run: |
+        cd release
+        git rm composer.json
+    
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
         repository: 'release'
-        commit_message: Releasing ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }}
-      if: github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')
+        commit_message: Releasing ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }} ${{ steps.update.outputs.updated_composer_files }} ${{ steps.update.outputs.deleted_composer_files }}
+      if: github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true' || steps.update.outputs.updated_composer == 'true' || steps.update.outputs.deleted_composer == 'true')
 
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
@@ -116,3 +133,21 @@ jobs:
         git-user: "csl-bot"
         git-user-email: github@citationstyles.org
         git-commit-message: copied ${{ steps.update.outputs.workflows_files }} from styles
+
+    - name: Bump version and push tag
+      id: tag_version
+      uses: mathieudutour/github-tag-action@v5.6
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        default_bump: patch
+      if: github.event_name == 'push' && hashFiles('composer.json') != '' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')
+
+    - name: Create a GitHub release
+      uses: softprops/action-gh-release@v0.1.14
+      env:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ steps.tag_version.outputs.new_tag }}
+        name: Release ${{ steps.tag_version.outputs.new_tag }}
+        body: Released ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }} ${{ steps.update.outputs.updated_composer_files }} ${{ steps.update.outputs.deleted_composer_files }}
+      if: github.event_name == 'push' && hashFiles('composer.json') != '' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')