Skip to content

Hackathon#508

Open
CDiezRodriguez wants to merge 12 commits intomainfrom
HACKATHON
Open

Hackathon#508
CDiezRodriguez wants to merge 12 commits intomainfrom
HACKATHON

Conversation

@CDiezRodriguez
Copy link
Copy Markdown
Contributor

WHAT

Briefly describe what your PR changes, which features it adds/modifies.

WHY

Briefly state why the change was necessary.

FURTHER NOTES

List other areas of code that have changed but are not necessarily linked to the main feature. This could be method signature changes, package declarations, bugs that were encountered and were fixed inline, etc.

Closes # <-- insert Issue number if one exists

@github-actions
Copy link
Copy Markdown

🧪 Test Summary

🎉 Status: SUCCESS

📊 Backend Tests

Passed Failed Total Coverage
✅ 147 ❌ 0 📋 147 📈 57.19%
Run Details
  • Branch: 508/merge
  • Commit: 314685e01fbf609d2413a6f41a431941e479405c
  • Trigger: pull_request

@matbmoser
Copy link
Copy Markdown
Contributor

@copilot please resolve conflicts

@matbmoser matbmoser marked this pull request as ready for review April 14, 2026 07:30
@matbmoser matbmoser self-requested a review as a code owner April 14, 2026 07:30
@matbmoser
Copy link
Copy Markdown
Contributor

@CDiezRodriguez please provide input to this PR.

# Conflicts:
#	charts/industry-core-hub/values.yaml
#	deployment/local/docker-compose/docker-compose.yml
#	ichub-backend/config/configuration.yml

Co-authored-by: matbmoser <71728767+matbmoser@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 14, 2026

@copilot please resolve conflicts

Conflicts resolved in commit 727767a4. Here's what was done:

  • charts/industry-core-hub/values.yaml: kept the hostname field from the HACKATHON branch while also incorporating the agreements comment from main
  • deployment/local/docker-compose/docker-compose.yml: brought in the keycloak-init and keycloak services from main (along with the keycloak_import volume)
  • ichub-backend/config/configuration.yml: kept hackathon-specific URLs (connector, DTR, submodel dispatcher) while adopting the new JSON-LD policy format (permissions/prohibitions/obligations) from main and removing the deprecated old-style governance section

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