Update version number to 10.0.2 (#1711)

* Update version number to 10.0.2 Release prep for the 10.0.2 version. --------- Co-authored-by: Ryan Rathsam <[email protected]>
ubccr · Apr 6, 2023 · 75f8905 · 75f8905
1 parent 60d97c8
commit 75f8905
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Open XDMoD Change Log
 
+## 2023-04-03 v10.0.2
+- Bug Fixes
+    -  General
+        - Added a helper script that runs chromium to generate images. This will allow us to support headless chromium v111 and later ([\#1704](https://github.com/ubccr/xdmod/pull/1704))
+- Uncategorized
+    - General
+        - Updated documentation about our supported versions, including dates ([\#1707](https://github.com/ubccr/xdmod/pull/1707))
+        - Updated our grant numbers and language to match NSF requirements ([\#1702](https://github.com/ubccr/xdmod/pull/1702))
+
 ## 2023-03-10 v10.0.1
 
 - Bug Fixes

diff --git a/bin/xdmod-upgrade b/bin/xdmod-upgrade
@@ -27,7 +27,8 @@ ini_set('memory_limit', -1);
  */
 $supportedUpgrades = array(
     '9.5.0' => '10.0.0',
-    '10.0.0' => '10.0.1'
+    '10.0.0' => '10.0.1',
+    '10.0.1' => '10.0.2'
 );
 
 /**

diff --git a/classes/OpenXdmod/Migration/Version1001To1002/ConfigFilesMigration.php b/classes/OpenXdmod/Migration/Version1001To1002/ConfigFilesMigration.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Update config files from version 10.0.1 To 10.0.2.
+ */
+
+namespace OpenXdmod\Migration\Version1001To1002;
+
+use OpenXdmod\Migration\ConfigFilesMigration as AbstractConfigFilesMigration;
+
+class ConfigFilesMigration extends AbstractConfigFilesMigration
+{
+
+    /**
+     * Update portal_settings.ini with the new version number.
+     */
+    public function execute()
+    {
+        $this->assertPortalSettingsIsWritable();
+        $this->writePortalSettingsFile();
+    }
+}
diff --git a/configuration/portal_settings.ini b/configuration/portal_settings.ini
@@ -6,7 +6,7 @@ contact_page_recipient = ""
 tech_support_recipient = ""
 
 ; The version number is updated during the upgrade process.
-version = "10.0.1"
+version = "10.0.2"
 
 debug_mode = "off"
 debug_recipient = ""

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -37,7 +37,7 @@ defaults:
     values:
       layout: "page"
       prev_sw_version: "9.5.0"
-      sw_version: "10.0.1"
+      sw_version: "10.0.2"
       style: "effervescence"
       tocversion: "toc"
 

diff --git a/docs/software-requirements.md b/docs/software-requirements.md
@@ -86,6 +86,17 @@ start after a reboot unless you have configured them to do so.
 
 **NOTE**: APCu is optional, but highly recommended as it provides enhanced performance.
 
+### Rocky 8+
+
+**NOTE**: as of XDMoD 10.0.2 there are some additional software requirements for EL8 systems. Specifically, we are
+utilizing dnf modules to ensure that we can provide specific versions of our requirements. You will need to run the
+following before installing or upgrading to 10.0.2.
+
+```shell
+dnf module -y reset nodejs
+dnf module -y install nodejs:16
+```
+
 Additional Notes
 ----------------
 

diff --git a/docs/upgrade.md b/docs/upgrade.md
@@ -144,5 +144,13 @@ headless chromium (used for image export and report generation).
 
 You may upgrade directly from 9.5.0 or 10.0.0
 
+10.0.2 Upgrade Notes
+-------------------
+
+Open XDMoD 10.0.2 is a bug fix release that fixes a compatibility issue with
+headless chromium ( use for image export and report generation).
+
+You may upgrade directly from 9.5.0, 10.0.0, or 10.0.1
+
 [github-latest-release]: https://github.com/ubccr/xdmod/releases/latest
 [mysql-config]: configuration.md#mysql-configuration
diff --git a/html/about/release_notes/xdmod.html b/html/about/release_notes/xdmod.html
@@ -2,13 +2,24 @@ <h1>Open XDMoD Release Notes</h1>
 
 <p>Below is a list of Open XDMoD releases with major features and bug fixes listed.</p>
 
-<h2>Version 10.0.0 (2022-03-10)</h2>
+<h2>Version 10.0.2 (2022-04-03)</h2>
+<ul>
+    <li>Bug Fixes</li>
+    <ul>
+        <li>General</li>
+        <ul>
+            <li>Update image export for compatibility with headless chromium 111 or later</li>
+        </ul>
+    </ul>
+</ul>
+
+<h2>Version 10.0.1 (2022-03-17)</h2>
 <ul>
     <li>Bug Fixes</li>
     <ul>
-        <li>ETL</li>
+        <li>General</li>
         <ul>
-            <li>Update image export for compatilibity with headless chromium 109 or later</li>
+            <li>Update image export for compatibility with headless chromium 109 or later</li>
         </ul>
     </ul>
 </ul>

diff --git a/open_xdmod/modules/xdmod/build.json b/open_xdmod/modules/xdmod/build.json
@@ -1,6 +1,6 @@
 {
     "name": "xdmod",
-    "version": "10.0.1",
+    "version": "10.0.2",
     "release": "1.0",
     "files": {
         "include_paths": [

diff --git a/open_xdmod/modules/xdmod/xdmod.spec.in b/open_xdmod/modules/xdmod/xdmod.spec.in
@@ -100,6 +100,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %attr(0570,apache,xdmod) %{xdmod_export_dir}
 
 %changelog
+* Mon Apr 3 2023 XDMoD <[email protected]> 10.0.2-1.0
+    - Release 10.0.2
 * Fri Mar 10 2023 XDMoD <[email protected]> 10.0.1-1.0
     - Release 10.0.1
 * Thu Mar 10 2022 XDMoD <[email protected]> 10.0.0-1.0