Skip to content

Commit

Permalink
Merge branch 'main' into sanitize-adr-inputs
Browse files Browse the repository at this point in the history
  • Loading branch information
rocketstack-matt authored Mar 2, 2025
2 parents 8e7afdf + c776869 commit 1576ba9
Show file tree
Hide file tree
Showing 12 changed files with 1,349 additions and 2,136 deletions.
12 changes: 11 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@

/cli/ @aidanm3341 @lbulanti-ms @willosborne @grahampacker-ms @jpgough-ms @rocketstack-matt @Thels

/calm-visualizer/ @oliviajanejohns @aidanm3341 @aamanrebello @yoofitt96
/calm-visualizer/ @oliviajanejohns @aidanm3341 @jpgough-ms @rocketstack-matt

/shared/ @aidanm3341 @lbulanti-ms @willosborne @grahampacker-ms @jpgough-ms @rocketstack-matt @Thels

# Ownership for dependency-related files at the root level
/package.json @finos/architecture-as-code-maintainers
/package-lock.json @finos/architecture-as-code-maintainers
/pom.xml @finos/architecture-as-code-maintainers

# Ownership for dependency-related files across all subdirectories
**/package.json @finos/architecture-as-code-maintainers
**/package-lock.json @finos/architecture-as-code-maintainers
**/pom.xml @finos/architecture-as-code-maintainers
21 changes: 15 additions & 6 deletions .github/ISSUE_TEMPLATE/Feature_request.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
---
name: 🚀 Feature Request
about: I have a suggestion (and may want to implement it 🙂)
name: 📋 New Project Proposal
about: I have a new project proposal for the monorepo

---

## Feature Request

### Description of Problem:
...what *problem* are you trying to solve that the project doesn't currently solve?
...what feature will the new project have, and why do I want it?

...please resist the temptation to describe your request in terms of a solution. Job Story form ("When [triggering condition], I want to [motivation/goal], so I can [outcome].") can help ensure you're expressing a problem statement.
### Gap:
...describe why this feature doesn't fit into an existing project

### Potential Solutions:
...clearly and concisely describe what you want to happen. Add any considered drawbacks.
...provide clear detail of the intended implementation, including technology choices, fit of choices, etc.

... if you've considered alternatives, clearly and concisely describe those too.
### Onboarding Checklist
The below must be completed before a new project is accepted into the monorepo:
- [ ] `.github/CODEOWNERS` is updated to add your new module. You should use GitHub Teams for this rather than individuals.
- [ ] Ensure workflow actions are added to `.github/workflows` that build/verify the module for any PR's with it in its blast radius. For example if your module depends on shared it should trigger build/tests on shared changes.
- [ ] `README.md` updated with new module and owners.
- [ ] If it's a typescript module - add into the root level `package.json` under `workspaces:` so that we can hoist shared dependencies and allow root level installs/builds etc.
- [ ] New module should have a `README.md` documenting what the module does - how to develop for it and any other sort of contribution guidelines.
- [ ] If the new module requires a new label for PR clarity ( https://github.com/finos/architecture-as-code/issues/783 ) - add this into `.github/labeler.yml` and if this is a new label please manually create it on GitHub.
- [ ] Update the docs to include details of the new project for consumers.
90 changes: 0 additions & 90 deletions .github/workflows/meetings.yml

This file was deleted.

6 changes: 3 additions & 3 deletions calm-hub/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -243,19 +243,19 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.20.4</version>
<version>1.20.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mongodb</artifactId>
<version>1.20.4</version>
<version>1.20.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>1.20.4</version>
<version>1.20.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
18 changes: 9 additions & 9 deletions calm-hub/src/main/webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion calm-hub/src/main/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"css-what": "6.1.0",
"express": "4.21.2",
"nth-check": "2.1.1",
"postcss": "8.5.1"
"postcss": "8.5.3"
},
"proxy": "http://127.0.0.1:8080/",
"eslintConfig": {
Expand Down
Loading

0 comments on commit 1576ba9

Please sign in to comment.