Merge branch 'vassalengine:master' into master-SleepZeroRefreshOnly

vassalengine · Nov 21, 2024 · de11faa · de11faa
2 parents 15e68e1 + 97870c7
commit de11faa
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 83 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -37,7 +37,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 22
+          java-version: 23
           java-package: jdk
 
       - name: Cache Maven packages

diff --git a/CHANGES b/CHANGES
@@ -3,8 +3,43 @@
 * 12944: Add pieceCount to the map auto reporter
 * 12763: Added ModuleGameFileName property
 
-3.7.14 - ???
-
+3.7.16 - ???
+
+* 13693: Upgraded asciidoctor-maven-plugin to 3.1.1
+* 13688: Upgraded spotbugs-maven-plugin to 4.8.6.6
+
+3.7.15 - 7 November 2024
+
+* 13681: Upgraded checkstyle to 10.20.1
+* 13678: Upgraded byte-buddy to 1.15.10
+* 13677: Upgraded maven-javadoc-plugin to 3.11.1
+* 13676: Upgraded manen-surfire-plugin to 3.5.2
+* 13669: Upgraded asciidoctor-maven-plugin to 3.1.0
+* 13664: Upgraded bundled Java to 21.0.5 (32-bit Windows), 23.0.1 (all others)
+* 13660: Upgraded maven-pmd-plugin to 3.26.0
+* 13659: Upgraded httpclient5 to 5.4.1
+* 13655: Upgraded maven-dependency-plugin to 3.8.1
+* 13654: Upgraded maven-checkstyle-plugin to 3.6.0
+* 13653: Upgraded logback-classic to 1.5.12
+* 13647: Upgraded maven-site-plugin to 3.21.0
+* 13646: Upgraded exec-maven-plugin to 3.5.0
+* 13645: Upgraded spotbugs-maven-plugin to 4.8.6.5
+* 13642: Upgraded junit-bom to 5.11.3
+* 13641: Upgraded asciidoctorj-pdf to 2.3.19
+* 13620: Upgraded batik to 1.18
+* 13614: Upgraded asm to 9.7.1
+* 13591: Upgraded commons-io to 2.17.0
+* 13573: Upgraded commons-lang3 to 3.17.0
+* 13572: Upgraded miglayout-swing to 11.4.2
+* 13558: Update logback configuration to prevent messages to console
+* 13548: Upgraded maven-deploy-plugin to 3.1.3
+* 13542: Upgraded maven-install-plugin to 3.1.3
+* 13540: Upgraded maven-artifact to 3.9.9
+
+3.7.14 - 18 August 2024
+
+* 13530: Add saved games to Open Recent list on save
+* 13509: Prevent NoSuchMethod exception when opening Scenario Options in Editor
 * 13497: Report HTML load errors as Bad Module Data, not Vassal bugs
 
 3.7.13 - 25 July 2024

diff --git a/bootstrap.sh b/bootstrap.sh
@@ -21,17 +21,17 @@ pushd "$JDKDIR"
 
 ZULU_URL='https://cdn.azul.com/zulu/bin'
 
-TEMURIN_URL='https://github.com/adoptium/temurin22-binaries/releases/download'
-TEMURIN_VERSION=jdk-22.0.2+9
-TEMURIN_FILENAME_VERSION=22.0.2_9
+TEMURIN_URL='https://github.com/adoptium/temurin23-binaries/releases/download'
+TEMURIN_VERSION=jdk-23.0.1+11
+TEMURIN_FILENAME_VERSION=23.0.1_11
 
-BELLSOFT_URL='https://download.bell-sw.com/java/22.0.2%2B11'
-BELLSOFT_VERSION=22.0.2+11
-BELLSOFT_DIR=jdk-22.0.2
+BELLSOFT_URL='https://download.bell-sw.com/java/23.0.1%2B13'
+BELLSOFT_VERSION=23.0.1+13
+BELLSOFT_DIR=jdk-23.0.1
 
-BELLSOFT_WIN32_URL='https://download.bell-sw.com/java/21.0.4%2B9'
-BELLSOFT_WIN32_VERSION=21.0.4+9
-BELLSOFT_WIN32_DIR=jdk-21.0.4
+BELLSOFT_WIN32_URL='https://download.bell-sw.com/java/21.0.5%2B11'
+BELLSOFT_WIN32_VERSION=21.0.5+11
+BELLSOFT_WIN32_DIR=jdk-21.0.5
 
 # Windows x86_32
 filename="bellsoft-jdk$BELLSOFT_WIN32_VERSION-windows-i586.zip"
@@ -40,7 +40,7 @@ unzip $filename
 mv $BELLSOFT_WIN32_DIR windows-x86_32
 
 # Windows x86_64
-filename="OpenJDK22U-jdk_x64_windows_hotspot_$TEMURIN_FILENAME_VERSION.zip"
+filename="OpenJDK23U-jdk_x64_windows_hotspot_$TEMURIN_FILENAME_VERSION.zip"
 curl -L -O "$TEMURIN_URL/$TEMURIN_VERSION/$filename"
 unzip $filename
 mv $TEMURIN_VERSION windows-x86_64
