chore(deps): bump jgit from 7.4.0.202509020913-r to 7.5.0.202512021534-r

Bumps `jgit` from 7.4.0.202509020913-r to 7.5.0.202512021534-r. Updates `org.eclipse.jgit:org.eclipse.jgit` from 7.4.0.202509020913-r to 7.5.0.202512021534-r - [Commits](https://github.com/eclipse-jgit/jgit/compare/v7.4.0.202509020913-r...v7.5.0.202512021534-r) Updates `org.eclipse.jgit:org.eclipse.jgit.ssh.apache` from 7.4.0.202509020913-r to 7.5.0.202512021534-r - [Commits](https://github.com/eclipse-jgit/jgit/compare/v7.4.0.202509020913-r...v7.5.0.202512021534-r) Updates `org.eclipse.jgit:org.eclipse.jgit.ssh.apache.agent` from 7.4.0.202509020913-r to 7.5.0.202512021534-r - [Commits](https://github.com/eclipse-jgit/jgit/compare/v7.4.0.202509020913-r...v7.5.0.202512021534-r) --- updated-dependencies: - dependency-name: org.eclipse.jgit:org.eclipse.jgit dependency-version: 7.5.0.202512021534-r dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.jgit:org.eclipse.jgit.ssh.apache dependency-version: 7.5.0.202512021534-r dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.jgit:org.eclipse.jgit.ssh.apache.agent dependency-version: 7.5.0.202512021534-r dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2026-01-16 10:22:58 +08:00 · 2025-12-15 02:12:12 +00:00
10 changed files with 24 additions and 42 deletions
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.3.0"
+kotlin = "2.2.21"
 slf4j = "2.0.17"
 pty4j = "0.13.10"
 tinylog = "2.7.0"
@@ -27,16 +27,16 @@ jsch = "2.27.3"
 okhttp = "5.3.0"
 sshj = "0.39.0"
 sshd-core = "2.15.0"
-jgit = "7.4.0.202509020913-r"
+jgit = "7.5.0.202512021534-r"
 commonmark = "0.27.0"
 jnafilechooser = "1.1.2"
 xodus = "2.0.1"
 bip39 = "1.0.9"
 colorpicker = "2.0.1"
-rhino = "1.9.0"
+rhino = "1.8.0"
 delight-rhino-sandbox = "0.2.1"
-testcontainers = "2.0.3"
-mixpanel = "1.7.0"
+testcontainers = "2.0.1"
+mixpanel = "1.5.4"
 jSerialComm = "2.11.4"
 ini4j = "0.5.5-2"
 restart4j = "0.0.1"
--- a/plugins/cos/build.gradle.kts
+++ b/plugins/cos/build.gradle.kts
@@ -8,7 +8,7 @@ project.version = "0.0.4"

 dependencies {
    testImplementation(kotlin("test"))
-    implementation("com.qcloud:cos_api:5.6.260.1")
+    implementation("com.qcloud:cos_api:5.6.259")
    compileOnly(project(":"))
 }

--- a/plugins/editor/build.gradle.kts
+++ b/plugins/editor/build.gradle.kts
@@ -10,7 +10,7 @@ project.version = "0.0.8"
 dependencies {
    testImplementation(kotlin("test"))
    compileOnly(project(":"))
-    implementation("com.fifesoft:rsyntaxtextarea:3.6.1")
+    implementation("com.fifesoft:rsyntaxtextarea:3.6.0")
    implementation("com.fifesoft:languagesupport:3.4.0")
    implementation("com.fifesoft:autocomplete:3.3.2")
 }
--- a/src/main/kotlin/app/termora/SettingsOptionsPane.kt
+++ b/src/main/kotlin/app/termora/SettingsOptionsPane.kt
@@ -547,7 +547,6 @@ class SettingsOptionsPane : OptionsPane() {

            rightClickComboBox.addItem("Copy")
            rightClickComboBox.addItem("CopyAndPaste")
-            rightClickComboBox.addItem("Nothing")

            rightClickComboBox.selectedItem = terminalSetting.rightClick

@@ -577,8 +576,6 @@ class SettingsOptionsPane : OptionsPane() {
                        text = I18n.getString("termora.settings.terminal.right-click.copy")
                    } else if (value == "CopyAndPaste") {
                        text = I18n.getString("termora.settings.terminal.right-click.copy-and-paste")
-                    }else if (value == "Nothing") {
-                        text = I18n.getString("termora.settings.terminal.right-click.nothing")
                    }
                    return super.getListCellRendererComponent(list, text, index, isSelected, cellHasFocus)
                }
--- a/src/main/kotlin/app/termora/plugin/internal/rdp/RDPProtocolProvider.kt
+++ b/src/main/kotlin/app/termora/plugin/internal/rdp/RDPProtocolProvider.kt
@@ -10,8 +10,6 @@ import kotlinx.coroutines.launch
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.IOUtils
 import org.apache.commons.lang3.StringUtils
-import org.apache.commons.lang3.Strings
-import org.apache.commons.lang3.SystemUtils
 import java.awt.datatransfer.DataFlavor
 import java.awt.datatransfer.StringSelection
 import java.net.URI
@@ -66,15 +64,7 @@ internal class RDPProtocolProvider private constructor() : GenericProtocolProvid
        }

        val sb = StringBuilder()
