Skip to content

Commit 01d4e79

Browse files
juancadavidjuancadavid
committed
Merge branch 'toscaCodeGen' of https://github.com/Modelio-R-D/MYRTUSDesigner into toscaCodeGen
2 parents b2a1c30 + 89d0c56 commit 01d4e79

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+17687
-21
lines changed

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "automatic"
3+
}

‎ToscaDesigner/.classpath‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
10+
<attributes>
11+
<attribute name="maven.pomderived" value="true"/>
12+
<attribute name="optional" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
16+
<attributes>
17+
<attribute name="test" value="true"/>
18+
<attribute name="optional" value="true"/>
19+
<attribute name="maven.pomderived" value="true"/>
20+
</attributes>
21+
</classpathentry>
22+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
23+
<attributes>
24+
<attribute name="maven.pomderived" value="true"/>
25+
</attributes>
26+
</classpathentry>
27+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
28+
<attributes>
29+
<attribute name="maven.pomderived" value="true"/>
30+
</attributes>
31+
</classpathentry>
32+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
33+
<attributes>
34+
<attribute name="test" value="true"/>
35+
<attribute name="maven.pomderived" value="true"/>
36+
<attribute name="optional" value="true"/>
37+
</attributes>
38+
</classpathentry>
39+
<classpathentry kind="src" path="target/generated-sources/annotations">
40+
<attributes>
41+
<attribute name="optional" value="true"/>
42+
<attribute name="maven.pomderived" value="true"/>
43+
<attribute name="ignore_optional_problems" value="true"/>
44+
<attribute name="m2e-apt" value="true"/>
45+
</attributes>
46+
</classpathentry>
47+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
48+
<attributes>
49+
<attribute name="optional" value="true"/>
50+
<attribute name="maven.pomderived" value="true"/>
51+
<attribute name="ignore_optional_problems" value="true"/>
52+
<attribute name="m2e-apt" value="true"/>
53+
<attribute name="test" value="true"/>
54+
</attributes>
55+
</classpathentry>
56+
<classpathentry kind="output" path="target/classes"/>
57+
</classpath>

‎ToscaDesigner/.github/workflows/maven-java8.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Java CI (Maven, Java 8)
2+
3+
on:
4+
push:
5+
branches: [ main, master, toscaCodeGen ]
6+
pull_request:
7+
branches: [ main, master, toscaCodeGen ]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
# Use JDK 11 to run the Modelio Maven plugin (which requires Java 11),
15+
# while the maven-compiler-plugin produces Java 8 bytecode (<release>8).
16+
java: ['11']
17+
steps:
18+
- uses: actions/checkout@v4
19+
- name: Set up JDK
20+
uses: actions/setup-java@v4
21+
with:
22+
distribution: 'temurin'
23+
java-version: ${{ matrix.java }}
24+
- name: Build with Maven
25+
run: mvn -B -DskipTests package

‎ToscaDesigner/.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "automatic"
3+
}

‎ToscaDesigner/CONTRIBUTING.md‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
CONTRIBUTING
2+
3+
Development setup
4+
-----------------
5+
This repository builds a Modelio 5.4.1 module (ToscaDesigner) and requires Java 8 for runtime compatibility with Modelio.
6+
7+
Requirements
8+
- Java 8 JDK (for running Modelio and for building modules targeting Modelio)
9+
- Maven 3.6+
10+
11+
Build instructions
12+
------------------
13+
From the project root:
14+
15+
```powershell
16+
mvn -B -DskipTests package
17+
```
18+
19+
This produces `target/toscadesigner-<version>.jar` and `target/ToscaDesigner_<version>.jmdac`.
20+
21+
Notes
22+
-----
23+
- The project compiles with `maven-compiler-plugin` configured to `<release>8` to ensure bytecode compatibility with Modelio 5.4.1.
24+
- The `MDAKit` dependency is provided by the Modelio runtime; it is declared with `scope=provided` in `pom.xml`.
25+
- If you need to run checks that require the Modelio API, install Modelio and run integration steps inside its environment.
26+
27+
Contributing
28+
------------
29+
- Fork the repo and create a feature branch.
30+
- Run the build locally and open a pull request.
31+
- For major changes, open an issue first to discuss the design.
32+
33+
CI
34+
--
35+
A GitHub Actions workflow (`.github/workflows/maven-java8.yml`) is included. Note:
36+
37+
- The workflow runs Maven under Java 11 so Modelio-related Maven plugins (which require
38+
a newer JDK) can execute. The project is still compiled to Java 8 bytecode via the
39+
`maven-compiler-plugin` configuration (`<release>8`).
40+
41+
This preserves runtime compatibility with Modelio 5.4.1 while allowing plugin execution
42+
that needs a newer JDK.

‎ToscaDesigner/Generated TOSCA files/MobilityUseCase.csar‎

1.93 KB
Binary file not shown.

0 commit comments

Comments
 (0)