Skip to content

Commit ba64193

Browse files
committed
Merge into main commit
1 parent ef9dc00 commit ba64193

File tree

317 files changed

+15
-11905
lines changed

Some content is hidden

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

317 files changed

+15
-11905
lines changed

ToscaDesigner/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<attribute name="maven.pomderived" value="true"/>
2020
</attributes>
2121
</classpathentry>
22-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
22+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
2323
<attributes>
2424
<attribute name="maven.pomderived" value="true"/>
2525
</attributes>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
java: ['8']
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']
1517
steps:
1618
- uses: actions/checkout@v4
1719
- name: Set up JDK
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: 8 additions & 1 deletion

ToscaDesigner/target/classes/fr/softeam/i18n/messages.properties

Whitespace-only changes.

ToscaDesigner/target/classes/fr/softeam/i18n/messages_fr.properties

Whitespace-only changes.

ToscaDesigner/target/classes/fr/softeam/templates/TGroup.hbs

Lines changed: 0 additions & 4 deletions
This file was deleted.

ToscaDesigner/target/classes/fr/softeam/templates/TNodeTemplate.hbs

Lines changed: 0 additions & 27 deletions
This file was deleted.

ToscaDesigner/target/classes/fr/softeam/templates/TNodeType.hbs

Lines changed: 0 additions & 46 deletions
This file was deleted.

ToscaDesigner/target/classes/fr/softeam/templates/TParameter.hbs

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)