Skip to content

Commit

Permalink
Merge branch 'eclipse-tractusx:main' into update_serial_part_3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
johannsvarela authored Feb 5, 2024
2 parents 0c13fa4 + 60968c4 commit 48cca86
Show file tree
Hide file tree
Showing 206 changed files with 187,366 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Closes #
<!-- The MS2 and MS3 criteria are intended for merges to the main-branch. For small bug-fixes or during the model development, for instance, when merging to a feature branch, you may decide to not fill out the checklists. However, we recommend to follow the MS2 checklist during the development. The MS3 checklist becomes relevant for merges to the main-branch. -->
## MS2 Criteria
(to be filled out by PR reviewer)
- [ ] the model **validates** with the SAMM SDS SDK in the version specified in the Readme.md of this repository by the time of the MS2 check (e.g., 'java -jar samm-cli.jar aspect \<path-to-aspect-model\> validate ). The SAMM CLI is available [here](https://eclipse-esmf.github.io/esmf-developer-guide/tooling-guide/samm-cli.html) and in [GitHub](https://github.com/eclipse-esmf/esmf-sdk/releases/tag/v2.3.2)
- [ ] the model **validates** with the SAMM SDS SDK in the version specified in the Readme.md of this repository by the time of the MS2 check (e.g., 'java -jar samm-cli.jar aspect \<path-to-aspect-model\> validate ). The SAMM CLI is available [here](https://eclipse-esmf.github.io/esmf-developer-guide/tooling-guide/samm-cli.html) and in [GitHub](https://github.com/eclipse-esmf/esmf-sdk/releases/tag/v2.5.1)
- [ ] use **Camel-Case** (e.g., "MyModelElement" or "TimeDifferenceGmtId", when in doubt follow https://google.github.io/styleguide/javaguide.html#s5.3-camel-case)
- [ ] the identifiers for all model elements **start with a capital letter** except for properties
- [ ] the identifier for **properties starts with a small letter**
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/model-validation/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ inputs:
required: false
bamm_version:
description: The version of the used SAMM SDK
default: 2.3.2
default: 2.5.1
required: true
token:
description: GitHub token
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bulk-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: validate models
uses: ./.github/actions/model-validation
with:
bamm_version: 2.3.2
bamm_version: 2.5.1
bulk: true
- name: Archive
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/governance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
uses: ./.github/actions/model-validation
with:
pr_number: ${{ github.event.number }}
bamm_version: 2.3.2
bamm_version: 2.5.1
added: ${{needs.synchronize-models.outputs.ADDED}}
modified: ${{needs.synchronize-models.outputs.MODIFIED}}
- name: Archive
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Aspect Models for Eclipse Tractus-X Semantic Layer (SLDT)
The repository contains the aspect models based on [SAMM (Semantic Aspect Meta Model)](https://eclipse-esmf.github.io/samm-specification/2.0.0/index.html) for the Tractus-X project for Catena-X.

**Currently, we assume the usage of the version 2.3.2 of the [SAMM-CLI](https://eclipse-esmf.github.io/esmf-developer-guide/2.3.2/tooling-guide/samm-cli.html) and version 4.5.0 of the [Aspect Model Editor](https://eclipse-esmf.github.io/ame-guide/4.5.0/introduction.html) **.
**Currently, we assume the usage of the version 2.5.1 of the [SAMM-CLI](https://eclipse-esmf.github.io/esmf-developer-guide/2.5.1/tooling-guide/samm-cli.html) and version 5.1.1 of the [Aspect Model Editor](https://eclipse-esmf.github.io/ame-guide/5.1.1/introduction.html) **.

# Using the models
The models can locally be processed with the [SAMM CLI](https://eclipse-esmf.github.io/esmf-developer-guide/2.3.2/tooling-guide/samm-cli.html), which is documented [here](https://eclipse-esmf.github.io/esmf-developer-guide/2.3.2/tooling-guide/samm-cli.html).
The models can locally be processed with the [SAMM CLI](https://eclipse-esmf.github.io/esmf-developer-guide/2.5.1/tooling-guide/samm-cli.html), which is documented [here](https://eclipse-esmf.github.io/esmf-developer-guide/2.5.1/tooling-guide/samm-cli.html).
It allows you to generate different artifacts (diagrams, example payload, java class files) out of it.

For convenience you can also look into the `gen` folder of each model, which already contains often used artifacts generated from the model.
Expand Down
4 changes: 2 additions & 2 deletions generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@


# Adjust if SAMM CLI version changes
JARNAME=samm-cli-2.3.2.jar
JARNAME=samm-cli-2.5.1.jar
SAMMFOLDER=.SAMMCLI/
SAMMCLI=$SAMMFOLDER$JARNAME
# Adjust if SAMM CLI version changes
SAMMCLIURL=https://github.com/eclipse-esmf/esmf-sdk/releases/download/v2.3.2/samm-cli-2.3.2.jar
SAMMCLIURL=https://github.com/eclipse-esmf/esmf-sdk/releases/download/v2.5.1/samm-cli-2.5.1.jar

CATENAXCSS=$SAMMFOLDER/catena-template.css
CATENAXCUSTOMCSSURL=https://raw.githubusercontent.com/eclipse-tractusx/sldt-semantic-hub/main/backend/src/main/resources/catena-template.css
Expand Down
2 changes: 1 addition & 1 deletion io.catenax.asset_tracker_links/1.0.0/metadata.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "status" : "release"}
{ "status" : "deprecate"}
Loading

0 comments on commit 48cca86

Please sign in to comment.