From 9cca0b4b4f94bed1044d6f7e41189477016aefa3 Mon Sep 17 00:00:00 2001
From: Adam Retter <adam.retter@googlemail.com>
Date: Sun, 18 Aug 2019 15:52:46 +0100
Subject: [PATCH 1/4] Get product details from JMX output

---
 pom.xml                             |  2 +-
 src/main/xar-resources/details.html | 10 +++++-----
 src/main/xar-resources/index.html   |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 49c6854..4e808d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <project.build.target>1.8</project.build.target>
 
         <exist.version>5.0.0-SNAPSHOT</exist.version>
-        <min.version>5.0.0-RC8</min.version>
+        <min.version>5.0.0-RC9</min.version>
         <jackson.version>2.9.9</jackson.version>
         <websocket.api.version>1.1</websocket.api.version>
 
diff --git a/src/main/xar-resources/details.html b/src/main/xar-resources/details.html
index c8594b3..d7e9cd8 100644
--- a/src/main/xar-resources/details.html
+++ b/src/main/xar-resources/details.html
@@ -277,12 +277,12 @@ <h3 class="box-title">System Information</h3>
                             </thead>
                             <tbody>
                                 <tr>
-                                    <td>eXist Version:</td>
-                                    <td data-bind="text: jmx.SystemInfo.ExistVersion"/>
+                                    <td><span data-bind="text: jmx.SystemInfo.ProductName"/> Version:</td>
+                                    <td data-bind="text: jmx.SystemInfo.ProductVersion"/>
                                 </tr>
                                 <tr>
-                                    <td>eXist Build:</td>
-                                    <td data-bind="text: jmx.SystemInfo.ExistBuild"/>
+                                    <td><span data-bind="text: jmx.SystemInfo.ProductName"/> Build:</td>
+                                    <td data-bind="text: jmx.SystemInfo.ProductBuild"/>
                                 </tr>
                                 <tr>
                                     <td>Operating System:</td>
@@ -387,4 +387,4 @@ <h3 class="box-title">Recent Queries <small data-bind="visible: $data.jmx.Proces
     <script type="text/javascript" src="resources/scripts/util.js"/>
     <script type="text/javascript" src="resources/scripts/exadmin.js"/>
     <script type="text/javascript" src="resources/scripts/details.js"/>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/main/xar-resources/index.html b/src/main/xar-resources/index.html
index 906e569..0165f91 100644
--- a/src/main/xar-resources/index.html
+++ b/src/main/xar-resources/index.html
@@ -217,12 +217,12 @@ <h3 class="box-title">System Information</h3>
                             </thead>
                             <tbody>
                                 <tr>
-                                    <td>eXist Version:</td>
-                                    <td data-bind="text: jmx.SystemInfo.ExistVersion"/>
+                                    <td><span data-bind="text: jmx.SystemInfo.ProductName"/> Version:</td>
+                                    <td data-bind="text: jmx.SystemInfo.ProductVersion"/>
                                 </tr>
                                 <tr>
-                                    <td>eXist Build:</td>
-                                    <td data-bind="text: jmx.SystemInfo.ExistBuild"/>
+                                    <td><span data-bind="text: jmx.SystemInfo.ProductName"/> Build:</td>
+                                    <td data-bind="text: jmx.SystemInfo.ProductBuild"/>
                                 </tr>
                                 <tr>
                                     <td>Operating System:</td>

From 8535cca15f7311308592141c4185575ee0104210 Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Fri, 30 Aug 2019 19:05:53 -0400
Subject: [PATCH 2/4] Prepare for release with eXist 5.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4e808d7..d663973 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <project.build.target>1.8</project.build.target>
 
         <exist.version>5.0.0-SNAPSHOT</exist.version>
-        <min.version>5.0.0-RC9</min.version>
+        <min.version>5.0.0</min.version>
         <jackson.version>2.9.9</jackson.version>
         <websocket.api.version>1.1</websocket.api.version>
 

From c8c55809c26cea81dba51f93d663a8bb83b9fc67 Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Fri, 30 Aug 2019 19:14:51 -0400
Subject: [PATCH 3/4] Increment version to v2.0.4

(current release was already v2.0.3)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d663973..226206d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>org.exist-db.apps</groupId>
     <artifactId>monex</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
 
     <name>Monex</name>
     <description>An application for monitoring, profiling and inspecting a running eXist-db instance.</description>

From c0ba40eebb8c03770fe9f77c5704fbc95d018393 Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Fri, 30 Aug 2019 23:38:26 -0400
Subject: [PATCH 4/4] Add v2.0.4 release notes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(and copied over recent v1.x release notes since I think the “missing” release notes for 1.x series may’ve confused users - in addition to >0.9.6 breaking the remote console for them…)
---
 xar-assembly.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/xar-assembly.xml b/xar-assembly.xml
index 1e02e8f..1146cd7 100644
--- a/xar-assembly.xml
+++ b/xar-assembly.xml
@@ -162,6 +162,21 @@
                 <li>Repair for eXist 5.0.0 release</li>
             </ul>
         </change>
+        <change version="1.0.0">
+            <ul xmlns="http://www.w3.org/1999/xhtml">
+                <li>Version note: Due to changes in JMX output in eXist 5.x, Monex is now split into a 1.x branch for users of eXist 4.x and the develop branch will carry Monex 2.0 releases for users of eXist 5+</li>
+                <li>Improved: Monex is now built with maven</li>
+                <li>Improved: Removed dependency on Jetty. Monex now uses the standard Java WebSocket API.</li>
+                <li>Improved: Declared front end dependencies via npm.</li>
+                <li>Removed: HipChat module</li>
+                <li>Fixed: Javascript errors when loading various pages</li>
+            </ul>
+        </change>
+        <change version="1.0.1">
+            <ul xmlns="http://www.w3.org/1999/xhtml">
+                <li>Fixed: Installation of monex's test collection &amp; instances config files</li>
+            </ul>
+        </change>
         <change version="2.0.0">
             <ul xmlns="http://www.w3.org/1999/xhtml">
                 <li>Version note: Due to changes in JMX output in eXist 5, Monex is now split into a 1.x branch for users of eXist 4.x and the master branch will carry Monex 2.x releases for users of eXist 5+.</li>
@@ -187,6 +202,12 @@
                 <li>Fixed: Removed deprecated draft map constructor for compatibility with forthcoming eXist 5.0.0-RC8</li>
             </ul>
         </change>
+        <change version="2.0.4">
+            <ul xmlns="http://www.w3.org/1999/xhtml">
+                <li>Fixed: Moved integration tests into the source repository - <a href="https://github.com/eXist-db/monex/pull/96">#96</a></li>
+                <li>Fixed: Read product details from JMX output - <a href="https://github.com/eXist-db/monex/pull/99">#99</a></li>
+            </ul>
+        </change>
     </changelog>
 
 </package>