Merge branch 'release-3.7'

Author: uckelman

CHANGES

@@ -5,6 +5,7 @@
 
 3.7.13 - ???
 
+* 13496: Remove workaround for Windows file dialog bug (12152)
 * 13495: Upgrade bundled Java to 22.0.2, 21.0.4 (32-bit Windows)
 * 13447: Maintain all attachments when refreshing Pre-defined scenarios
 * 13440: Improve Save and Load times by ignoring empty Stacks

Makefile

@@ -110,10 +110,9 @@ $(TMPDIR) $(JDOCDIR):
 $(LIBDIR)/Vengine.jar: version-set
 	$(MVN) deploy -DgitVersion=$(VERSION) -Dasciidoctor.attributes=optimize $(SKIPS)
 	mv $(LIBDIR)/$(JARNAME).jar $@
-	mv $(LIBDIR)/vassal-agent-$(MAVEN_VERSION).jar $(LIBDIR)/vassal-agent.jar
 
 $(TMPDIR)/module_deps: $(LIBDIR)/Vengine.jar | $(TMPDIR)
-	echo -n jdk.crypto.ec,java.instrument, >$@
+	echo -n jdk.crypto.ec, >$@
 	jdeps --ignore-missing-deps --print-module-deps --multi-release 11 $(LIBDIR)/*.jar | tr -d '\n' >>$@
 
 #$(DISTDIR)/windows/VASSAL.ico:
@@ -218,7 +217,7 @@ $(TMPDIR)/windows-%-$(VERSION)-build:
 
 JREOPTS:=
 
-$(TMPDIR)/windows-noinst-$(VERSION)-build/VASSAL.l4j.xml: JREOPTS:=<opt>-javaagent:lib\\vassal-agent.jar</opt><opt>--add-opens java.desktop/sun.awt.shell=org.vassalengine.agent</opt><opt>-DVASSAL.conf="%EXEDIR%\\..\\VASSAL"</opt>
+$(TMPDIR)/windows-noinst-$(VERSION)-build/VASSAL.l4j.xml: JREOPTS:=<opt>-DVASSAL.conf="%EXEDIR%\\..\\VASSAL"</opt>
 
 $(TMPDIR)/windows-%-$(VERSION)-build/VASSAL.l4j.xml: $(DISTDIR)/windows/VASSAL.l4j.xml.in | $(TMPDIR)/windows-%-$(VERSION)-build
 	sed -e 's/%NUMVERSION%/$(VNUM)/g' \

dist/notes/data.json

@@ -47,6 +47,7 @@
         { "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": 13359, "desc": "Report I/O Errors during Predefined Setup refresh in Refresher log, not as a Vassal bug" },
         { "num": 13440, "desc": "Improve Save and Load times by ignoring empty Stacks" },

pom.xml

@@ -19,7 +19,6 @@
     </licenses>
 
     <modules>
-        <module>vassal-agent</module>
         <module>vassal-app</module>
         <module>vassal-deprecation</module>
         <module>vassal-doc</module>

release-prepare/pom.xml

@@ -18,11 +18,6 @@
     </properties>
 
     <dependencies>
-         <dependency>
-            <groupId>org.vassalengine</groupId>
-            <artifactId>vassal-agent</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.vassalengine</groupId>
             <artifactId>vassal-app</artifactId>

vassal-agent/pom.xml

@@ -550,15 +550,6 @@ private List<String> buildArgumentList(String moduleName) {
       result.add("");   // reserved for initial heap
       result.add("");   // reserved for maximum heap
 
-      if (SystemUtils.IS_OS_WINDOWS) {
-        final String noAgent = System.getProperty("VASSAL.noagent");
-        if (noAgent == null) {
-          result.add("-javaagent:lib\\vassal-agent.jar");
-          result.add("--add-opens");
-          result.add("java.desktop/sun.awt.shell=ALL-UNNAMED");
-        }
-      }
-
       result.addAll(new CustomVmOptions().getCustomVmOptions());
 
       // pass on the user's home, if it's set