-        sb.append("full address:s:")
-        if (SystemUtils.IS_OS_WINDOWS && Strings.CI.contains(host.host, ":")) {
-            var newHost = Strings.CI.removeStart(host.host, "[")
-            newHost = Strings.CI.removeEnd(newHost, "]")
-            sb.append('[').append(newHost).append(']')
-        } else {
-            sb.append(host.host)
-        }
-        sb.append(':').append(host.port).appendLine()
+        sb.append("full address:s:").append(host.host).append(':').append(host.port).appendLine()
        sb.append("username:s:").append(host.username).appendLine()
        val desktop = host.options.extras["desktop"]
        if (desktop.isNullOrBlank().not()) {
--- a/src/main/kotlin/app/termora/terminal/panel/TerminalPanelMouseSelectionAdapter.kt
+++ b/src/main/kotlin/app/termora/terminal/panel/TerminalPanelMouseSelectionAdapter.kt
@@ -53,31 +53,30 @@ class TerminalPanelMouseSelectionAdapter(private val terminalPanel: TerminalPane
        if (SwingUtilities.isRightMouseButton(e)) {
            // 如果有选中并且开启了选中复制，那么右键直接是粘贴
            if (selectionModel.hasSelection() && isSelectCopy.not()) {
-                if (rightClickMode != "Nothing") {
-                    triggerCopyAction(
+                triggerCopyAction(
+                    KeyEvent(
+                        e.component,
+                        KeyEvent.KEY_PRESSED,
+                        e.`when`,
+                        e.modifiersEx,
+                        KeyEvent.VK_C,
+                        'C'
+                    )
+                )
+
+                if (rightClickMode == "CopyAndPaste") {
+                    triggerPasteAction(
                        KeyEvent(
                            e.component,
                            KeyEvent.KEY_PRESSED,
                            e.`when`,
                            e.modifiersEx,
-                            KeyEvent.VK_C,
-                            'C'
+                            KeyEvent.VK_V,
+                            'V'
                        )
                    )
-
-                    if (rightClickMode == "CopyAndPaste") {
-                        triggerPasteAction(
-                            KeyEvent(
-                                e.component,
-                                KeyEvent.KEY_PRESSED,
-                                e.`when`,
-                                e.modifiersEx,
-                                KeyEvent.VK_V,
-                                'V'
-                            )
-                        )
-                    }
                }
+
            } else {
                // paste
                triggerPasteAction(
--- a/src/main/resources/i18n/messages.properties
+++ b/src/main/resources/i18n/messages.properties
@@ -59,7 +59,6 @@ termora.settings.terminal.hyperlink=Hyperlink
 termora.settings.terminal.select-copy=Select copy
 termora.settings.terminal.right-click=Right click
 termora.settings.terminal.right-click.copy-and-paste=Copy and Paste
-termora.settings.terminal.right-click.nothing=Nothing
 termora.settings.terminal.right-click.copy=${termora.copy}
 termora.settings.terminal.cursor-style=Cursor type
 termora.settings.terminal.cursor-blink=Cursor blink
--- a/src/main/resources/i18n/messages_ru_RU.properties
+++ b/src/main/resources/i18n/messages_ru_RU.properties
@@ -81,7 +81,6 @@ termora.settings.terminal.hyperlink=Ссылки
 termora.settings.terminal.select-copy=Копировать выделенное
 termora.settings.terminal.right-click=правой кнопкой мыши
 termora.settings.terminal.right-click.copy-and-paste=Копировать и вставить
-termora.settings.terminal.right-click.nothing=никто
 termora.settings.terminal.cursor-style=Вид курсора
 termora.settings.terminal.cursor-blink=Мигать курсором
 termora.settings.terminal.local-shell=Локальный терминал
--- a/src/main/resources/i18n/messages_zh_CN.properties
+++ b/src/main/resources/i18n/messages_zh_CN.properties
@@ -73,7 +73,6 @@ termora.settings.terminal.hyperlink=超链接
 termora.settings.terminal.select-copy=选中复制
 termora.settings.terminal.right-click=右键点击
 termora.settings.terminal.right-click.copy-and-paste=复制 & 粘贴
-termora.settings.terminal.right-click.nothing=无操作
 termora.settings.terminal.cursor-style=光标样式
 termora.settings.terminal.cursor-blink=光标闪烁
 termora.settings.terminal.local-shell=本地终端
--- a/src/main/resources/i18n/messages_zh_TW.properties
+++ b/src/main/resources/i18n/messages_zh_TW.properties
@@ -85,7 +85,6 @@ termora.settings.terminal.hyperlink=超連結
 termora.settings.terminal.select-copy=選取複製
 termora.settings.terminal.right-click=右鍵點擊
 termora.settings.terminal.right-click.copy-and-paste=複製 & 貼上
-termora.settings.terminal.right-click.nothing=無操作
 termora.settings.terminal.cursor-style=遊標風格
 termora.settings.terminal.cursor-blink=遊標閃爍
 termora.settings.terminal.local-shell=本地端