Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for xdmod10.5.1 release #1971

Open
wants to merge 5 commits into
base: xdmod10.5
Choose a base branch
from
Open

Prepare for xdmod10.5.1 release #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebbd9e0
Changes in preperation for v10.5.1-1.0 release
ryanrath Feb 4, 2025
b8973bd
changing from 11.0.0 to 10.5.1
ryanrath Feb 4, 2025
115195b
Missed the spec file change
ryanrath Feb 4, 2025
0fc90f7
read, what read?
ryanrath Feb 4, 2025
e1a9d25
Adding upgrade related changes
ryanrath Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Open XDMoD Change Log

# 2025-02-04 v10.5.1
- Bug Fixes
- Updated jQuery to version 3.7.1 to address CVE-2020-11023
Comment on lines +3 to +5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# 2025-02-04 v10.5.1
- Bug Fixes
- Updated jQuery to version 3.7.1 to address CVE-2020-11023
## 2025-02-04 v10.5.1
- Bug Fixes
- Update jQuery to version 3.7.1 to address CVE-2020-11023 ([\#1970](https://github.com/ubccr/xdmod/pull/1970)).


## 2023-09-11 v10.5.0
- Bug Fixes
- Cloud
Expand Down
3 changes: 2 additions & 1 deletion bin/xdmod-upgrade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ $supportedUpgrades = array(
'10.0.0' => '10.0.1',
'10.0.1' => '10.0.2',
'10.0.2' => '10.0.3',
'10.0.3' => '10.5.0'
'10.0.3' => '10.5.0',
'10.5.0' => '10.5.1'
);

/**
Expand Down
25 changes: 25 additions & 0 deletions classes/OpenXdmod/Migration/Version1050To1051/ConfigFilesMigration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php
/**
* Update config files from version 10.0.3 to 10.5.0.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Update config files from version 10.0.3 to 10.5.0.
* Update config files from version 10.5.0 to 10.5.1.

*/

namespace OpenXdmod\Migration\Version1050To1051;

use OpenXdmod\Migration\ConfigFilesMigration as AbstractConfigFilesMigration;
use OpenXdmod\Setup\Console;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
use OpenXdmod\Setup\Console;

Appears to be unused.


class ConfigFilesMigration extends AbstractConfigFilesMigration
{

/**
* Update portal_settings.ini with the new version number.
*/
public function execute()
{
$this->assertPortalSettingsIsWritable();
$this->assertModulePortalSettingsAreWritable();

$this->writePortalSettingsFile();
$this->writeModulePortalSettingsFiles();
}
}
22 changes: 22 additions & 0 deletions classes/OpenXdmod/Migration/Version1050To1051/DatabasesMigration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php
/**
* Update database from version 10.0.3 to 10.5.0.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Update database from version 10.0.3 to 10.5.0.
* Update database from version 10.5.0 to 10.5.1.

*/

namespace OpenXdmod\Migration\Version1050To1051;

use OpenXdmod\Migration\DatabasesMigration as AbstractDatabasesMigration;
use OpenXdmod\Setup\Console;
use CCR\DB;
use ETL\Utilities;
Comment on lines +9 to +11
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
use OpenXdmod\Setup\Console;
use CCR\DB;
use ETL\Utilities;

Appear to be unused.


/**
* Migrate databases from version 10.5.0 to 10.5.1.
*/
class DatabasesMigration extends AbstractDatabasesMigration
{
public function execute()
{
parent::execute();
}
}
2 changes: 1 addition & 1 deletion configuration/portal_settings.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ contact_page_recipient = ""
tech_support_recipient = ""

; The version number is updated during the upgrade process.
version = "10.5.0"
version = "10.5.1"

debug_mode = "off"
debug_recipient = ""
Expand Down
12 changes: 11 additions & 1 deletion html/about/release_notes/xdmod.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
<h1>Open XDMoD Release Notes</h1>

<p>Below is a list of Open XDMoD releases with major features and bug fixes listed.</p>

<h2 id="2025-02-04-v10-5-1">2025-02-04 v10.5.1</h2>
<ul>
<li><p>Bug Fixes</p>
<ul>
<li>Security<ul>
<li>Update jQuery to version 3.7.1 to address CVE-2020-11023</li>
</ul>
</li>
</ul>
</li>
Comment on lines +6 to +13
Copy link
Contributor

@aaronweeden aaronweeden Feb 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<li><p>Bug Fixes</p>
<ul>
<li>Security<ul>
<li>Update jQuery to version 3.7.1 to address CVE-2020-11023</li>
</ul>
</li>
</ul>
</li>
<li><p>Bug Fixes</p><ul>
<li>Security<ul>
<li>Update jQuery to version 3.7.1 to address CVE-2020-11023.</li>
</ul></li>
</ul></li>
<li><p>Optional Modules</p><ul>
<li><p>Application Kernels</p><ul>
<li>Bug Fixes<ul>
<li>Fix PHP error when calculating control regions.</li>
</ul></li>
</ul></li>
<li><p>Job Performance (SUPReMM)</p><ul>
<li>Security<ul>
<li>Update jQuery to version 3.7.1 to address CVE-2020-11023.</li>
</ul></li>
<li>Miscellaneous<ul>
<li>Update jsPlumb dependency.</li>
</ul></li>
</ul></li>
</ul></li>

</ul>
<h2 id="2023-09-11-v10-5-0">2023-09-11 v10.5.0</h2>
<ul>
<li><p>Bug Fixes</p>
Expand Down
2 changes: 1 addition & 1 deletion open_xdmod/modules/xdmod/build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xdmod",
"version": "10.5.0",
"version": "10.5.1",
"release": "1.0",
"files": {
"include_paths": [
Expand Down