@@ -52,13 +52,13 @@ unzip $filename
 mv $BELLSOFT_DIR windows-aarch64
 
 # MacOS x86_64
-filename="OpenJDK22U-jdk_x64_mac_hotspot_$TEMURIN_FILENAME_VERSION.tar.gz"
+filename="OpenJDK23U-jdk_x64_mac_hotspot_$TEMURIN_FILENAME_VERSION.tar.gz"
 curl -L -O "$TEMURIN_URL/$TEMURIN_VERSION/$filename"
 mkdir macos-x86_64
 tar -C macos-x86_64 --strip-components=1 -xvf $filename
 
 # MacOS aarch64
-filename="OpenJDK22U-jdk_aarch64_mac_hotspot_$TEMURIN_FILENAME_VERSION.tar.gz"
+filename="OpenJDK23U-jdk_aarch64_mac_hotspot_$TEMURIN_FILENAME_VERSION.tar.gz"
 curl -L -O "$TEMURIN_URL/$TEMURIN_VERSION/$filename"
 mkdir macos-aarch64
 tar -C macos-aarch64 --strip-components=1 -xvf $filename

diff --git a/dist/notes/data.json b/dist/notes/data.json
@@ -17,47 +17,16 @@
   "changes": [
     {
       "in": "3.8.0-beta1",
-      "since": "3.7.12",
+      "since": "3.7.15",
       "new_features": [
+        { "num": 12944, "desc": "Add pieceCount to the map auto reporter" },
+        { "num": 12763, "desc": "Added ModuleGameFileName property" }
       ],
       "bug_fixes": [
       ],
       "other_improvements": [
-        { "num": 13497, "desc": "Report HTML load errors as Bad Module Data, not Vassal bugs" }
-      ]
-    },
-    {
-      "in": "3.7.13",
-      "since": "3.7.12",
-      "new_features": [
-      ],
-      "bug_fixes": [
-        { "num": 13447, "desc": "Maintain all attachments when refreshing Pre-defined scenarios" },
-        { "num": 13429, "desc": "Prevent crash when editing module with name shorter than 3 characters" },
-        { "num": 13408, "desc": "Ensure pieces are indexed after Layer Change" },
-        { "num": 13405, "desc": "At-Start Stack positioning tool now expands prototypes before displaying piece" },
-        { "num": 13400, "desc": "Prevent crashes when refreshing counters with fewer Can Rotate facing" },
-        { "num": 13398, "desc": "Ensure a GKC is never applied to same piece twice if it moves" },
-        { "num": 13395, "desc": "Fix Invisibility documentation" },
-        { "num": 13384, "desc": "Prevent crash in Does Not Stack during Edit Contained Pieces" },
-        { "num": 13365, "desc": "Fix NPE When editing Game Piece Images" },
-        { "num": 13360, "desc": "Coerce Regular Expression operator arguments to be strings to prevent Bad Data errors" },
-        { "num": 13339, "desc": "Prevent NPE during game load" },
-        { "num": 13336, "desc": "Auto-attach does not attach to self when piece is added to a stack" },
-        { "num": 13324, "desc": "Fixed bad link to GamePiece page in Reference Manual" },
-        { "num": 13315, "desc": "Preserve all attachments across save/load" },
-        { "num": 11884, "desc": "Ensure OldMat is set when a piece leaves a Mat" }
-      ],
-      "other_improvements": [
-        { "num": 13496, "desc": "Remove workaround for Windows file dialog bug (12152)" },
-        { "num": 13495, "desc": "Upgrade bundled Java to 22.0.2, 21.0.4 (32-bit Windows)" },
-        { "num": 13490, "desc": "Suppress error messages from expressions in text Labels during module load, or in Game Piece Palettes" },
-        { "num": 13452, "desc": "Scenario option improvements" },
-        { "num": 13450, "desc": "Make Locked Scenario Options more legible" },
-        { "num": 13440, "desc": "Improve Save and Load times by ignoring empty Stacks" },
-        { "num": 13402, "desc": "Add a visual validator for Prototype name in Prototype trait" },
-        { "num": 13393, "desc": "Prevent slowdown when editing multiple Prototypes in sequence" },
-        { "num": 13359, "desc": "Report I/O Errors during Predefined Setup refresh in Refresher log, not as a Vassal bug" }
+        { "num": 13693, "desc": "Upgraded asciidoctor-maven-plugin to 3.1.1" },
+        { "num": 13688, "desc": "Upgraded spotbugs-maven-plugin to 4.8.6.6" }
       ]
     }
   ]

diff --git a/pom.xml b/pom.xml
@@ -75,38 +75,38 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.5.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>3.3.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.1.3</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.12.1</version>
+                    <version>3.21.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.1.3</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.6.0</version>
                     <dependencies>
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>10.17.0</version>
+                            <version>10.20.1</version>
                         </dependency>
                     </dependencies>
                 </plugin>
                 <plugin>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.7.1</version>
