Merge branch 'master' into topic/miurahr/core/project/getter-setter-s…

…egmenter

aligner/src/main/java/org/omegat/gui/align/AlignerModule.java

@@ -1,5 +1,4 @@
 /*
- *
  *  OmegaT - Computer Assisted Translation (CAT) tool
  *           with fuzzy matching, translation memory, keyword search,
  *           glossaries, and translation leveraging into updated projects.

build.gradle

@@ -1666,6 +1666,20 @@ def isCommandAvailable(command) {
     }.exitValue == 0
 }
 
+def testAcceptanceFinally = tasks.register('testAcceptanceFinally') {
+    outputs.upToDateWhen { return false } // always run
+    doLast {
+        def display = project.hasProperty("testDisplay") ? project.getProperty("testDisplay") : ""
+        if (!display.isEmpty()) {
+            def pid = ext.has('xvfbPid') ? ext.xvfbPid : null
+            if (pid != null) {
+                stopX(pid)
+                ext.xfvgPid = null
+            }
+        }
+    }
+}
+
 tasks.register('testAcceptance', Test) {
     onlyIf {
         isCommandAvailable('Xvfb') || project.hasProperty("acceptanceTestLive")
@@ -1680,14 +1694,7 @@ tasks.register('testAcceptance', Test) {
             }
         }
     }
-    doLast {
-        if (!display.isEmpty()) {
-            def pid = ext.has('xvfbPid') ? ext.xvfbPid : null
-            if (pid != null) {
-                stopX(pid)
-            }
-        }
-    }
+    finalizedBy testAcceptanceFinally
 
     description = 'Run Acceptance GUI test'
     group = 'verification'

config/checkstyle/checkstyle.xml

@@ -52,6 +52,18 @@
         <property name="file" value="${config_loc}/suppressions.xml"/>
     </module>
 
+    <module name="RegexpHeader">
+        <property name="headerFile" value="${config_loc}/java.header"/>
+        <property name="multiLines" value="6"/>
+        <property name="fileExtensions" value="java"/>
+    </module>
+
+    <module name="RegexpHeader">
+        <property name="headerFile" value="${config_loc}/properties.header"/>
+        <property name="multiLines" value="6"/>
+        <property name="fileExtensions" value="properties"/>
+    </module>
+
     <!-- Checks for Size Violations.                    -->
     <!-- See https://checkstyle.org/checks/sizes/index.html -->
     <module name="FileLength"/>

config/checkstyle/java.header

@@ -0,0 +1,24 @@
+^/\*(\*{73,})?$
+OmegaT \- Computer Assisted Translation \(CAT\) tool$
+with fuzzy matching, translation memory, keyword search,$
+glossaries, and translation leveraging into updated projects.$
+^( \*)?$
+(Copyright \(C\)|\s{13}) \d\d\d\d((-|,)\d\d\d\d)? (\w+|\s|,)+
+Home page: https://www.omegat.org/
+Support center: https://omegat.org/support
+^( \*)?$
+This file is part of OmegaT.$
+^( \*)?$
+OmegaT is free software: you can redistribute it and/or modify$
+it under the terms of the GNU General Public License as published by$
+the Free Software Foundation, either version 3 of the License, or$
+\(at your option\) any later version.$
+^( \*)?$
+OmegaT is distributed in the hope that it will be useful,$
+but WITHOUT ANY WARRANTY; without even the implied warranty of$
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the$
+GNU General Public License for more details.$
+^( \*)?$
+You should have received a copy of the GNU General Public License$
+along with this program.  If not, see <https://www.gnu.org/licenses/>.$
+^\s?(\*{73,})?\*/$

config/checkstyle/properties.header

@@ -0,0 +1,24 @@
+^#(/?\*{75,})?$
+^# OmegaT \- Computer Assisted Translation \(CAT\) tool$
+^# with fuzzy matching, translation memory, keyword search,$
+^# glossaries, and translation leveraging into updated projects.$
+^#$
+^# (Copyright \(C\)|\s{13}) \d\d\d\d(-\d\d\d\d)? (\w+|\s|,)+
+^# Home page: https://www.omegat.org/
+^# Support center: https://omegat.org/support
+^#$
+^# This file is part of OmegaT.$
+^#$
+^# OmegaT is free software: you can redistribute it and/or modify$
+^# it under the terms of the GNU General Public License as published by$
+^# the Free Software Foundation, either version 3 of the License, or$
+^# \(at your option\) any later version.$
+^# ^( \*)?$
+^# OmegaT is distributed in the hope that it will be useful,$
+^# but WITHOUT ANY WARRANTY; without even the implied warranty of$
+^# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the$
+^# GNU General Public License for more details.$
+^#$
+^# You should have received a copy of the GNU General Public License$
+^# along with this program.  If not, see <https://www.gnu.org/licenses/>.$
+^#(\*{75,}/?)?$

config/checkstyle/suppressions.xml

@@ -31,6 +31,9 @@
 <suppressions>
 
     <!-- Permanently suppress errors/warnings -->
+
+    <!-- ignore -->
+    <suppress files="gen.core.*+" checks="RegexpHeader"/>
 
     <!-- tests -->
     <suppress files="TestCore\.java" checks="MethodLength"/>
@@ -161,7 +164,7 @@
     <suppress checks="(TypeName|MissingSwitchDefault)" files="srtFilter\.java" lines="55,102"/>
     <suppress checks="TypeName" files="XLIFFOptions\.java" lines="67"/>
     <suppress files="XHTMLDialect\.java" checks="InnerAssignment" lines="131,132"/>
-    <suppress files="CamtasiaWindowsDialect\.java" checks="MethodLength" lines="45"/>
+    <suppress files="CamtasiaWindowsDialect\.java" checks="MethodLength" lines="44"/>
     <suppress files="Entry\.java" checks="MethodLength"/>
     <suppress files="Handler\.java" checks="EmptyBlock" lines="857"/>
 

doc_src/build.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-/**************************************************************************
- OmegaT - Java based Computer Assisted Translation (CAT) tool
+ OmegaT - Computer Assisted Translation (CAT) tool
+
  Copyright (C) 2011-2012 Didier Briel
                2014-2015 Didier Briel
                2019 Aaron Madlon-Kay
-
-               Home page: http://www.omegat.org/
+               Home page: https://www.omegat.org/
                Support center: https://omegat.org/support
 
  This file is part of OmegaT.
@@ -23,8 +21,7 @@
  GNU General Public License for more details.
 
  You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-**************************************************************************/
+ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
 <project name="OmegaT documentation" default="all">
 

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ commons_lang3 = "3.14.0"
 commons_io = "2.16.1"
 commons_text = "1.11.0"
 commons_validator = "1.9.0"
-jsoup = "1.18.1"
+jsoup = "1.18.2"
 icu4j = { require = "[70,73.2[", prefer = "72.1" }
 stax2api = "4.2.2"
 woodstox = "6.5.0"
@@ -187,7 +187,7 @@ xmlunit = ["xmlunit-core", "xmlunit-assertj", "assertj"]
 
 [plugins]
 spotbugs = {id = "com.github.spotbugs", version = "6.0.26"}
-spotless = {id = "com.diffplug.spotless", version = "6.25.0"}
+spotless = {id = "com.diffplug.spotless", version = "7.0.0.BETA4"}
 launch4j = {id = "edu.sc.seis.launch4j", version = "3.0.6"}
 versions = {id = "com.github.ben-manes.versions", version = "0.51.0"}
 ssh = {id = "org.hidetake.ssh", version = "2.11.2"}