From 23377481de339d9378b2b3aa7828e02760e44d60 Mon Sep 17 00:00:00 2001
From: Joel Uckelman <uckelman@nomic.net>
Date: Fri, 3 Jun 2022 13:58:40 +0100
Subject: [PATCH] Updates for 3.6.7 release.

---
 CHANGES                    | 4 +++-
 Makefile                   | 4 ++--
 dist/notes/data.json       | 2 ++
 pom.xml                    | 2 +-
 release-prepare/pom.xml    | 4 ++--
 vassal-app/pom.xml         | 4 ++--
 vassal-deprecation/pom.xml | 4 ++--
 vassal-doc/pom.xml         | 4 ++--
 8 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5afdafc556..5bc2cd02ef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
-3.6.7 - ???
+3.6.7 - 3 June 2022
 
+* 11487: Removed obsolete option from startup script
 * 11465: DoActionButton claims its icon in remove-unused-images
 * 11460: Show a dialog when connection to the game server is lost
 * 11446: Tweak version number display in online window (numbers at end, grayed
@@ -20,6 +21,7 @@
 * 11348: Polygon Editor improvements (move whole shape, tab between points)
 * 11347: Inventory should not reveal face down deck images
 * 11346: Update bundled Java to 18
+* 11344: Prevent Undo from triggering Deck Empty Hotkey
 * 11343: Ensure that the pivot point is used for rotating Cargo
 * 11330: Allow .toString() to be called properly on property names in Beanshell
 * 11329: Invisible Pieces belonging to another player can still stack together
diff --git a/Makefile b/Makefile
index 101b74bf16..4e174462e0 100644
--- a/Makefile
+++ b/Makefile
@@ -51,9 +51,9 @@ VNUM:=3.6.7
 # major-minor part of the version
 V_MAJ_MIN:=$(shell echo "$(VNUM)" | cut -f1,2 -d'.')
 
-MAVEN_VERSION:=$(VNUM)-SNAPSHOT
+#MAVEN_VERSION:=$(VNUM)-SNAPSHOT
 #MAVEN_VERSION:=$(VNUM)-beta7
-#MAVEN_VERSION:=$(VNUM)
+MAVEN_VERSION:=$(VNUM)
 
 JARNAME:=vassal-app-$(MAVEN_VERSION)
 
diff --git a/dist/notes/data.json b/dist/notes/data.json
index cec3b5ca32..ebd91573e4 100644
--- a/dist/notes/data.json
+++ b/dist/notes/data.json
@@ -30,10 +30,12 @@
         { "num": 11369, "desc": "Leading zeros handling in Set Dynamic Property" },
         { "num": 11362, "desc": "Match expanded Inventory nodes by entry value, not by display text" },
         { "num": 11347, "desc": "Inventory should not reveal face down deck images" },
+        { "num": 11344, "desc": "Prevent Undo from triggering Deck Empty Hotkey" },
         { "num": 11343, "desc": "Ensure that the pivot point is used for rotating Cargo" },
         { "num": 11329, "desc": "Invisible Pieces belonging to another player can still stack together" }
       ],
       "other_improvements": [
+        { "num": 11487, "desc": "Removed obsolete option from startup script" },
         { "num": 11460, "desc": "Show a dialog when connection to the game server is lost" },
         { "num": 11446, "desc": "Tweak version number display in online window (numbers at end, grayed out)" },
         { "num": 11414, "desc": "Improved version mismatch messaging" },
diff --git a/pom.xml b/pom.xml
index 56ce61eed4..b450b4ea84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.vassalengine</groupId>
     <artifactId>vassal-parent</artifactId>
-    <version>3.6.7-SNAPSHOT</version>
+    <version>3.6.7</version>
     <packaging>pom</packaging>
 
     <name>Vassal Engine</name>
diff --git a/release-prepare/pom.xml b/release-prepare/pom.xml
index 6fd116148f..099ec06ae9 100644
--- a/release-prepare/pom.xml
+++ b/release-prepare/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.vassalengine</groupId>
         <artifactId>vassal-parent</artifactId>
-        <version>3.6.7-SNAPSHOT</version>
+        <version>3.6.7</version>
     </parent>
 
     <artifactId>release-prepare</artifactId>
-    <version>3.6.7-SNAPSHOT</version>
+    <version>3.6.7</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/vassal-app/pom.xml b/vassal-app/pom.xml
index e08265486e..486af148c5 100644
--- a/vassal-app/pom.xml
+++ b/vassal-app/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.vassalengine</groupId>
         <artifactId>vassal-parent</artifactId>
-        <version>3.6.7-SNAPSHOT</version>
+        <version>3.6.7</version>
     </parent>
 
     <artifactId>vassal-app</artifactId>
-    <version>3.6.7-SNAPSHOT</version>
+    <version>3.6.7</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
diff --git a/vassal-deprecation/pom.xml b/vassal-deprecation/pom.xml
index dca28d5df0..9f76ae93a3 100644
--- a/vassal-deprecation/pom.xml
+++ b/vassal-deprecation/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.vassalengine</groupId>
         <artifactId>vassal-parent</artifactId>
-        <version>3.6.7-SNAPSHOT</version>
+        <version>3.6.7</version>
     </parent>
 
     <artifactId>vassal-deprecation</artifactId>
-    <version>3.6.7-SNAPSHOT</version>
+    <version>3.6.7</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/vassal-doc/pom.xml b/vassal-doc/pom.xml
index 8522af3f8f..1bc8dd955c 100644
--- a/vassal-doc/pom.xml
+++ b/vassal-doc/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.vassalengine</groupId>
         <artifactId>vassal-parent</artifactId>
-        <version>3.6.7-SNAPSHOT</version>
+        <version>3.6.7</version>
     </parent>
 
     <artifactId>vassal-doc</artifactId>
-    <version>3.6.7-SNAPSHOT</version>
+    <version>3.6.7</version>
 
     <properties>
         <main.basedir>${project.basedir}${file.separator}..</main.basedir>