+                    <version>3.8.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
@@ -118,17 +118,17 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.8.0</version>
+                    <version>3.11.1</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>
-                    <version>4.8.6.2</version>
+                    <version>4.8.6.6</version>
                 </plugin>
                 <plugin>
                     <groupId>org.asciidoctor</groupId>
                     <artifactId>asciidoctor-maven-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -138,7 +138,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.5.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -148,7 +148,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.23.0</version>
+                    <version>3.26.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>

diff --git a/vassal-app/pom.xml b/vassal-app/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <main.basedir>${project.basedir}${file.separator}..</main.basedir>
         <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
-        <version.batik>1.17</version.batik>
+        <version.batik>1.18</version.batik>
         <clirr.nofork.comparison.version>3.7.0</clirr.nofork.comparison.version>
     </properties>
 
@@ -26,7 +26,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.10.3</version>
+                <version>5.11.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -37,12 +37,12 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.5.6</version>
+            <version>1.5.12</version>
         </dependency>
         <dependency>
             <groupId>com.miglayout</groupId>
             <artifactId>miglayout-swing</artifactId>
-            <version>11.4</version>
+            <version>11.4.2</version>
         </dependency>
         <dependency>
             <groupId>javazoom</groupId>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.16.1</version>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>gnu.getopt</groupId>
@@ -67,12 +67,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.16.0</version>
+            <version>3.17.0</version>
         </dependency>
         <dependency>
           <groupId>org.apache.httpcomponents.client5</groupId>
           <artifactId>httpclient5</artifactId>
-          <version>5.3.1</version>
+          <version>5.4.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.15</version>
+            <version>2.0.16</version>
         </dependency>
         <dependency>
             <groupId>org.swinglabs.swingx</groupId>
@@ -132,12 +132,12 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
-            <version>3.9.8</version>
+            <version>3.9.9</version>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
-            <version>9.7</version>
+            <version>9.7.1</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -192,7 +192,7 @@
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>1.14.18</version>
+            <version>1.15.10</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -319,7 +319,7 @@
                 <dependency>
                   <groupId>org.ow2.asm</groupId>
                   <artifactId>asm</artifactId>
-                  <version>9.7</version>
+                  <version>9.7.1</version>
                 </dependency>
               </dependencies>
             </plugin>

diff --git a/vassal-app/src/main/java/VASSAL/build/module/GameState.java b/vassal-app/src/main/java/VASSAL/build/module/GameState.java
@@ -1406,6 +1406,7 @@ public void saveGame(File f) throws IOException {
     }
     GameModule.getGameModule().warn(msg);
     ModuleManagerUpdateHelper.sendGameUpdate(f);
+    updateRecentGames(f);
   }
 
   public void loadGameInForeground(final File f) {

diff --git a/vassal-app/src/main/java/VASSAL/build/module/properties/ScenarioPropertiesOptionTab.java b/vassal-app/src/main/java/VASSAL/build/module/properties/ScenarioPropertiesOptionTab.java
@@ -691,7 +691,7 @@ public void setEnabled(boolean enabled) {
     }
   }
 
-  private static class AlignConfig implements ConfigurerFactory {
+  public static class AlignConfig implements ConfigurerFactory {
     @Override
     public Configurer getConfigurer(AutoConfigurable c, String key, String name) {
       return new TranslatingStringEnumConfigurer(key, name,
@@ -700,7 +700,7 @@ public Configurer getConfigurer(AutoConfigurable c, String key, String name) {
     }
   }
 
-  private static class TextConfig implements ConfigurerFactory {
+  public static class TextConfig implements ConfigurerFactory {
     @Override
     public Configurer getConfigurer(AutoConfigurable c, String key, String name) {
       final TextConfigurer t = new TextConfigurer(key, name);

diff --git a/vassal-app/src/main/java/VASSAL/script/ExpressionInterpreter.java b/vassal-app/src/main/java/VASSAL/script/ExpressionInterpreter.java
@@ -1116,7 +1116,7 @@ public Object countMapLocation(Object locationName, Object mapName, Object prope
     final PieceFilter filter = createFilter(expression, ps);
     final Map targetMap = findVassalMap(mapName.toString());
 
-    String propValue;
+    final String propValue;
     if (property == null || property.toString().isEmpty()) {
       propValue = null;
     }
@@ -1251,7 +1251,7 @@ public Object countZone(Object zoneName, Object mapName, Object property, Object
     final PieceFilter filter = createFilter(expression, ps);
     final Map targetMap = findVassalMap(mapName.toString());
 
-    String propValue;
+    final String propValue;
     if (property == null || property.toString().isEmpty()) {
       propValue = null;
     }

diff --git a/vassal-app/src/main/java/VASSAL/tools/DataArchive.java b/vassal-app/src/main/java/VASSAL/tools/DataArchive.java
@@ -322,7 +322,7 @@ protected SortedSet<String> getLocalImageNames() {
 
   /* Localized directories always take the form images_XX with XX being a i18n code */
   protected void buildLocalizedDirectoryList(List<String> list) {
-    List<String> files;
+    final List<String> files;
     try {
       files = archive.getFiles("");
     }