From d5503aa7c02ceffbe941556bf6b056d28d8ad0cc Mon Sep 17 00:00:00 2001
From: bikegeek <minnawin@ucar.edu>
Date: Fri, 18 Oct 2024 10:52:30 -0600
Subject: [PATCH 1/2] Issue #550 update versions for releasing beta6

---
 build.xml                          |  2 +-
 docs/Users_Guide/release-notes.rst | 17 +++++++++++++++++
 docs/conf.py                       |  6 +++---
 docs/version                       |  2 +-
 webapp/metviewer/metviewer1.jsp    |  2 +-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 0a0eb8c7..c355fae3 100644
--- a/build.xml
+++ b/build.xml
@@ -362,7 +362,7 @@
         </copy>
         <delete file="${build}/MANIFEST.MF"/>
         <manifest file="${build}/MANIFEST.MF">
-            <attribute name="Specification-Version" value="6.0.0-beta6-dev"/>
+            <attribute name="Specification-Version" value="6.0.0-beta6"/>
         </manifest>
 
         <jar jarfile="${dist}/lib/metviewer.jar" basedir="${build}" manifest="${build}/MANIFEST.MF">
diff --git a/docs/Users_Guide/release-notes.rst b/docs/Users_Guide/release-notes.rst
index cc36f9a0..12180bdd 100644
--- a/docs/Users_Guide/release-notes.rst
+++ b/docs/Users_Guide/release-notes.rst
@@ -9,6 +9,23 @@ When applicable, release notes are followed by the GitHub issue number which
 describes the bugfix, enhancement, or new feature:
 https://github.com/dtcenter/METviewer/issues
 
+Version `v6.0.0-beta6 <https://github.com/dtcenter/METviewer>`_ release notes (20241018)
+----------------------------------------------------------------------------------------
+
+  .. dropdown:: New Features
+
+
+  .. dropdown::  Enhancements
+
+git checkout -b feature_
+
+  .. dropdown:: Bugfixes
+
+
+  .. dropdown:: Internal
+
+
+
 Version `v6.0.0-beta5 <https://github.com/dtcenter/METviewer>`_ release notes (20240710)
 ----------------------------------------------------------------------------------------
 
diff --git a/docs/conf.py b/docs/conf.py
index 98fb367b..e77424e5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,12 +19,12 @@
 
 project = 'METviewer'
 author = 'UCAR/NCAR'
-author_list = "Burek, T., T. Jensen, L. Goodrich, J. Prestopnik, L. Blank, and T. Fowler"
-version = "develop"
+author_list = "Burek, T., T. Jensen, I. Srivastava, M. Win-Gildenmeister, L. Goodrich, J. Prestopnik, L. Blank, and T. Fowler"
+version = "3.0.0-beta6"
 verinfo = version
 release = f'{version}'
 release_year = '2024'
-release_date = f'{release_year}-07-10'
+release_date = f'{release_year}-10-18'
 copyright = f'{release_year}, {author}'
 
 
diff --git a/docs/version b/docs/version
index 4ba6860f..8d447f3a 100644
--- a/docs/version
+++ b/docs/version
@@ -1 +1 @@
-6.0.0-beta6-dev
+6.0.0-beta6
diff --git a/webapp/metviewer/metviewer1.jsp b/webapp/metviewer/metviewer1.jsp
index ea1dcd19..654cd420 100644
--- a/webapp/metviewer/metviewer1.jsp
+++ b/webapp/metviewer/metviewer1.jsp
@@ -258,7 +258,7 @@
 <div id="header" style="overflow: visible; position: static ">
 
   <div class="toolbar ui-widget" id="toolbar ">
-    <div style="float: left; cursor: alias;font-family: 'Arial Black',Gadget,sans-serif;text-align: left;" >METviewer 6.0.0-beta5-dev
+    <div style="float: left; cursor: alias;font-family: 'Arial Black',Gadget,sans-serif;text-align: left;" >METviewer 6.0.0-beta6
       <span id="release" class="ui-icon ui-icon-info " style="float: right;margin-left: .4em;"></span>
       <br><a href="https://www.ucar.edu/accessibility" class="web-acc-st">Web Accessibility Statement</a>
     </div>

From 37f72fec84a0598e991f412cd139f6079a1607d4 Mon Sep 17 00:00:00 2001
From: Julie Prestopnik <jpresto@ucar.edu>
Date: Fri, 18 Oct 2024 11:06:34 -0600
Subject: [PATCH 2/2] Per #550, update release notes

---
 docs/Users_Guide/release-notes.rst | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/Users_Guide/release-notes.rst b/docs/Users_Guide/release-notes.rst
index 12180bdd..6a0d12df 100644
--- a/docs/Users_Guide/release-notes.rst
+++ b/docs/Users_Guide/release-notes.rst
@@ -14,16 +14,21 @@ Version `v6.0.0-beta6 <https://github.com/dtcenter/METviewer>`_ release notes (2
 
   .. dropdown:: New Features
 
-
+     None
+		
   .. dropdown::  Enhancements
 
-git checkout -b feature_
-
+     * **Enhance METviewer to plot statistics added to the ECNT, VL1L2, VAL1L2, and VCNT linetypes introduced in the MET 12.0.0 beta4 dev cycle** (`#517 <https://github.com/dtcenter/METviewer/issues/517>`_)
+       
   .. dropdown:: Bugfixes
 
-
+     None
+		
   .. dropdown:: Internal
 
+     * **METviewer: Add a unique identifier in order to distinguish itself from other application logs** (`METplus-Internal#29 <https://github.com/dtcenter/METplus-internal/issues/29>`_)
+     * METviewer: Adjust SonarQube for “false positive” METviewer vulnerabilities (`METplus-Internal#60 <https://github.com/dtcenter/METplus-internal/issues/60>`_)  
+     * Add testing.yaml testing workflow (`#539 <https://github.com/dtcenter/METviewer/issues/539>`_)   
 
 
 Version `v6.0.0-beta5 <https://github.com/dtcenter/METviewer>`_ release notes (20240710)
@@ -32,7 +37,7 @@ Version `v6.0.0-beta5 <https://github.com/dtcenter/METviewer>`_ release notes (2
 
   .. dropdown:: New Features
 
-     * Add GitHub action to run SonarQube for METviewer pull requests and feature branches(`#521 <https://github.com/dtcenter/METviewer/issues/521>`_)
+     * Add GitHub action to run SonarQube for METviewer pull requests and feature branches (`#521 <https://github.com/dtcenter/METviewer/issues/521>`_)
 
 
   .. dropdown::  Enhancements