Skip to content

Integrate the published v1.5.0-rc.1 candidate into main - #2

Merged
antonioclim merged 6 commits into
mainfrom
audit/v1.5.0-remediation
Nov 18, 2026
Merged

antonioclim merged 6 commits into
mainfrom
audit/v1.5.0-remediation

Conversation

@antonioclim

Copy link
Copy Markdown
Owner

Purpose

The default branch still points to the preserved v1.4.0 baseline. The six-commit remediation candidate is already available as the verified v1.5.0-rc.1 pre-release. This PR proposes making that candidate the current source on main, while retaining its documented candidate status and outstanding native acceptance.

Exact source identities

  • Base: main at 8b10df86bdd9dae33a7aa82beb580fa449c530ea.
  • Head: audit/v1.5.0-remediation at 865bb26730bfddb44b3189252203e4dd3cce0e78.
  • Candidate tree: 2ffddb92b6d730cae31973ab6e34efe4dfb246e8, containing 1,349 tracked files.
  • Published reference: v1.5.0-rc.1.

Included changes

  • Reconcile course materials, executable examples, quizzes and project evidence requirements; correct documented protocol, framing, connection-ownership, grading, export and presentation defects.
  • Apply the approved Option A licence policy: Category A remains CC BY-NC-SA 4.0, Category B remains GPL-3.0-or-later, and the exact C84 list, existing grants and third-party terms remain preserved. F3-R14 is resolved for that approved policy. The current administrative inventory is A945/B320/C84; the approved base snapshot was A939/B320/C84.
  • Integrate the dated comparative evidence corpus and the separately evidenced Kotlin/JVM component result with their original scope and provenance.
  • Preserve the common source QA gate and the corrected workbook text layout and persistent print pagination.

This PR introduces no additional source changes beyond the published candidate.

Verification and limits

Candidate CI run 44245345297 completed successfully on the exact head commit. The RC publication was verified against that commit and tree, its complete release body and all three attached metadata assets. These existing results are not reattributed to a new execution. Any CI automatically triggered for this PR or the merged main commit is recorded separately.

The remediation record retains the native gates. Browser interaction, workbook GUI/Excel, host/guest and Windows/WSL routes, complete Docker and Mininet/OVS/OS-Ken scenarios, real capture/transfer and LMS use remain open. Workbook X01 and X03 remain PARTIAL; X02 and X04–X06 remain NOT_RUN. The recorded default Calc PDF has 125 checked pages; its adverse pagination/link observations remain recorded. F3-R15 remains partially open for historical score derivation and original source provenance.

Integration boundary

Approval and merge of this PR concern the default source branch only. They do not declare complete native acceptance or publish stable v1.5.0. The README continues to identify a v1.5.0 candidate. The preserved v1.4.0 tag/release and the published v1.5.0-rc.1 tag/release retain their exact identities. The independently versioned MININET-SDN appliance and Zenodo record are unchanged; no OVA is required for this integration.

Before merging, re-read both branch tips and apply the repository's actual required checks and protections. Preserve the candidate history with a regular merge. If the base and head remain the identities above, verify that the resulting main tree equals the candidate tree, then record the actual merge commit and any automatically triggered CI result. Branch movement or a new conflict requires focused reconciliation before integration.

Authorisation

On 18 November 2026, the maintainer explicitly authorised creation of this PR and integration of commit 865bb26730bfddb44b3189252203e4dd3cce0e78 into main, subject to GitHub protections and verification of the result. The authorisation preserves existing tags and releases, candidate status and outstanding native acceptance. It excludes publication of stable v1.5.0 and changes to Zenodo.

Reconcile executable examples, lecture and seminar protocols, quiz feedback, project evidence and the verification workbook. Repair framing, connection ownership, failure propagation, export structure and HTML control state. Align CI, local QA and committed-source packaging and record remediation evidence for the 203 audit finding families.

Preserve v1.4.0 and the independently versioned MININET-SDN appliance. Native VM/Docker/Mininet, Windows, browser, LMS and desktop spreadsheet acceptance remains pending. The licence policy decision and comparative-study evidence are explicitly unresolved.
Add the frozen 18-unit, 180-cell public-material comparison and its dated source provenance. Preserve the historical report, scores and comparison anchor.

Record candidate-branch integration separately from the earlier local study. Keep F3-R15 historical provenance, the author licence decision and native acceptance gates open; preserve runtime files and workflow configuration.
Publish the frozen N08 protocol, optional verifier and retained compiler/loopback evidence for input commit 7c79582.

Record the original port-8080 fragment and the explicitly derived port-50081 probe without changing the teaching source. Preserve historical F3-R13 evidence, licence terms and workflow configuration. VM and other environment acceptance gates remain open.
Apply the exact reconciled policy approved by Antonio Clim on 17 November 2026, preserving the 84 reserved paths, existing grants and third-party terms.

Record the actual approval and the resolved F3-R14 policy status, align README citation wording and retain the earlier decision history. Add the unmodified standard licence texts.

The change preserves runtime sources, prior N08 evidence and native acceptance gates. It does not merge main, create a tag or release, or modify Zenodo.
…ceptance

Preserve assessment content, licence decisions and unexecuted native gates.
Record baseline print failure, the bounded repair and remaining X03 defects.
Apply the confirmed paper, margins, print areas and repeated headings while preserving all non-print workbook bytes. Record the 125-page default Calc PDF review and retain the adverse exported-link observations.

Keep the prior N06 evidence and all 203 finding statuses. Complete GUI/Excel acceptance remains open; no main, tag or release change.
@antonioclim
antonioclim merged commit d7a4cce into main Nov 18, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant