Skip to content

AMP-31192 : Fix external buildability (HTTPS submodules/deps, remove proprietary headers) - #4504

Open
fferreyra wants to merge 2 commits into
developfrom
fix/develop/amp-31192-external-build-https
Open

AMP-31192 : Fix external buildability (HTTPS submodules/deps, remove proprietary headers)#4504
fferreyra wants to merge 2 commits into
developfrom
fix/develop/amp-31192-external-build-https

Conversation

@fferreyra

Copy link
Copy Markdown
Contributor

Summary

Enables external contributors to clone and build the project without SSH keys or privileged access (AMP-31192).

Changes

  • .gitmodules — converted the three submodule URLs (amp-boilerplate, amp-translate, amp-filter) from SSH (git@github.com:) to HTTPS; the repos are public now.
  • Proprietary license headers — removed the legacy "Confidential and Proprietary / Unauthorized Disclosure Prohibited" comment blocks from 15 Java files, which conflict with the repo's GPLv3 license. GPL headers preserved where present; delete-only, no replacements.
  • npm git dependencies — replaced github: shorthand and dead git:// specifiers with explicit git+https:// URLs in 6 package.json files, and rewrote git+ssh:// resolved URLs in 4 package-lock.json files (reampv2, reamp, amp-settings, dashboard/dev). Pinned commit SHAs are unchanged — protocol swap only, zero version drift. Lockfile-recorded specs were updated in sync so npm ci accepts them.

Verification

  • All 8 git-dependency repos confirmed publicly reachable over HTTPS (git ls-remote)
  • npm ci --dry-run passes for reampv2 (3122 packages) and amp-settings (737 packages)
  • All touched JSON files parse; repo-wide grep finds no remaining SSH/git-protocol install specs
  • Note: npm ci --dry-run for reamp and dashboard/dev fails locally identically on pristine develop (legacy webpack-1 peer conflict; Linux-generated lockfiles under npm 11) — pre-existing, unrelated to this change

Notes for reviewers

  • Existing local clones need git submodule sync after merge
  • Suggested final check: fresh git clone --recurse-submodules + Maven build as an outside user
  • Follow-ups in other repos: transitive git deps are declared in the amp-ui / amp-settings GitHub repos' package.json files, and the submodule repos' own lockfiles may need the same treatment

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR aims to make the repository buildable for external contributors by removing SSH-only/proprietary access requirements: switching git references to HTTPS and removing legacy proprietary headers that conflict with GPLv3.

Changes:

  • Converted git submodule URLs from SSH (git@github.com:) to HTTPS in .gitmodules.
  • Rewrote npm git dependency specifiers away from github: shorthand / git:// / git+ssh:// to HTTPS-based URLs and updated corresponding lockfiles.
  • Removed legacy “Confidential and Proprietary / Unauthorized Disclosure Prohibited” header blocks from a set of Java files (delete-only).

Reviewed changes

Copilot reviewed 22 out of 26 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
.gitmodules Switches submodule URLs from SSH to HTTPS.
amp/TEMPLATE/reampv2/packages/user-manager/package.json Updates amp-boilerplate dependency to git+https.
amp/TEMPLATE/reampv2/packages/reampv2-app/package.json Updates multiple devgateway git dependencies to git+https.
amp/TEMPLATE/reampv2/packages/container/package.json Updates amp-boilerplate dependency to git+https.
amp/TEMPLATE/reampv2/packages/ampoffline/package.json Updates amp-boilerplate dependency to git+https.
amp/TEMPLATE/reampv2/package-lock.json Updates resolved git URLs to HTTPS for devgateway deps and amp-translate.
amp/TEMPLATE/reamp/package.json Updates amp-ui git dependency to git+https.
amp/TEMPLATE/reamp/package-lock.json Updates resolved/spec git URLs to HTTPS for amp-ui and related git deps.
amp/TEMPLATE/ampTemplate/dashboard/dev/package.json Replaces git:// dependency URL with git+https.
amp/TEMPLATE/ampTemplate/dashboard/dev/package-lock.json Updates resolved git URL to HTTPS for nvd3.
amp/TEMPLATE/ampTemplate/amp-settings/package-lock.json Updates amp-translate resolution to HTTPS.
amp/src/main/java/org/digijava/module/um/util/DbUtil.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/module/um/form/UserRegisterForm.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/module/um/form/AddUserForm.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/module/editor/taglib/EditTag.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/module/common/util/ModuleUtil.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/module/common/util/ModuleEmailManager.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/module/common/util/DateTimeUtil.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/module/common/util/BBCodeParser.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/module/common/exception/BBCodeException.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/module/common/dbentity/ModuleTeaser.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/module/common/dbentity/ItemStatus.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/module/common/action/PaginationForm.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/module/common/action/PaginationAction.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/ViewConfigImpl.java Removes legacy proprietary header block.
amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/TemplateViewConfigImpl.java Removes legacy proprietary header block.
Files not reviewed (4)
  • amp/TEMPLATE/ampTemplate/amp-settings/package-lock.json: Generated file
  • amp/TEMPLATE/ampTemplate/dashboard/dev/package-lock.json: Generated file
  • amp/TEMPLATE/reamp/package-lock.json: Generated file
  • amp/TEMPLATE/reampv2/package-lock.json: Generated file

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines 11 to 13
"dependencies": {
"amp-translate": "github:devgateway/amp-translate"
"amp-translate": "https://github.com/devgateway/amp-translate.git"
},
"amp-translate": {
"version": "git+ssh://git@github.com/devgateway/amp-translate.git#c169447fb1cfd728259830ac5564d6dbf31a5380",
"version": "git+https://github.com/devgateway/amp-translate.git#c169447fb1cfd728259830ac5564d6dbf31a5380",
"from": "amp-translate@github:devgateway/amp-translate",
Comment thread amp/TEMPLATE/reamp/package-lock.json Outdated
Comment thread amp/TEMPLATE/ampTemplate/dashboard/dev/package-lock.json Outdated
Update the legacy npm-v6-compat "from" fields and one inconsistent
package spec that were missed when converting git dependencies to
git+https:// — flagged by review on PR #4504.
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.

3 participants