Merge Latest Release Tag into Develop Branch #1830

Objective

Merge the latest released tag (v1.3.x or v1.4.x, as applicable) into the develop branch while ensuring version updates, conflict resolution guidelines, documentation updates, and validation activities are completed consistently across all repositories.

Scope of Work

1. Merge Release Tag into Develop

Merge the latest release tag into the develop branch and resolve conflicts according to the guidelines below.

Version Updates

• Update all module versions to 1.4.0-SNAPSHOT.
• For key-manager, update the version to 1.5.0-SNAPSHOT.
• For api-test, update only the SNAPSHOT version. Do not bring any additional code changes from the release branch as it is already aligned with develop.

Conflict Resolution Guidelines

• Prioritize changes from the latest released tag (v1.3.x or v1.4.x) while resolving merge conflicts.
• If newer functional enhancements or bug fixes already exist in the develop branch, evaluate them carefully and retain them where appropriate.
• For infrastructure-related files and configurations (e.g., Helm charts, deployment configurations):
  • Retain the chart version currently present in the develop branch.
  • Apply only the required updates from the release tag (such as resource configurations, javaOpts, configuration improvements, etc.).
  • Do not modify chart versions unless explicitly instructed.

2. Generate Project Agent Documentation

Perform the following steps after the merge:

1. Create an AGENTS.md file in the root directory of the repository.

2. Run the Claude /init command.

3. Provide the MOSIP documentation link:

   https://docs.mosip.io/1.2.0/id-lifecycle-management

4. Allow Claude to generate the project overview document (Claude.md).

5. Rename the generated Claude.md file to AGENTS.md.

6. Review the generated content and ensure it accurately reflects the repository context.

3. Validation

Perform comprehensive validation before raising the PR.

Build Validation

• Verify that the project builds successfully.
• Ensure there are no compilation or dependency issues.

Functional Validation

• Validate key application flows affected by the merge.
• Verify that no regressions have been introduced.

Configuration Validation

• Verify all configuration and deployment files.
• Confirm infrastructure-related updates have been applied correctly without altering chart versions.

PR Review Readiness

• Review all changed files before creating the PR.
• Remove any unintended or unrelated changes.
• Ensure the PR contains only the required merge and version update changes.

Deliverables

• Latest release tag successfully merged into develop.
• Versions updated as per the guidelines.
• AGENTS.md added to the repository root.
• Build and functional validation completed successfully.
• PR raised with a clean and review-ready change set.

Definition of Done

• Latest release tag merged into develop.
• SNAPSHOT versions updated correctly.
• Merge conflicts resolved as per guidelines.
• Infrastructure configuration changes reviewed and validated.
• AGENTS.md created and committed.
• Build validation completed successfully.
• Functional validation completed successfully.
• PR reviewed for unintended changes.
• Pull Request created and ready for review.

References

Document to track the merge repository wise