Skip to content

Commit

Permalink
Merge branch 'main' into TheJuanAndOnly99-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
rocketstack-matt authored May 20, 2024
2 parents fd21912 + 97ae376 commit 3e1d00f
Show file tree
Hide file tree
Showing 33 changed files with 100 additions and 100 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
* @finos-labs/architecture-as-code-maintainers
* @finos/architecture-as-code-maintainers

/calm/ @finos-labs/architecture-as-code-maintainers
/calm/ @finos/architecture-as-code-maintainers

/cli/ @aidanm3341 @lbulanti-ms @willosborne @grahampacker-ms @jpgough-ms

Expand Down
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ This sign-off means you agree the commit satisfies the

### Prerequisites

* [ ] Have you [searched for duplicates](https://github.com/finos-labs/architecture-as-code/issues?utf8=%E2%9C%93&q=)? A simple search for exception error messages or a summary of the unexpected behaviour should suffice.
* [ ] Have you [searched for duplicates](https://github.com/finos/architecture-as-code/issues?utf8=%E2%9C%93&q=)? A simple search for exception error messages or a summary of the unexpected behaviour should suffice.
* [ ] Are you running the latest version?
* [ ] Are you sure this is a bug or missing capability?

### Raising an Issue
* Create your issue [here](https://github.com/finos-labs/architecture-as-code/issues/new).
* Create your issue [here](https://github.com/finos/architecture-as-code/issues/new).
* New issues contain two templates in the description: bug report and enhancement request. Please pick the most appropriate for your issue, **then delete the other**.
* Please also tag the new issue with either "Bug" or "Enhancement".
* Please use [Markdown formatting](https://help.github.com/categories/writing-on-github/)
Expand All @@ -28,7 +28,7 @@ To make review of PRs easier, please:

* Please make sure your PRs will merge cleanly - PRs that don't are unlikely to be accepted.
* For code contributions, follow the existing code layout.
* For documentation contributions, follow the general structure, language, and tone of the [existing docs](https://github.com/finos-labs/architecture-as-code/wiki).
* For documentation contributions, follow the general structure, language, and tone of the [existing docs](https://github.com/finos/architecture-as-code/wiki).
* Keep commits small and cohesive - if you have multiple contributions, please submit them as independent commits (and ideally as independent PRs too).
* Reference issues if your PR has anything to do with an issue (even if it doesn't address it).
* Minimise non-functional changes (e.g. whitespace).
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[![FINOS - Incubating](https://cdn.jsdelivr.net/gh/finos/contrib-toolbox@master/images/badge-incubating.svg)](https://finosfoundation.atlassian.net/wiki/display/FINOS/Incubating)
[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8821/badge)](https://www.bestpractices.dev/projects/8821)
[![CodeQL](https://github.com/finos-labs/architecture-as-code/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/finos-labs/architecture-as-code/actions/workflows/github-code-scanning/codeql)
[![CVE Scanning for Maven](https://github.com/finos-labs/architecture-as-code/actions/workflows/cve-scanning-maven.yml/badge.svg)](https://github.com/finos-labs/architecture-as-code/actions/workflows/cve-scanning-maven.yml)
[![CVE Scanning for Node.js](https://github.com/finos-labs/architecture-as-code/actions/workflows/cve-scanning-node.yml/badge.svg)](https://github.com/finos-labs/architecture-as-code/actions/workflows/cve-scanning-node.yml)
[![License Scanning for Maven](https://github.com/finos-labs/architecture-as-code/actions/workflows/license-scanning-maven.yml/badge.svg)](https://github.com/finos-labs/architecture-as-code/actions/workflows/license-scanning-maven.yml)
[![License Scanning for Node.js](https://github.com/finos-labs/architecture-as-code/actions/workflows/license-scanning-node.yml/badge.svg)](https://github.com/finos-labs/architecture-as-code/actions/workflows/license-scanning-node.yml)
[![CodeQL](https://github.com/finos/architecture-as-code/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/github-code-scanning/codeql)
[![CVE Scanning for Maven](https://github.com/finos/architecture-as-code/actions/workflows/cve-scanning-maven.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/cve-scanning-maven.yml)
[![CVE Scanning for Node.js](https://github.com/finos/architecture-as-code/actions/workflows/cve-scanning-node.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/cve-scanning-node.yml)
[![License Scanning for Maven](https://github.com/finos/architecture-as-code/actions/workflows/license-scanning-maven.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/license-scanning-maven.yml)
[![License Scanning for Node.js](https://github.com/finos/architecture-as-code/actions/workflows/license-scanning-node.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/license-scanning-node.yml)

# Architecture as Code

Expand All @@ -26,11 +26,11 @@ your project.

| Project | Lead Maintainers | Builds |
|----------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| [Common Architecture Language Model](./calm) | [@rocketstack-matt](https://github.com/rocketstack-matt), [@jpgough-ms](https://github.com/jpgough-ms) | [![Validation of CALM Samples](https://github.com/finos-labs/architecture-as-code/actions/workflows/spectral-validation.yml/badge.svg)](https://github.com/finos-labs/architecture-as-code/actions/workflows/spectral-validation.yml) |
| [Docs](./docs) | [@rocketstack-matt](https://github.com/rocketstack-matt) | [![Build Docs](https://github.com/finos-labs/architecture-as-code/actions/workflows/docs-deploy.yml/badge.svg)](https://github.com/finos-labs/architecture-as-code/actions/workflows/docs-deploy.yml) [![pages-build-deployment](https://github.com/finos-labs/architecture-as-code/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/finos-labs/architecture-as-code/actions/workflows/pages/pages-build-deployment) |
| [CLI](./cli) | [@jaidanm3341](https://github.com/aidanm3341), [@lbulanti-ms](https://github.com/lbulanti-ms), [@willosborne](https://github.com/willosborne), [@grahampacker-ms](https://github.com/grahampacker-ms) | [![Build CLI](https://github.com/finos-labs/architecture-as-code/actions/workflows/cli-tests.yml/badge.svg)](https://github.com/finos-labs/architecture-as-code/actions/workflows/cli-tests.yml) |
| [Spectral](./spectral) | [@willosborne](https://github.com/willosborne), [@lbulanti-ms](https://github.com/lbulanti-ms), [@grahampacker-ms](https://github.com/grahampacker-ms) | [![Validation of CALM Samples](https://github.com/finos-labs/architecture-as-code/actions/workflows/spectral-validation.yml/badge.svg)](https://github.com/finos-labs/architecture-as-code/actions/workflows/spectral-validation.yml) |
| [Translators](./translator) | [@Budlee](https://github.com/Budlee) [@matthewgardner](https://github.com/matthewgardner) [@jpgough-ms](https://github.com/jpgough-ms) | [![Build Translators](https://github.com/finos-labs/architecture-as-code/actions/workflows/translator.yml/badge.svg)](https://github.com/finos-labs/architecture-as-code/actions/workflows/translator.yml) |
| [Common Architecture Language Model](./calm) | [@rocketstack-matt](https://github.com/rocketstack-matt), [@jpgough-ms](https://github.com/jpgough-ms) | [![Validation of CALM Samples](https://github.com/finos/architecture-as-code/actions/workflows/spectral-validation.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/spectral-validation.yml) |
| [Docs](./docs) | [@rocketstack-matt](https://github.com/rocketstack-matt) | [![Build Docs](https://github.com/finos/architecture-as-code/actions/workflows/docs-deploy.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/docs-deploy.yml) [![pages-build-deployment](https://github.com/finos/architecture-as-code/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/pages/pages-build-deployment) |
| [CLI](./cli) | [@jaidanm3341](https://github.com/aidanm3341), [@lbulanti-ms](https://github.com/lbulanti-ms), [@willosborne](https://github.com/willosborne), [@grahampacker-ms](https://github.com/grahampacker-ms) | [![Build CLI](https://github.com/finos/architecture-as-code/actions/workflows/cli-tests.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/cli-tests.yml) |
| [Spectral](./spectral) | [@willosborne](https://github.com/willosborne), [@lbulanti-ms](https://github.com/lbulanti-ms), [@grahampacker-ms](https://github.com/grahampacker-ms) | [![Validation of CALM Samples](https://github.com/finos/architecture-as-code/actions/workflows/spectral-validation.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/spectral-validation.yml) |
| [Translators](./translator) | [@Budlee](https://github.com/Budlee) [@matthewgardner](https://github.com/matthewgardner) [@jpgough-ms](https://github.com/jpgough-ms) | [![Build Translators](https://github.com/finos/architecture-as-code/actions/workflows/translator.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/translator.yml) |

## Getting Involved

Expand All @@ -40,7 +40,7 @@ take place on the fourth Tuesday of every month,
see [here](https://github.com/finos/devops-automation/issues?q=label%3Ameeting+label%3Aarchitecture-as-code+) for
upcoming and previous meetings.

Have an idea or feedback? [Raise an issue](https://github.com/finos-labs/architecture-as-code/issues/new/choose) in this
Have an idea or feedback? [Raise an issue](https://github.com/finos/architecture-as-code/issues/new/choose) in this
repository.

## Contributing
Expand All @@ -52,7 +52,7 @@ We accept contributions via Pull Request, to make a contribution:

1. Pick an issue you are interested in contributing to (or raise one yourself) and speak to the lead maintainers about
what you plan to do either in the issue itself or come to a meetup.
2. Fork the repo (<https://github.com/finos-labs/architecture-as-code/fork>)
2. Fork the repo (<https://github.com/finos/architecture-as-code/fork>)
3. Create your feature branch (`git checkout -b feature/fooBar`)
4. Read our [contribution guidelines](.github/CONTRIBUTING.md)
and [Community Code of Conduct](https://www.finos.org/code-of-conduct)
Expand Down
6 changes: 3 additions & 3 deletions calm/draft/2024-02/meta/calm.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-02/meta/calm.json",
"$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-02/meta/calm.json",

"$vocabulary": {
"https://json-schema.org/draft/2020-12/vocab/core": true,
Expand All @@ -9,13 +9,13 @@
"https://json-schema.org/draft/2020-12/vocab/meta-data": true,
"https://json-schema.org/draft/2020-12/vocab/format-annotation": true,
"https://json-schema.org/draft/2020-12/vocab/content": true,
"https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-02/meta/core.json": true
"https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-02/meta/core.json": true
},
"$dynamicAnchor": "meta",

"title": "Common Architecture Language Model (CALM) Schema",
"allOf": [
{"$ref": "https://json-schema.org/draft/2020-12/schema"},
{"$ref": "https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-02/meta/core.json"}
{"$ref": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-02/meta/core.json"}
]
}
2 changes: 1 addition & 1 deletion calm/draft/2024-02/meta/core.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-02/meta/core.json",
"$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-02/meta/core.json",
"title": "Common Architecture Language Model (CALM) Vocab",
"properties": {
"nodes": {
Expand Down
6 changes: 3 additions & 3 deletions calm/draft/2024-03/meta/calm.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-03/meta/calm.json",
"$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-03/meta/calm.json",

"$vocabulary": {
"https://json-schema.org/draft/2020-12/vocab/core": true,
Expand All @@ -9,13 +9,13 @@
"https://json-schema.org/draft/2020-12/vocab/meta-data": true,
"https://json-schema.org/draft/2020-12/vocab/format-annotation": true,
"https://json-schema.org/draft/2020-12/vocab/content": true,
"https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-03/meta/core.json": true
"https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-03/meta/core.json": true
},
"$dynamicAnchor": "meta",

"title": "Common Architecture Language Model (CALM) Schema",
"allOf": [
{"$ref": "https://json-schema.org/draft/2020-12/schema"},
{"$ref": "https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-03/meta/core.json"}
{"$ref": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-03/meta/core.json"}
]
}
2 changes: 1 addition & 1 deletion calm/draft/2024-03/meta/core.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-03/meta/core.json",
"$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-03/meta/core.json",
"title": "Common Architecture Language Model (CALM) Vocab",
"properties": {
"nodes": {
Expand Down
6 changes: 3 additions & 3 deletions calm/draft/2024-04/meta/calm.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-04/meta/calm.json",
"$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-04/meta/calm.json",

"$vocabulary": {
"https://json-schema.org/draft/2020-12/vocab/core": true,
Expand All @@ -9,13 +9,13 @@
"https://json-schema.org/draft/2020-12/vocab/meta-data": true,
"https://json-schema.org/draft/2020-12/vocab/format-annotation": true,
"https://json-schema.org/draft/2020-12/vocab/content": true,
"https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-04/meta/core.json": true
"https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-04/meta/core.json": true
},
"$dynamicAnchor": "meta",

"title": "Common Architecture Language Model (CALM) Schema",
"allOf": [
{"$ref": "https://json-schema.org/draft/2020-12/schema"},
{"$ref": "https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-04/meta/core.json"}
{"$ref": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-04/meta/core.json"}
]
}
2 changes: 1 addition & 1 deletion calm/draft/2024-04/meta/core.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-04/meta/core.json",
"$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-04/meta/core.json",
"title": "Common Architecture Language Model (CALM) Vocab",
"properties": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion calm/draft/2024-04/meta/interface.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://raw.githubusercontent.com/finos-labs/architecture-as-code/main/calm/draft/2024-04/meta/interface.json",
"$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-04/meta/interface.json",
"title": "Common Architecture Language Model Interfaces",
"defs": {
"interface-type": {
Expand Down
Loading

0 comments on commit 3e1d00f

Please sign in to comment.