Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ xtend-gen/
plugin.xml_gen
.antlr-generator-3.2.0-patch.jar

# Eclipse IDE
.settings/
.serena/

# Maven
target
pom.xml.tag
Expand Down
47 changes: 40 additions & 7 deletions EclipseInstaller/ROSModel.setup
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
label="ROS Model">
<setupTask
xsi:type="jdt:JRETask"
version="JavaSE-11"
location="${jre.location-1.8}">
version="JavaSE-21"
location="${jre.location-21}">
<description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
</setupTask>
<setupTask
Expand Down Expand Up @@ -50,7 +50,7 @@
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.target.platform"
defaultValue="2024-09"
defaultValue="2025-12"
storageURI="scope://Workspace"/>
<setupTask
xsi:type="setup.p2:P2Task">
Expand All @@ -77,15 +77,28 @@
name="org.eclipse.sirius.specifier.feature.group"/>
<requirement
name="org.eclipse.egit.feature.group"/>
<repositoryList
name="2025-12">
<repository
url="https://download.eclipse.org/releases/2025-12"/>
<repository
url="https://download.eclipse.org/eclipse/updates/4.38"/>
<repository
url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.42.0/"/>
<repository
url="https://download.eclipse.org/modeling/emft/mwe/updates/releases/"/>
<repository
url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12/"/>
</repositoryList>
<repositoryList
name="2024-09">
<repository
url="https://download.eclipse.org/releases/2024-09"/>
<repository
url="https://download.eclipse.org/eclipse/updates/4.33"/>
<repository
<repository
url="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
<repository
<repository
url="https://download.eclipse.org/modeling/emft/mwe/updates/releases/"/>
</repositoryList>
</targlet>
Expand Down Expand Up @@ -151,10 +164,30 @@
<sourceLocator
rootFolder="${ros-model.location}/plugins/">
<excludedPath>.</excludedPath>
<excludedPath>de.fraunhofer.ipa.rossystem.deployment</excludedPath>
<excludedPath>de.fraunhofer.ipa.rossystem.model.combination</excludedPath>
<excludedPath>de.fraunhofer.ipa.ros.model.spec.check</excludedPath>
<excludedPath>de.fraunhofer.ipa.ros.observer.generator</excludedPath>
<excludedPath>de.fraunhofer.ipa.ros.tests</excludedPath>
<excludedPath>de.fraunhofer.ipa.ros.xtext.tests</excludedPath>
<excludedPath>de.fraunhofer.ipa.rossystem.xtext.tests</excludedPath>
</sourceLocator>
<repositoryList
<repositoryList
name="2025-12">
<repository
url="https://download.eclipse.org/releases/2025-12"/>
<repository
url="https://download.eclipse.org/eclipse/updates/4.38"/>
<repository
url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.42.0/"/>
<repository
url="https://download.eclipse.org/modeling/emft/mwe/updates/releases/"/>
<repository
url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12/"/>
</repositoryList>
<repositoryList
name="2024-09">
<repository
<repository
url="https://download.eclipse.org/releases/2024-09"/>
<repository
url="https://download.eclipse.org/eclipse/updates/4.33"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins/.launch/Run ROS Tooling.launch
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m"/>
Expand Down
4 changes: 2 additions & 2 deletions plugins/de.fraunhofer.ipa.ros.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<packaging>pom</packaging>

<properties>
<xtextVersion>2.39.0</xtextVersion>
<xtextVersion>2.42.0</xtextVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
Expand Down Expand Up @@ -64,7 +64,7 @@
<repository>
<id>eclipse</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2025-06/</url>
<url>https://download.eclipse.org/releases/2025-12/</url>
</repository>
<repository>
<id>Xtext Update Site</id>
Expand Down
2 changes: 1 addition & 1 deletion plugins/de.fraunhofer.ipa.ros.sirius/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.sirius.diagram.ui,
de.fraunhofer.ipa.rossystem
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-19
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: Fraunhofer IPA
Automatic-Module-Name: de.fraunhofer.ipa.ros.sirius
Export-Package: de.fraunhofer.ipa.ros.sirius
2 changes: 1 addition & 1 deletion plugins/de.fraunhofer.ipa.ros.tests/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-19"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src">
<attributes>
Expand Down
2 changes: 1 addition & 1 deletion plugins/de.fraunhofer.ipa.ros.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-19
Bundle-RequiredExecutionEnvironment: JavaSE-21
Export-Package: primitives.tests,
ros.tests
Require-Bundle: org.eclipse.core.runtime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins/de.fraunhofer.ipa.roscode.generator/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-19"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="xtend-gen"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-SymbolicName: de.fraunhofer.ipa.roscode.generator;singleton:=true
Bundle-Version: 3.1.0.qualifier
Bundle-Vendor: %providerName
Export-Package: de.fraunhofer.ipa.roscode.generator
Bundle-RequiredExecutionEnvironment: JavaSE-19
Bundle-RequiredExecutionEnvironment: JavaSE-21
Import-Package: javax.inject;version="1.0.0",
org.eclipse.ui.handlers,
org.eclipse.xtext.ui.resource
Expand Down
2 changes: 1 addition & 1 deletion plugins/de.fraunhofer.ipa.rossystem.deployment/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-19"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="xtend-gen"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: de.fraunhofer.ipa.rossystem.deployment
Bundle-SymbolicName: de.fraunhofer.ipa.rossystem.deployment;singleton:=true
Bundle-Version: 2.0.0.qualifier
Export-Package: de.fraunhofer.ipa.rossystem.deployment
Bundle-RequiredExecutionEnvironment: JavaSE-19
Bundle-RequiredExecutionEnvironment: JavaSE-21
Import-Package: javax.inject;version="1.0.0",
org.eclipse.ui.handlers,
org.eclipse.xtext.ui.resource
Expand Down
2 changes: 1 addition & 1 deletion plugins/de.fraunhofer.ipa.rossystem.tests/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-19"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src">
<attributes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-19
Bundle-RequiredExecutionEnvironment: JavaSE-21
Export-Package: system.tests
Require-Bundle: org.eclipse.core.runtime,
de.fraunhofer.ipa.rossystem;visibility:=reexport,
Expand Down
Loading